#3994

src/views/information/spot-contract/components/add/index.vue

@@ -28,7 +28,7 @@
               <span class="white">{{ getContractTypeName(formState.ContractType) }}</span>
             </a-form-item>
           </a-col>
-          <a-col :span="12">
+          <a-col :span="12" v-if="false">
             <a-form-item label="业务类型" name="BizType">
               <a-select class="inlineFormSelect" style="width: 200px"
                 :getPopupContainer="(triggerNode) => triggerNode.parentNode" v-model:value="formState.BizType"
@@ -39,50 +39,25 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <template v-if="isSell">
-            <a-col :span="12">
-              <a-form-item label="采购方" name="BuyUserID">
-                <a-select class="inlineFormSelect" style="width: 200px"
-                  :getPopupContainer="(triggerNode) => triggerNode.parentNode" v-model:value="formState.BuyUserID"
-                  placeholder="请选择客户">
-                  <!-- 客户资料列表 正常 -->
-                  <a-select-option :value="item.userid" v-for="item in customList" :key="item.userid">
-                    {{ item.customername }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="销售方">
-                <span class="white">{{ getRootUserInfo().accountname }}</span>
-              </a-form-item>
-            </a-col>
-          </template>
-          <template v-else>
-            <a-col :span="12">
-              <a-form-item label="采购方">
-                <span class="white">{{ getRootUserInfo().accountname }}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="销售方" name="SellUserID">
-                <a-select class="inlineFormSelect" v-model:value="formState.SellUserID" style="width: 200px"
-                  :getPopupContainer="(triggerNode) => triggerNode.parentNode" placeholder="请选择客户">
-                  <!-- 客户资料列表 正常 -->
-                  <a-select-option :value="item.userid" v-for="item in customList" :key="item.userid">
-                    {{ item.customername }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-          </template>
+          <a-col :span="12">
+            <a-form-item :label="isSell ? '采购方' : '销售方'" name="BuyUserID">
+              <a-select class="inlineFormSelect" style="width: 200px"
+                :getPopupContainer="(triggerNode) => triggerNode.parentNode" v-model:value="formState.BuyUserID"
+                placeholder="请选择客户">
+                <!-- 客户资料列表 正常 -->
+                <a-select-option :value="item.userid" v-for="item in customList" :key="item.userid">
+                  {{ item.customername }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
           <a-col :span="12">
             <a-form-item label="合同附件" class="checkboxGroupItem" name="ContractAttachment">
               <UploadImg :visible="visible" @upload="uploadImgAction" />
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="交易主体" name="SubjectID">
+            <a-form-item :label="isSell ? '销售方' : '采购方'" name="SubjectID">
               <a-select class="inlineFormSelect" style="width: 200px" v-model:value="formState.SubjectID"
                 placeholder="请选择主体">
                 <a-select-option :value="item.subjectid" v-for="item in subjectList" :key="item.subjectid">

src/views/information/spot-contract/components/setup.ts

@@ -174,6 +174,11 @@ export function handleFormRule(formState: UnwrapRef<FormState>) {
         return validateCommon(value, '请选择交易用户')
     }
 
+    // 验证交易主体
+    async function v_SubjectID(rule: RuleObject, value: number) {
+        return validateCommon(value, '请选择主体')
+    }
+
     const rules = {
         ContractNo: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
         ContractType: [{ required: true, validator: v_ContractType, trigger: 'change' }],
@@ -193,6 +198,7 @@ export function handleFormRule(formState: UnwrapRef<FormState>) {
         PriceMove: [{ required: true, message: '请输入升贴水', trigger: 'blur', type: 'number' }],
         SaleUserID: [{ required: true, validator: v_SaleUserID, trigger: 'change' }],
         TradeUserID: [{ required: true, validator: v_TradeUserID, trigger: 'change' }],
+        SubjectID: [{ required: true, validator: v_SubjectID, trigger: 'change' }],
     };
     return { rules }
 }