修改

src/views/contractManagement/purchaseContractAdd.vue

@@ -48,15 +48,15 @@
           <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入合同编号" maxlength="50" size="small" />
         </ws-form-item>
         <!--关联合同-->
-        <ws-form-item prop="contractNo" label="关联合同" span="1" v-show="deptBudgetList.agreementType =='补充协议'">
-          <ws-select v-model="deptBudgetList.contractNo" placeholder="请选择编号" @change="selectRelation">
-            <ws-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo"
+        <ws-form-item prop="agreementNo" label="关联合同" span="1" v-show="deptBudgetList.agreementType =='补充协议'">
+          <ws-select v-model="deptBudgetList.agreementNo" placeholder="请选择编号" @change="selectRelation">
+            <ws-option v-for="item in contractNoList" :key="item.constKey" :label="item.agreementNo"
               :value="item.contractNo"></ws-option>
           </ws-select>
         </ws-form-item>
         <!--补充协议编号-->
-        <ws-form-item v-show="deptBudgetList.agreementType == '补充协议'" label="补充协议编号" span="1" prop="agreementNo">
-          <ws-input v-model="deptBudgetList.agreementNo" placeholder="请输入补充协议编号" maxlength="100" size="small" />
+        <ws-form-item v-show="deptBudgetList.agreementType == '补充协议'" label="补充协议编号" span="1" prop="contractNo">
+          <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入补充协议编号" maxlength="100" size="small" />
         </ws-form-item>
         <!--运输方式-->
         <ws-form-item label="运输方式" span="1" prop="shippingType">
@@ -677,6 +677,7 @@
           if (this.contractNoList[i].contractNo == e) {
             this.deptBudgetList = this.contractNoList[i]
             this.deptBudgetList.agreementNo = this.contractNoList[i].contractNo
+            this.deptBudgetList.contractNo = this.contractNoList[i].contractNo
             this.deptBudgetList.agreementType = '补充协议'
           }
         }

src/views/contractManagement/purchaseContractEdit.vue

@@ -42,12 +42,12 @@
         <ws-form-item label="合同编号" v-if="deptBudgetList.agreementType=='采购合同'" span="1" prop="contractNo">
           {{ deptBudgetList.contractNo }}
         </ws-form-item>
-        <ws-form-item label="关联合同" v-if="deptBudgetList.agreementType=='补充协议'" span="1" prop="contractNo">
-          {{ deptBudgetList.contractNo }}
-        </ws-form-item>
-        <ws-form-item label="补充协议编号" v-if="deptBudgetList.agreementType=='补充协议'" span="1" prop="agreementNo">
+        <ws-form-item label="关联合同" v-if="deptBudgetList.agreementType=='补充协议'" span="1" prop="agreementNo">
           {{ deptBudgetList.agreementNo }}
         </ws-form-item>
+        <ws-form-item label="补充协议编号" v-if="deptBudgetList.agreementType=='补充协议'" span="1" prop="contractNo">
+          {{ deptBudgetList.contractNo }}
+        </ws-form-item>
         <!-- 运输方式 -->
         <ws-form-item label="运输方式" span="1" prop="shippingType">
           <ws-input

src/views/contractManagement/purchaseContractExamine.vue

@@ -72,12 +72,12 @@
         <ws-form-item label="合同编号" v-if="deptBudgetList.agreementType=='采购合同'" span="1" prop="contractNo">
           {{ deptBudgetList.contractNo }}
         </ws-form-item>
-        <ws-form-item label="关联合同" v-if="deptBudgetList.agreementType=='补充协议'" span="1" prop="contractNo">
-          {{ deptBudgetList.contractNo }}
-        </ws-form-item>
-        <ws-form-item label="补充协议编号" v-if="deptBudgetList.agreementType=='补充协议'" span="1" prop="agreementNo">
+        <ws-form-item label="关联合同" v-if="deptBudgetList.agreementType=='补充协议'" span="1" prop="agreementNo">
           {{ deptBudgetList.agreementNo }}
         </ws-form-item>
+        <ws-form-item label="补充协议编号" v-if="deptBudgetList.agreementType=='补充协议'" span="1" prop="contractNo">
+          {{ deptBudgetList.contractNo }}
+        </ws-form-item>
         <ws-form-item label="运输方式" span="1" prop="shippingType">
           {{ deptBudgetList.shippingType }}
         </ws-form-item>

