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

src/views/contractManagement/purchaseContract.vue

@@ -218,7 +218,7 @@
           <div
             v-if="
               (scope.row.approveStatus != '待决策人审核' &&
-                scope.row.approveStatus) 
+                !scope.row.approveStatus) 
             "
             style="display: inline-block"
           >

src/views/contractManagement/purchaseContractAdd.vue

@@ -188,13 +188,13 @@
             </ws-select>
           </ws-form-item>
         <!--合同单价（元/吨）-->
-        <ws-form-item class="readonly" label="合同单价（元/吨）" span="1" prop="unitContractPrice" v-if="deptBudgetList.priceType == '定价销售'">
+        <ws-form-item class="readonly" label="合同单价（元/吨）" span="1" prop="unitContractPrice" v-if="deptBudgetList.priceType == '定价采购'">
           <ws-input @input="pricechange" v-model="deptBudgetList.unitContractPrice" placeholder="请输入合同单价"
             maxlength="100" size="small" />
         </ws-form-item>
 
         <!--合同总价-->
-        <ws-form-item label="合同总价" span="1" prop="totalContractPrice" v-if="deptBudgetList.priceType == '定价销售'">
+        <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>
 
@@ -477,7 +477,7 @@
           },
         ],
         contractNoList: [],
-        priceTypeList: ['定价销售', '随行就市'],
+        priceTypeList: ['定价采购', '随行就市'],
         goodnameList: [],
         value1: '袋装',
         value2: '未回收',
@@ -1031,7 +1031,7 @@
           })
           return
         }
-        if (this.deptBudgetList.priceType == '定价销售') {
+        if (this.deptBudgetList.priceType == '定价采购') {
           if (!this.deptBudgetList.unitContractPrice) {
             this.$message({
               message: '请输入合同单价！',

src/views/contractManagement/purchaseContractEdit.vue

@@ -136,13 +136,13 @@
               {{ deptBudgetList.priceType }}
           </ws-form-item>
         <!-- 合同单价（元/吨） -->
-        <ws-form-item class="readonly" label="合同单价（元/吨）" span="1" prop="unitContractPrice" v-if="deptBudgetList.priceType == '定价销售'">
+        <ws-form-item class="readonly" label="合同单价（元/吨）" span="1" prop="unitContractPrice" v-if="deptBudgetList.priceType == '定价采购'">
           <span v-if="deptBudgetList.unitContractPrice != 'null'">{{
             deptBudgetList.unitContractPrice
           }}</span>
         </ws-form-item>
         <!-- 合同总价（元） -->
-        <ws-form-item label="合同总价（元）" span="1" prop="totalContractPrice" v-if="deptBudgetList.priceType == '定价销售'">
+        <ws-form-item label="合同总价（元）" span="1" prop="totalContractPrice" v-if="deptBudgetList.priceType == '定价采购'">
           <ws-input v-model="deptBudgetList.totalContractPrice" maxlength="100" placeholder="请输入合同单价" size="small" />
         </ws-form-item>
         <!-- 货源所在地区 -->

src/views/contractManagement/purchaseContractExamine.vue

@@ -98,10 +98,10 @@
         <ws-form-item label="价格类型" span="1" prop="priceType">
           {{ deptBudgetList.priceType }}
         </ws-form-item>
-        <ws-form-item label="合同单价（元/吨）" span="1" prop="unitContractPrice" v-if="deptBudgetList.priceType == '定价销售'">
+        <ws-form-item label="合同单价（元/吨）" span="1" prop="unitContractPrice" v-if="deptBudgetList.priceType == '定价采购'">
           {{ deptBudgetList.unitContractPrice }}
         </ws-form-item>
-        <ws-form-item label="合同总价（元）" span="1" prop="totalContractPrice" v-if="deptBudgetList.priceType == '定价销售'">
+        <ws-form-item label="合同总价（元）" span="1" prop="totalContractPrice" v-if="deptBudgetList.priceType == '定价采购'">
           {{ deptBudgetList.totalContractPrice }}
         </ws-form-item>
         <ws-form-item label="货源所在地区" span="1">

src/views/contractManagement/salesContract.vue

@@ -219,13 +219,13 @@
             "
             alt=""
           />
-          <!-- <div
+          <div
             v-if="
               (scope.row.approveStatus != '待决策人审核' &&
-                scope.row.approveStatus)
+                !scope.row.approveStatus)
             "
             style="display: inline-block"
-          > -->
+          >
             <img
               width="17"
               height="16"
@@ -237,7 +237,7 @@
               @click="handleEdit(scope.row)"
               alt=""
             />
-          <!-- </div> -->
+          </div>
 
           <img
             width="16"

src/views/warehouse/warehouseManagementEdit.vue

@@ -68,7 +68,7 @@
           <ws-info-table>
             <!--仓位编号-->
             <ws-form-item label="仓位编号" span="1" prop="binNumber">
-              <ws-input v-model.number="item.binNumber" placeholder="请输入仓位编号" maxlength="100" size="small" />
+              <ws-input v-model="item.binNumber" placeholder="请输入仓位编号" maxlength="100" size="small" />
             </ws-form-item>
             <!--仓位储量（吨）-->
             <ws-form-item label="仓位储量（吨）" span="1" prop="maxStorage">

src/views/warehouse/warehouseManagementGross.vue

@@ -2351,6 +2351,7 @@ export default {
       }
     },
     contractNoChange(e) {
+      this.disabled1=true
       for (let i = 0; i < this.deptBudgetList1.length; i++) {
         console.log(this.deptBudgetList1[i])
         if (this.deptBudgetList1[i].inOutTaskNo == e) {