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

src/views/contractManagement/futuresPurchaseContractAdd.vue

@@ -1380,7 +1380,7 @@ export default {
       ) 
       {
         this.$message({
-          message: '合同收入金额输入错误',
+          message: '已付款金额输入错误',
           type: 'warning',
         })
         return
@@ -1399,7 +1399,7 @@ export default {
             2)
       ) {
         this.$message({
-          message: '费用金额输入错误',
+          message: '费用支出金额输入错误',
           type: 'warning',
         })
         return
@@ -1474,8 +1474,8 @@ export default {
           this.deptBudgetList.compId = this.compId
           this.deptBudgetList.contractType = 2
           this.deptBudgetList.goodsType = 2
-           if(this.deptBudgetList.deliveryProvince =="澳门特别行政区" || this.deptBudgetList.deliveryProvince == "澳门特别行政区"){
-            this.deptBudgetList.deliveryArea = "特别行政区"
+           if(this.deptBudgetList.deliveryProvince =='澳门特别行政区' || this.deptBudgetList.deliveryProvince == '澳门特别行政区'){
+            this.deptBudgetList.deliveryArea = '特别行政区'
           }else{ 
                  this.deptBudgetList.deliveryArea =  CodeToText[this.selectedOptions[2]]
           }

src/views/contractManagement/purchaseContractAdd.vue

@@ -1203,25 +1203,25 @@ export default {
         })
         return
       }
-      if (
-        (!this.deptBudgetList.contractProcessInfo.goodsNameKey > 1000000000) ||
-          (this.deptBudgetList.contractProcessInfo.goodsNameKey < 100) ||
-        (String(this.deptBudgetList.contractProcessInfo.goodsNameKey).indexOf(
-          '.'
-        ) != -1 &&
-          String(this.deptBudgetList.contractProcessInfo.goodsNameKey).length -
-            (String(
-              this.deptBudgetList.contractProcessInfo.goodsNameKey
-            ).indexOf('.') +
-              1) >
-            2)
-      ) {
-        this.$message({
-          message: '合同收入金额输入错误',
-          type: 'warning',
-        })
-        return
-      }
+      // if (
+      //   (!this.deptBudgetList.contractProcessInfo.goodsNameKey > 1000000000) ||
+      //     (this.deptBudgetList.contractProcessInfo.goodsNameKey < 100) ||
+      //   (String(this.deptBudgetList.contractProcessInfo.goodsNameKey).indexOf(
+      //     '.'
+      //   ) != -1 &&
+      //     String(this.deptBudgetList.contractProcessInfo.goodsNameKey).length -
+      //       (String(
+      //         this.deptBudgetList.contractProcessInfo.goodsNameKey
+      //       ).indexOf('.') +
+      //         1) >
+      //       2)
+      // ) {
+      //   this.$message({
+      //     message: '合同收入金额输入错误',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
       if (
         (this.deptBudgetList.contractProcessInfo.waterContent > 10000000) ||
           (this.deptBudgetList.contractProcessInfo.waterContent < 0) ||

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -143,8 +143,6 @@
           <el-button class="submit" @click="print">打印</el-button>
         </div>
       </div>
-
-
     </el-main>
   </el-container>
 </template>
@@ -871,7 +869,6 @@
               break;
           }
        }
-
       },
       //审核
       audit(item, status, status2) {

src/views/warehouse/warehouseManagementDelivery.vue

@@ -763,6 +763,7 @@ export default {
           return
         }
       }
+      console.log(this.deptBudgetList,"出库！！！！！")
       this.$confirm(`暂存后可在待完成页面查看，确定暂存`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
@@ -1235,9 +1236,9 @@ export default {
       }
     },
     selectstorageType(e) {
-      for (var i = 0; i < this.storageType.length; i++) {
-        if (this.storageType[i].constValue == e) {
-          this.deptBudgetList.inOutTypeKey = this.storageType[i].constKey
+      for (var i = 0; i < this.deliveryType.length; i++) {
+        if (this.deliveryType[i].constValue == e) {
+          this.deptBudgetList.inOutTypeKey = this.deliveryType[i].constKey
         }
       }
     },

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -959,9 +959,9 @@ export default {
       }
     },
     selectstorageType(e) {
-      for (var i = 0; i < this.storageType.length; i++) {
-        if (this.storageType[i].constValue == e) {
-          this.dataList.inOutTypeKey = this.storageType[i].constKey
+      for (var i = 0; i < this.deliveryType.length; i++) {
+        if (this.deliveryType[i].constValue == e) {
+          this.dataList.inOutTypeKey = this.deliveryType[i].constKey
         }
       }
     },

src/views/warehouse/warehouseManagementRecord.vue

@@ -48,22 +48,22 @@
 						<template #default="props">
 							<ws-form ref="deptBudgetList" :model="deptBudgetList">
 								<ws-info-table>
-									<ws-form-item label="水分(%)<=" span="1" prop="waterContent">
+									<ws-form-item label="水分(%)" span="1" prop="waterContent">
 										{{ props.row.waterContent }}
 									</ws-form-item>
-									<ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
+									<ws-form-item label="容重(克/升)" span="1" prop="bulkDensity">
 										{{ props.row.bulkDensity }}
 									</ws-form-item>
-									<ws-form-item label="热损伤(%)<=" span="1" prop="jiaorenli">
+									<ws-form-item label="热损伤(%)" span="1" prop="jiaorenli">
 										{{ props.row.jiaorenli }}
 									</ws-form-item>
-									<ws-form-item label="杂质(%)<=" span="1" prop="impurity">
+									<ws-form-item label="杂质(%)" span="1" prop="impurity">
 										{{ props.row.impurity }}
 									</ws-form-item>
-									<ws-form-item label="霉变粒(%)<=" span="1" prop="mildewGrain">
+									<ws-form-item label="霉变粒(%)" span="1" prop="mildewGrain">
 										{{ props.row.mildewGrain }}
 									</ws-form-item>
-									<ws-form-item label="不完善粒(%)<=" span="1" prop="imperfectGrain">
+									<ws-form-item label="不完善粒(%)" span="1" prop="imperfectGrain">
 										{{ props.row.imperfectGrain }}
 									</ws-form-item>
 									<ws-form-item label="质检员" span="1" prop="qualityInspector">