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

# Conflicts:
#	src/views/houseSelfCollect/acquisitionManagementAdd.vue

src/views/houseSelfCollect/inspectInfo.vue

@@ -34,7 +34,7 @@
               </ws-select>
             </ws-form-item>
             <ws-form-item label="囤位号" span="1" prop="storageTagNo">
-              <ws-input v-model="inspect.storageTagNo" placeholder="请输入囤位号" maxlength="100" size="small"
+              <ws-input v-model="inspect.storageTagNo" placeholder="请输入囤位号" maxlength="15" size="small"
                 :disabled="disabled" />
             </ws-form-item>
             <ws-form-item label="车牌号" span="1" prop="carNumber">
@@ -407,12 +407,41 @@
           })
           return
         }
+        if (String(this.inspect.impurity).indexOf('.') != -1 && String(this.inspect.impurity).length - (String(this.inspect.impurity).indexOf('.') + 1) > 1) {
+          this.$message({
+            message: '杂质输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        
+         if (this.inspect.impurity < 0 || this.inspect.impurity > 40) {
+          this.$message({
+            message: '杂质输入错误',
+            type: 'warning',
+          })
+          return
+        }
         if (!this.inspect.waterContent) {
           this.$message({
             message: '水分不能为空',
             type: 'warning',
           })
           return
+        }
+         if (this.inspect.waterContent < 0 || this.inspect.waterContent > 40) {
+          this.$message({
+            message: '水分输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (String(this.inspect.waterContent).indexOf('.') != -1 && String(this.inspect.waterContent).length - (String(this.inspect.waterContent).indexOf('.') + 1) > 1) {
+          this.$message({
+            message: '水分输入错误',
+            type: 'warning',
+          })
+          return
         }
         if (!this.inspect.mildewGrain) {
           this.$message({
@@ -420,6 +449,20 @@
             type: 'warning',
           })
           return
+        }
+         if (this.inspect.mildewGrain < 0 || this.inspect.mildewGrain > 40) {
+          this.$message({
+            message: '霉变粒输入错误',
+            type: 'warning',
+          })
+          return
+        }
+         if (String(this.inspect.mildewGrain).indexOf('.') != -1 && String(this.inspect.mildewGrain).length - (String(this.inspect.mildewGrain).indexOf('.') + 1) > 1) {
+          this.$message({
+            message: '霉变粒输入错误',
+            type: 'warning',
+          })
+          return
         }
         if (!this.inspect.bulkDensity) {
           this.$message({
@@ -427,6 +470,20 @@
             type: 'warning',
           })
           return
+        }
+         if (this.inspect.bulkDensity < 500 || this.inspect.bulkDensity > 1000) {
+          this.$message({
+            message: '容重输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (String(this.inspect.bulkDensity).indexOf('.') != -1 && String(this.inspect.bulkDensity).length - (String(this.inspect.bulkDensity).indexOf('.') + 1) > 0) {
+          this.$message({
+            message: '容重需输入整数',
+            type: 'warning',
+          })
+          return
         }
         if (!this.inspect.jiaorenli) {
           this.$message({
@@ -434,6 +491,20 @@
             type: 'warning',
           })
           return
+        }
+         if (this.inspect.jiaorenli < 0 || this.inspect.jiaorenli > 40) {
+          this.$message({
+            message: '热损伤输入错误',
+            type: 'warning',
+          })
+          return
+        }
+         if (String(this.inspect.jiaorenli).indexOf('.') != -1 && String(this.inspect.jiaorenli).length - (String(this.inspect.jiaorenli).indexOf('.') + 1) > 1) {
+          this.$message({
+            message: '热损伤输入错误',
+            type: 'warning',
+          })
+          return
         }
         if (!this.inspect.imperfectGrain) {
           this.$message({
@@ -442,7 +513,20 @@
           })
           return
         }
-        
+         if (this.inspect.imperfectGrain < 0 || this.inspect.imperfectGrain > 40) {
+          this.$message({
+            message: '不完善粒输入错误',
+            type: 'warning',
+          })
+          return
+        }
+           if (String(this.inspect.imperfectGrain).indexOf('.') != -1 && String(this.inspect.imperfectGrain).length - (String(this.inspect.imperfectGrain).indexOf('.') + 1) > 1) {
+          this.$message({
+            message: '不完善粒输入错误',
+            type: 'warning',
+          })
+          return
+        }
         this.inspect.warehouseName = this.warehouseName
         this.inspect.compId = sessionStorage.getItem('ws-pf_compId')
         this.inspect.qualityInspector = sessionStorage.getItem('ws-pf_staffName')

src/views/houseSelfCollect/settlement.vue

@@ -77,6 +77,9 @@
              <ws-form-item v-if='paymentList.type=="干粮"' label="干粮单价（元/公斤）" span="1" prop="waterContent">
                 <ws-input v-model="paymentList.qualityInspectionManagement.dryGrainPrice" placeholder="请输入干粮单价" maxlength="100" size="small" disabled />
             </ws-form-item>
+             <ws-form-item v-if='paymentList.type=="干粮"' label="净重（公斤）" span="1" prop="waterContent">
+                <ws-input v-model="paymentList.netWeight" placeholder="请输入干粮单价" maxlength="100" size="small" disabled />
+            </ws-form-item>
           </ws-info-table>
           <div class="titles">质检数据</div>
           <ws-info-table>

src/views/houseSelfCollect/weighingManagement.vue

@@ -70,7 +70,8 @@
       <el-table-column prop="storageNumber" label="囤位号"></el-table-column>
       <el-table-column prop="secretaryWeigher" label="司称员">
        <template slot-scope="scope">
-         {{scope.row.secretaryWeigher}}{{scope.row.skinInspector}}
+         <div v-if="scope.row.secretaryWeigher == scope.row.skinInspector">{{scope.row.skinInspector}}</div>
+         <div v-else>  {{scope.row.secretaryWeigher}}<span v-if="scope.row.skinInspector">,{{scope.row.skinInspector}}</span></div>
        </template> 
       </el-table-column>
       <el-table-column

src/views/houseSelfCollect/weightCheck.vue

@@ -375,6 +375,7 @@ export default {
                   ) {
                     //累计售粮超上限不能完成毛检保存
                     let count = this.purchasePriceList[i].saleLimit - response
+                    console.log(this.weighingList.grossWeight/1000,"毛重转吨")
                     if (count - this.weighingList.grossWeight/1000 < 0) {
                       this.$alert(
                         '该客户累计销售' +

vue.config.js

@@ -141,7 +141,7 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
-        target: 'http://192.168.1.120:8090/',
+        target: 'http://192.168.1.112:8090/',
         // target: 'http://192.168.1.112:8090/',
         // target: 'http://192.168.1.121:8090/',
         // target: 'http://192.168.1.119:8090/',