Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

# Conflicts:
#	vue.config.js

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -295,7 +295,7 @@
             deductWeight: '',
             waterMin: '',
             waterMax: '',
-            saleLimit: 500,
+            saleLimit: 2000,
             statusFlag: '',
             status: '',
             workflowId: '',

src/views/houseSelfCollect/inspectInfo.vue

@@ -226,9 +226,10 @@
         if (datetime < 10) {
           datetime = '0' + datetime
         }
-        return year + mouth + datetime
+        return String(year) + String(mouth) + String(datetime)
       },
       calculation() {
+        console.log(this.getdate())
         let number = '000' + this.count
         number = number.substring(number.length - 4, number.length)
         this.inspect.qualityNo = 'ZCRK' + this.getdate() + this.cangNo + number //ZCRK+8位时间+3位仓库编号+4位序列号

src/views/purchasingManagement/procurementPlanAdd.vue

@@ -620,21 +620,15 @@ export default {
       }
       return year + mouth + datetime
     },
-    // 随机验证码
-    verifyinit() {
-      var arr = []
-      for (var i = 48; i < 123; i++) {
-        if (i > 57 && i < 65) continue
-        if (i > 90 && i < 97) continue
-        arr.push(String.fromCharCode(i))
-      }
-      arr.sort(function () {
-        return Math.random() - 0.5
-      })
-      arr.length = 4
-
-      return arr.join('')
-    },
+    MathRand()
+{
+var Num="";
+for(var i=0;i<4;i++)
+{
+Num+=Math.floor(Math.random()*10);
+}
+return Num
+},
     submit() {
       if (!this.dataList.title) {
         this.$message({
@@ -868,7 +862,7 @@ export default {
           this.$refs.dataList.validate(valid => {
             if (valid) {
               console.log(this.dataList)
-              this.dataList.procurementPlanNo='CGJH'+this.getdate()+this.verifyinit()
+              this.dataList.procurementPlanNo='CGJH'+this.getdate()+this.MathRand()
               this.dataList.sourceProvince = CodeToText[this.selectedOptions[0]]
               this.dataList.sourceCity = CodeToText[this.selectedOptions[1]]
               this.dataList.receivePrivate =  CodeToText[this.selectedOptions[0]]

src/views/purchasingManagement/procurementPlanEdit.vue

@@ -513,21 +513,6 @@ export default {
       }
       return year + mouth + datetime
     },
-    // 随机验证码
-    verifyinit() {
-      var arr = []
-      for (var i = 48; i < 123; i++) {
-        if (i > 57 && i < 65) continue
-        if (i > 90 && i < 97) continue
-        arr.push(String.fromCharCode(i))
-      }
-      arr.sort(function () {
-        return Math.random() - 0.5
-      })
-      arr.length = 4
-
-      return arr.join('')
-    },
     dataFilter(val) {
       // console.log(val,"名")
       this.deptBudgetList.staffList = val

src/views/salesManagement/salesPlanAdd.vue

@@ -510,21 +510,15 @@ export default {
       }
       return year + mouth + datetime
     },
-    // 随机验证码
-    verifyinit() {
-      var arr = []
-      for (var i = 48; i < 123; i++) {
-        if (i > 57 && i < 65) continue
-        if (i > 90 && i < 97) continue
-        arr.push(String.fromCharCode(i))
-      }
-      arr.sort(function () {
-        return Math.random() - 0.5
-      })
-      arr.length = 4
-
-      return arr.join('')
-    },
+MathRand()
+{
+var Num="";
+for(var i=0;i<4;i++)
+{
+Num+=Math.floor(Math.random()*10);
+}
+return Num
+},
     dataFilter(val) {
       // console.log(val,"名")
       this.deptBudgetList.staffList = val
@@ -977,7 +971,7 @@ export default {
         .then(() => {
           this.$refs.dataList.validate((valid) => {
             if (valid) {
-              this.dataList.salePlanNo = 'XSJH' + this.getdate() + this.verifyinit()
+              this.dataList.salePlanNo = 'XSJH' + this.getdate() + this.MathRand()
               this.dataList.sourceProvince = CodeToText[this.selectedOptions[0]]
               this.dataList.sourceCity = CodeToText[this.selectedOptions[1]]
               this.dataList.sendPrivate = CodeToText[this.selectedOptions[0]]

src/views/salesManagement/salesPlanEdit.vue

@@ -451,21 +451,6 @@ export default {
       }
       return year + mouth + datetime
     },
-    // 随机验证码
-    verifyinit() {
-      var arr = []
-      for (var i = 48; i < 123; i++) {
-        if (i > 57 && i < 65) continue
-        if (i > 90 && i < 97) continue
-        arr.push(String.fromCharCode(i))
-      }
-      arr.sort(function() {
-        return Math.random() - 0.5
-      })
-      arr.length = 4
-
-      return arr.join('')
-    },
     dataFilter(val) {
       // console.log(val,"名")
       this.deptBudgetList.staffList = val

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -70,13 +70,16 @@
             <!-- </el-select> -->
           </el-form-item>
           <!-- 合同编号 -->
-            <!-- 合同编号 -->
-          <el-form-item label="合同编号" v-if="dataList.taskTypeKey != 3">
-            {{dataList.contractNo}}
-           
-          </el-form-item>
-           <el-form-item label="移库任务编号" v-if="dataList.taskTypeKey == 3">
-            {{dataList.moveTaskNo}}
+          <el-form-item label="合同编号">
+            <!-- <el-option
+              v-for="item in contractNoList"
+              :key="item.constKey"
+              :label="item.contractNo"
+              :value="item.contractNo"
+            ></el-option> -->
+            <div v-if="dataList.inOutType == '移库入库' || dataList.inOutType == '移库出库'">  {{dataList.moveTaskNo}}</div>
+            <div v-if="dataList.inOutType != '移库入库' || dataList.inOutType != '移库出库'">  {{dataList.contractNo}}</div>
+            <!-- </el-select> -->
           </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名" class="huom">
@@ -104,8 +107,8 @@
             {{dataList.grade}}
             <!-- </el-select> -->
           </el-form-item>
-          <!--容重(克/升)>=-->
-          <el-form-item label="容重(克/升)>=">
+          <!--容重（克/升）>=-->
+          <el-form-item label="容重（克/升）>=">
             {{dataList.bulkDensity}}
           </el-form-item>
           <!--水分（%）<=-->
@@ -177,12 +180,15 @@
             <!-- </el-select> -->
           </el-form-item>
           <!-- 合同编号 -->
-          <el-form-item label="合同编号" v-if="dataList1.taskTypeKey != 3">
-            {{dataList.contractNo}}
-           
-          </el-form-item>
-           <el-form-item label="移库任务编号" v-if="dataList1.taskTypeKey == 3">
-            {{dataList.moveTaskNo}}
+          <el-form-item label="合同编号">
+            <!-- <el-option
+              v-for="item in contractNoList"
+              :key="item.constKey"
+              :label="item.contractNo"
+              :value="item.contractNo"
+            ></el-option> -->
+               <div v-if="dataList.inOutType == '移库入库' || dataList.inOutType == '移库出库'">  {{dataList.moveTaskNo}}</div>
+            <div v-if="dataList.inOutType != '移库入库' || dataList.inOutType != '移库出库'">  {{dataList.contractNo}}</div>
           </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名" class="huom">
@@ -208,8 +214,8 @@
             />
             {{dataList1.grade}}
           </el-form-item>
-          <!--容重(克/升)>=-->
-          <el-form-item label="容重(克/升)>=">
+          <!--容重（克/升）>=-->
+          <el-form-item label="容重（克/升）>=">
             {{dataList1.bulkDensity}}
           </el-form-item>
           <!--水分（%）<=-->
@@ -318,8 +324,8 @@
             {{dataList.grade}}
             <!-- </el-select> -->
           </el-form-item>
-          <!--容重(克/升)>=-->
-          <el-form-item label="容重(克/升)>=">
+          <!--容重（克/升）>=-->
+          <el-form-item label="容重（克/升）>=">
             {{dataList.bulkDensity}}
           </el-form-item>
           <!--水分（%）<=-->
@@ -489,7 +495,7 @@ export default {
       this.$router.go(-1)
     },
     returnsales() {
-      this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
+      this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
     },
     // 获取当前年月日
     getdate() {
@@ -505,21 +511,7 @@ export default {
       }
       return year + mouth + datetime
     },
-    // 随机验证码
-    verifyinit() {
-      var arr = []
-      for (var i = 48; i < 123; i++) {
-        if (i > 57 && i < 65) continue
-        if (i > 90 && i < 97) continue
-        arr.push(String.fromCharCode(i))
-      }
-      arr.sort(function() {
-        return Math.random() - 0.5
-      })
-      arr.length = 4
 
-      return arr.join('')
-    },
     dataFilter(val) {
       // console.log(val,"名")
       this.deptBudgetList.staffList = val
@@ -573,7 +565,7 @@ export default {
     },
     //关闭
     close() {
-      this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
+      this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
     },
     tarechange(e) {
       if (this.dataList.grossWeight && this.dataList.tare) {

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -884,6 +884,15 @@ export default {
 
       return arr.join('')
     },
+    MathRand()
+{
+var Num="";
+for(var i=0;i<4;i++)
+{
+Num+=Math.floor(Math.random()*10);
+}
+return Num
+},
     selectTaskNo(e) {
       if (this.dataList.taskTypeKey == 3) {
         this.$set(this.dataList1, 'moveTaskNo', e)
@@ -1529,15 +1538,15 @@ export default {
     },
     tasknumber() {
       if (this.dataList.taskTypeKey == 1) {
-        this.inOutTaskNo = 'CK' + this.getdate() + this.verifyinit()
+        this.inOutTaskNo = 'CK' + this.getdate() + this.MathRand()
       } else if (this.dataList.taskTypeKey == 2) {
-        this.inOutTaskNo1 = 'RK' + this.getdate() + this.verifyinit()
+        this.inOutTaskNo1 = 'RK' + this.getdate() + this.MathRand()
       } else if (this.dataList.taskTypeKey == 3) {
-        var random = this.getdate() + this.verifyinit()
+        var random = this.getdate() + this.MathRand()
         this.inOutTaskNo = 'YKC' + random
         this.inOutTaskNo1 = 'YKR' + random
       } else if (this.dataList.taskTypeKey == 4) {
-        var random = this.getdate() + this.verifyinit()
+        var random = this.getdate() + this.MathRand()
         this.inOutTaskNo = 'TCC' + random
         this.inOutTaskNo1 = 'TCR' + random
       }

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -933,6 +933,15 @@ export default {
 
       return arr.join('')
     },
+    MathRand()
+{
+var Num="";
+for(var i=0;i<4;i++)
+{
+Num+=Math.floor(Math.random()*10);
+}
+return Num
+},
     selectTaskNo(e) {
       if (this.dataList.taskTypeKey == 3) {
         this.dataList1.moveTaskNo = e
@@ -1217,15 +1226,15 @@ export default {
     },
     tasknumber() {
       if (this.dataList.taskTypeKey == 1) {
-        this.inOutTaskNo = 'CK' + this.getdate() + this.verifyinit()
+        this.inOutTaskNo = 'CK' + this.getdate() + this.MathRand()
       } else if (this.dataList.taskTypeKey == 2) {
-        this.inOutTaskNo1 = 'RK' + this.getdate() + this.verifyinit()
+        this.inOutTaskNo1 = 'RK' + this.getdate() + this.MathRand()
       } else if (this.dataList.taskTypeKey == 3) {
-        var random = this.getdate() + this.verifyinit()
+        var random = this.getdate() + this.MathRand()
         this.inOutTaskNo = 'YKC' + random
         this.inOutTaskNo1 = 'YKR' + random
       } else if (this.dataList.taskTypeKey == 4) {
-        var random = this.getdate() + this.verifyinit()
+        var random = this.getdate() + this.MathRand()
         this.inOutTaskNo = 'TCC' + random
         this.inOutTaskNo1 = 'TCR' + random
       }

src/views/warehouse/warehouseManagementPutOutLook.vue

@@ -367,21 +367,7 @@ export default {
       }
       return year + mouth + datetime
     },
-    // 随机验证码
-    verifyinit() {
-      var arr = []
-      for (var i = 48; i < 123; i++) {
-        if (i > 57 && i < 65) continue
-        if (i > 90 && i < 97) continue
-        arr.push(String.fromCharCode(i))
-      }
-      arr.sort(function () {
-        return Math.random() - 0.5
-      })
-      arr.length = 4
 
-      return arr.join('')
-    },
     dataFilter(val) {
       // console.log(val,"名")
       this.deptBudgetList.staffList = val

vue.config.js

@@ -142,6 +142,7 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         target: 'http://192.168.1.122:8090/',
+        // target: 'http://192.168.1.122:9100/',
         // target: 'http://192.168.1.112:8090/',
         // target: 'http://192.168.1.121:8090/',
         // target: 'http://192.168.1.119:8090/',