Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

src/views/contractManagement/purchaseContractAdd.vue

@@ -60,7 +60,7 @@
         </ws-form-item>
 
         <!--合同编号-->
-        <ws-form-item label="合同编号" span="1" prop="contractNo" class="readonly" required>
+        <ws-form-item label="合同编号" span="1" prop="contractNo" class="readonly" required v-show="deptBudgetList.agreementType =='采购合同'">
           <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入合同编号" maxlength="50" size="small" />
         </ws-form-item>
 
@@ -175,7 +175,7 @@
         </ws-form-item>
 
         <!--签订日期-->
-        <ws-form-item label="签订日期" span="1" prop="signingDate">
+        <ws-form-item label="签订日期" span="1" prop="signingDate" v-show="deptBudgetList.agreementType =='采购合同'">
           <ws-date-picker v-model="deptBudgetList.signingDate" type="date" placeholder="请选择合同签订日期"
             value-format="yyyy-MM-dd" />
         </ws-form-item>
@@ -212,6 +212,11 @@
         </ws-form-item>
         <ws-form-item label="交货详细地址" span="1" prop="placeDelivery">
           <ws-input v-model="deptBudgetList.placeDelivery" placeholder="请输入交货详细地址" maxlength="20" size="small" />
+        </ws-form-item>
+          <!--签订日期-->
+        <ws-form-item label="签订日期" span="1" prop="signingDate" v-show="deptBudgetList.agreementType =='补充协议'">
+          <ws-date-picker v-model="deptBudgetList.signingDate" type="date" placeholder="请选择合同签订日期"
+            value-format="yyyy-MM-dd" />
         </ws-form-item>
         <ws-form-item label="最终实际成交量（吨）" span="1" prop="finalTradingVolume">
           <ws-input v-model="deptBudgetList.finalTradingVolume" placeholder="请输入最终实际成交量" maxlength="100" size="small" />

src/views/contractManagement/salesContractAdd.vue

@@ -28,7 +28,7 @@
           </ws-form-item>
           <!--合同编号-->
           <!-- v-if="deptBudgetList.agreementType == '销售合同'" -->
-          <ws-form-item label="合同编号" span="1" prop="contractNo" class="readonly">
+          <ws-form-item label="合同编号" span="1" prop="contractNo" class="readonly" v-if="deptBudgetList.agreementType == '销售合同'">
             <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入合同编号" maxlength="50" size="small"
               :rules="ruleDeptBudget" />
           </ws-form-item>
@@ -169,6 +169,11 @@
           <ws-form-item label="合同总价" span="1" prop="totalContractPrice" v-if="deptBudgetList.priceType == '定价销售'">
             <ws-input v-model="deptBudgetList.totalContractPrice" placeholder="请输入合同总价" maxlength="100" size="small" />
           </ws-form-item>
+          <!--签订日期-->
+          <ws-form-item label="签订日期" span="1" prop="signingDate" v-if="deptBudgetList.agreementType == '补充协议'">
+            <ws-date-picker v-model="deptBudgetList.signingDate" type="date" placeholder="请选择合同签订日期"
+              value-format="yyyy-MM-dd" />
+          </ws-form-item>
           <ws-form-item label="货源所在地区" span="1" prop="sourceGoods">
             <!-- <el-cascader
               :options="options_"
@@ -204,7 +209,7 @@
             <ws-input v-model="deptBudgetList.placeDelivery" placeholder="请输入交货详细地址" maxlength="20" size="small" />
           </ws-form-item>
           <!--签订日期-->
-          <ws-form-item label="签订日期" span="1" prop="signingDate">
+          <ws-form-item label="签订日期" span="1" prop="signingDate" v-if="deptBudgetList.agreementType == '销售合同'">
             <ws-date-picker v-model="deptBudgetList.signingDate" type="date" placeholder="请选择合同签订日期"
               value-format="yyyy-MM-dd" />
           </ws-form-item>

src/views/contractManagement/salesContractEdit.vue

@@ -171,6 +171,11 @@
           <ws-form-item label="合同总价" span="1" prop="contractNo">
             <ws-input v-model="deptBudgetList.totalContractPrice" placeholder="请输入合同总价" maxlength="100" size="small" />
           </ws-form-item>
+          <!--签订日期-->
+          <ws-form-item label="签订日期" span="1" prop="signingDate" v-if="deptBudgetList.agreementType=='销售合同'">
+            <ws-date-picker v-model="deptBudgetList.signingDate" type="date" placeholder="请选择合同签订日期"
+              value-format="yyyy-MM-dd" />
+          </ws-form-item>
           <!-- 货源所在地区 -->
           <ws-form-item label="货源所在地区" span="1" prop="sourceGoods">
             <!-- <el-cascader
@@ -210,7 +215,7 @@
             <ws-input v-model="deptBudgetList.placeDelivery" maxlength="100" placeholder="请输入交货地详细地址" size="small" />
           </ws-form-item>
           <!--签订日期-->
-          <ws-form-item label="签订日期" span="1" prop="signingDate">
+          <ws-form-item label="签订日期" span="1" prop="signingDate" v-if="deptBudgetList.agreementType=='补充协议'">
             <ws-date-picker v-model="deptBudgetList.signingDate" type="date" placeholder="请选择合同签订日期"
               value-format="yyyy-MM-dd" />
           </ws-form-item>

src/views/contractManagement/salesContractExamine.vue

@@ -143,7 +143,11 @@
               {{ deptBudgetList.totalContractPrice }}
             </div>
           </ws-form-item>
-
+          <ws-form-item label="签订日期" span="1" prop="signingDate"  v-if="deptBudgetList.agreementType=='销售合同'">
+            <div class="unchanged">
+              {{ deptBudgetList.signingDate }}
+            </div>
+          </ws-form-item>
           <ws-form-item label="货源所在地区" span="1">
             <div class="unchanged">
               {{ deptBudgetList.sourceProvince }}
@@ -171,7 +175,7 @@
               {{ deptBudgetList.placeDelivery }}
             </div>
           </ws-form-item>
-          <ws-form-item label="签订日期" span="1" prop="signingDate">
+          <ws-form-item label="签订日期" span="1" prop="signingDate"  v-if="deptBudgetList.agreementType=='补充协议'">
             <div class="unchanged">
               {{ deptBudgetList.signingDate }}
             </div>