src/views/contractManagement/salesContractAdd.vue

@@ -34,16 +34,16 @@
               :rules="ruleDeptBudget" />
           </ws-form-item>
           <!--关联合同-->
-          <ws-form-item prop="contractNo" label="关联合同" span="1" v-if="deptBudgetList.agreementType == '补充协议'">
-            <ws-select v-model="deptBudgetList.contractNo" placeholder="请选择编号" @change="selectRelation">
-              <ws-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo"
+          <ws-form-item prop="agreementNo" label="关联合同" span="1" v-if="deptBudgetList.agreementType == '补充协议'">
+            <ws-select v-model="deptBudgetList.agreementNo" placeholder="请选择编号" @change="selectRelation">
+              <ws-option v-for="item in contractNoList" :key="item.constKey" :label="item.agreementNo"
                 :value="item.contractNo"></ws-option>
             </ws-select>
           </ws-form-item>
           <!--补充协议编号-->
-          <ws-form-item label="补充协议编号" span="1" prop="agreementNo" class="readonly"
+          <ws-form-item label="补充协议编号" span="1" prop="contractNo" class="readonly"
             v-if="deptBudgetList.agreementType == '补充协议'">
-            <ws-input v-model="deptBudgetList.agreementNo" placeholder="请输入补充协议编号" maxlength="50" size="small"
+            <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入补充协议编号" maxlength="50" size="small"
               :rules="ruleDeptBudget" />
           </ws-form-item>
           <!--运输方式-->
@@ -612,6 +612,7 @@
           if (this.contractNoList[i].contractNo == e) {
             this.deptBudgetList = this.contractNoList[i]
             this.deptBudgetList.agreementNo = this.contractNoList[i].contractNo
+            this.deptBudgetList.contractNo = this.contractNoList[i].contractNo
             this.deptBudgetList.agreementType = '补充协议'
           }
         }

src/views/contractManagement/salesContractEdit.vue

@@ -38,14 +38,14 @@
             <span class="unchangeable">*</span>
           </ws-form-item>
           <!--关联合同-->
-          <ws-form-item prop="contractNo" label="关联合同" span="1" v-if="deptBudgetList.agreementType == '补充协议'"
+          <ws-form-item prop="agreementNo" label="关联合同" span="1" v-if="deptBudgetList.agreementType == '补充协议'"
             class="readonly">
-            {{ deptBudgetList.contractNo }}
+            {{ deptBudgetList.agreementNo }}
           </ws-form-item>
           <!--补充协议编号-->
-          <ws-form-item label="补充协议编号" span="1" prop="agreementNo" class="readonly"
+          <ws-form-item label="补充协议编号" span="1" prop="contractNo" class="readonly"
             v-if="deptBudgetList.agreementType == '补充协议'">
-            {{ deptBudgetList.agreementNo }}
+            {{ deptBudgetList.contractNo }}
           </ws-form-item>
           <!--运输方式-->
           <ws-form-item label="运输方式" span="1" prop="contractNo">

src/views/contractManagement/salesContractExamine.vue

@@ -70,11 +70,18 @@
           <h3>基本信息</h3>
         </div>
         <ws-info-table>
-          <ws-form-item label="合同编号" span="1" prop="contractNo">
-            <div class="unchanged">
-              {{ deptBudgetList.contractNo }}
-            </div>
-          </ws-form-item>
+        <ws-form-item label="合同类型" span="1" prop="agreementType">
+          {{ deptBudgetList.agreementType }}
+        </ws-form-item>
+        <ws-form-item label="合同编号" v-if="deptBudgetList.agreementType=='销售合同'" span="1" prop="contractNo">
+          {{ deptBudgetList.contractNo }}
+        </ws-form-item>
+        <ws-form-item label="关联合同" v-if="deptBudgetList.agreementType=='补充协议'" span="1" prop="agreementNo">
+          {{ deptBudgetList.agreementNo }}
+        </ws-form-item>
+        <ws-form-item label="补充协议编号" v-if="deptBudgetList.agreementType=='补充协议'" span="1" prop="contractNo">
+          {{ deptBudgetList.contractNo }}
+        </ws-form-item>
           <ws-form-item label="运输方式" span="1" prop="shippingType">
             <div class="unchanged">
               {{ deptBudgetList.shippingType }}