更新

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -63,7 +63,7 @@
         <el-table-column prop="warehouseName" class="table_td" label="库房名"></el-table-column>
         <el-table-column prop="inOutType" class="table_td" label="出入库类型"></el-table-column>
         <el-table-column prop="goodsName" class="table_td" label="货名"></el-table-column>
-        <el-table-column prop="weight" class="table_td" label="重量（吨）"></el-table-column>
+        <el-table-column prop="weight" class="table_td" label="数量"></el-table-column>
         <el-table-column prop="predictDate" class="table_td" label="预计日期"></el-table-column>
         <el-table-column prop="publisher" class="table_td" label="发布者"></el-table-column>
         <el-table-column prop="taskStatus" label="状态">

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -72,31 +72,31 @@
                 :value="item.constValue"></el-option>
             </el-select>
           </el-form-item>
-          <!--重量（吨）-->
-          <el-form-item label="重量（吨）" span="1" style="margin-left: 350px; margin-top: -40px">
-            <el-input @input="weightchange1" v-model="dataList.weight" placeholder="请输入重量" maxlength="120" size="small"
+          <!--数量-->
+          <el-form-item label="数量" span="1" style="margin-left: 350px; margin-top: -40px">
+            <el-input @input="weightchange1" v-model="dataList.weight" placeholder="请输入数量" maxlength="120" size="small"
               class="huom" />
           </el-form-item>
           <!-- 品级 -->
           <el-form-item label="品级">
-            <el-select v-model="dataList.grade" placeholder class="typeselect" @change="selectpackingMethod">
+            <el-select disabled v-model="dataList.grade" placeholder class="typeselect" @change="selectpackingMethod">
               <el-option v-for="item in gradeList" :key="item.constKey" :label="item.constValue"
                 :value="item.constValue" />
             </el-select>
           </el-form-item>
           <!--容重(克/升)>=-->
-          <el-form-item label="容重(克/升)>=">
-            <el-input @input="bulkDensitychange" v-model="dataList.bulkDensity" placeholder="请输入容重" maxlength="120"
+          <el-form-item label="容重(克/升)>=" span="1">
+            <el-input disabled @input="bulkDensitychange" v-model="dataList.bulkDensity" placeholder="请输入容重" maxlength="120"
               size="small" class="huom" />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=" span="1" style="margin-left: 350px; margin-top: -40px">
-            <el-input @input="waterContentchange" v-model="dataList.waterContent" placeholder="请输入水分占比" maxlength="120"
+          <el-form-item label="水分（%）<=" span="1" style="margin-left: 250px; margin-top: -40px">
+            <el-input disabled @input="waterContentchange" v-model="dataList.waterContent" placeholder="请输入水分占比" maxlength="120"
               size="small" class="huom" />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)" span="1" style="margin-left: 650px; margin-top: -40px">
-            <el-input @input="unitPricechange" v-model="dataList.unitPrice" placeholder="请输入单价" maxlength="120"
+          <el-form-item  label="单价(元/吨)" span="1" style="margin-left: 500px; margin-top: -40px">
+            <el-input disabled @input="unitPricechange" v-model="dataList.unitPrice" placeholder="请输入单价" maxlength="120"
               size="small" class="huom" />
           </el-form-item>
           <!--预计出库日期-->
@@ -105,15 +105,15 @@
               value-format="yyyy-MM-dd" />
           </el-form-item>
           <!--经办人-->
-          <el-form-item label="出库经办人">
+          <!-- <el-form-item label="出库经办人">
             <el-select v-model="dataList.agent" placeholder="请选择经办人" filterable :filter-method="dataFilter"
               @change="selectstaff">
               <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <!--业务描述=-->
           <el-form-item v-if="dataList.taskTypeKey != 3" label="业务描述" span="20">
-            <el-input v-model="dataList.businessDescribe" placeholder="请输入业务描述，不超过150字" maxlength="150" size="large" />
+            <el-input v-model="dataList.businessDescribe" placeholder="请输入业务描述（运输方式），不超过150字" maxlength="150" size="large" />
           </el-form-item>
         </el-form>
       </div>
@@ -167,9 +167,9 @@
                 :value="item.constValue"></el-option>
             </el-select>
           </el-form-item>
-          <!--重量（吨）-->
-          <el-form-item label="重量（吨）" span="1" style="margin-left: 350px; margin-top: -40px">
-            <el-input @input="weightchange" v-model="dataList1.weight" placeholder="请输入重量" maxlength="120" size="small"
+          <!--数量-->
+          <el-form-item label="数量" span="1" style="margin-left: 350px; margin-top: -40px">
+            <el-input @input="weightchange" v-model="dataList1.weight" placeholder="请输入数量" maxlength="120" size="small"
               class="huom" />
           </el-form-item>
           <!-- 品级 -->
@@ -201,15 +201,15 @@
               value-format="yyyy-MM-dd" />
           </el-form-item>
           <!--经办人-->
-          <el-form-item label="入库经办人">
+          <!-- <el-form-item label="入库经办人">
             <el-select v-model="dataList1.agent" placeholder="请选择经办人" filterable :filter-method="dataFilter1"
               @change="selectstaff1">
               <el-option v-for="item in options1" :key="item.value" :label="item.staffName" :value="item.staffName" />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <!--业务描述=-->
           <el-form-item v-if="dataList.taskTypeKey != 4" label="业务描述">
-            <el-input v-model="dataList1.businessDescribe" placeholder="请输入业务描述，不超过150字" maxlength="150" size="large" />
+            <el-input v-model="dataList1.businessDescribe" placeholder="请输入业务描述（运输方式），不超过150字" maxlength="150" size="large" />
           </el-form-item>
         </el-form>
       </div>
@@ -263,9 +263,9 @@
                 :value="item.constValue"></el-option>
             </el-select>
           </el-form-item>
-          <!--重量（吨）-->
-          <el-form-item label="重量（吨）" span="1" style="margin-left: 350px; margin-top: -40px">
-            <el-input :disabled="dataList.taskTypeKey == 4" v-model="dataList.weight" placeholder="请输入重量"
+          <!--数量-->
+          <el-form-item label="数量" span="1" style="margin-left: 350px; margin-top: -40px">
+            <el-input :disabled="dataList.taskTypeKey == 4" v-model="dataList.weight" placeholder="请输入数量"
               maxlength="120" size="small" class="huom" />
           </el-form-item>
           <!-- 品级 -->
@@ -297,15 +297,15 @@
               value-format="yyyy-MM-dd" />
           </el-form-item>
           <!--经办人-->
-          <el-form-item label="出库经办人">
+          <!-- <el-form-item label="出库经办人">
             <el-select v-model="dataList.agent" placeholder="请选择经办人" filterable :filter-method="dataFilter"
               @change="selectstaff">
               <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <!--业务描述=-->
           <el-form-item label="业务描述">
-            <el-input v-model="dataList.businessDescribe" placeholder="请输入业务描述，不超过150字" maxlength="150" size="large" />
+            <el-input v-model="dataList.businessDescribe" placeholder="请输入业务描述（运输方式），不超过150字" maxlength="150" size="large" />
           </el-form-item>
         </el-form>
       </div>
@@ -606,7 +606,7 @@
                   this.$set(this.dataList, 'gradeKey', response.gradeKey)
                   this.$set(this.dataList, 'waterContent', response.waterContent)
                   this.$set(this.dataList, 'bulkDensity', response.bulkDensity)
-                  this.$set(this.dataList, 'weight', response.weight)
+                  // this.$set(this.dataList, 'weight', response.weight)
                   this.$set(
                     this.dataList,
                     'unitPrice',
@@ -734,7 +734,7 @@
           }
           if (!this.dataList.weight) {
             this.$message({
-              message: '重量（吨）不能为空！',
+              message: '数量不能为空！',
               type: 'warning'
             })
             return
@@ -746,10 +746,10 @@
               (String(this.dataList.weight).indexOf('.') + 1) >
               2) ||
             this.dataList.weight < 0 ||
-            this.dataList.weight > 200000
+            this.dataList.weight > 2000
           ) {
             this.$message({
-              message: '重量输入有误！',
+              message: '数量输入有误！',
               type: 'warning'
             })
             return
@@ -838,13 +838,13 @@
             })
             return
           }
-          if (!this.dataList.agent) {
-            this.$message({
-              message: '出库经办人不能为空！',
-              type: 'warning'
-            })
-            return
-          }
+          // if (!this.dataList.agent) {
+          //   this.$message({
+          //     message: '出库经办人不能为空！',
+          //     type: 'warning'
+          //   })
+          //   return
+          // }
           if (!this.dataList.businessDescribe) {
             this.$message({
               message: '业务描述不能为空！',
@@ -871,7 +871,7 @@
           }
           if (!this.dataList1.weight) {
             this.$message({
-              message: '重量（吨）不能为空！',
+              message: '数量不能为空！',
               type: 'warning'
             })
             return
@@ -883,10 +883,10 @@
               (String(this.dataList1.weight).indexOf('.') + 1) >
               2) ||
             this.dataList1.weight < 0 ||
-            this.dataList1.weight > 200000
+            this.dataList1.weight > 2000
           ) {
             this.$message({
-              message: '重量输入有误！',
+              message: '数量输入有误！',
               type: 'warning'
             })
             return
@@ -978,13 +978,13 @@
             })
             return
           }
-          if (!this.dataList1.agent) {
-            this.$message({
-              message: '入库经办人不能为空！',
-              type: 'warning'
-            })
-            return
-          }
+          // if (!this.dataList1.agent) {
+          //   this.$message({
+          //     message: '入库经办人不能为空！',
+          //     type: 'warning'
+          //   })
+          //   return
+          // }
           if (!this.dataList1.businessDescribe) {
             this.$message({
               message: '业务描述不能为空！',
@@ -1017,7 +1017,7 @@
           }
           if (!this.dataList1.weight) {
             this.$message({
-              message: '重量（吨）不能为空！',
+              message: '数量不能为空！',
               type: 'warning'
             })
             return
@@ -1029,10 +1029,10 @@
               (String(this.dataList1.weight).indexOf('.') + 1) >
               2) ||
             this.dataList1.weight < 0 ||
-            this.dataList1.weight > 200000
+            this.dataList1.weight > 2000
           ) {
             this.$message({
-              message: '重量输入有误！',
+              message: '数量输入有误！',
               type: 'warning'
             })
             return
@@ -1131,20 +1131,20 @@
             })
             return
           }
-          if (!this.dataList.agent) {
-            this.$message({
-              message: '出库经办人不能为空！',
-              type: 'warning'
-            })
-            return
-          }
-          if (!this.dataList1.agent) {
-            this.$message({
-              message: '入库经办人不能为空！',
-              type: 'warning'
-            })
-            return
-          }
+          // if (!this.dataList.agent) {
+          //   this.$message({
+          //     message: '出库经办人不能为空！',
+          //     type: 'warning'
+          //   })
+          //   return
+          // }
+          // if (!this.dataList1.agent) {
+          //   this.$message({
+          //     message: '入库经办人不能为空！',
+          //     type: 'warning'
+          //   })
+          //   return
+          // }
           if (!this.dataList1.businessDescribe) {
             this.$message({
               message: '业务描述不能为空！',
@@ -1185,7 +1185,7 @@
           }
           if (!this.dataList1.weight) {
             this.$message({
-              message: '重量（吨）不能为空！',
+              message: '数量不能为空！',
               type: 'warning'
             })
             return
@@ -1197,10 +1197,10 @@
               (String(this.dataList1.weight).indexOf('.') + 1) >
               2) ||
             this.dataList1.weight < 0 ||
-            this.dataList1.weight > 200000
+            this.dataList1.weight > 2000
           ) {
             this.$message({
-              message: '重量输入有误！',
+              message: '数量输入有误！',
               type: 'warning'
             })
             return
@@ -1299,20 +1299,20 @@
             })
             return
           }
-          if (!this.dataList.agent) {
-            this.$message({
-              message: '出库经办人不能为空！',
-              type: 'warning'
-            })
-            return
-          }
-          if (!this.dataList1.agent) {
-            this.$message({
-              message: '入库经办人不能为空！',
-              type: 'warning'
-            })
-            return
-          }
+          // if (!this.dataList.agent) {
+          //   this.$message({
+          //     message: '出库经办人不能为空！',
+          //     type: 'warning'
+          //   })
+          //   return
+          // }
+          // if (!this.dataList1.agent) {
+          //   this.$message({
+          //     message: '入库经办人不能为空！',
+          //     type: 'warning'
+          //   })
+          //   return
+          // }
           if (!this.dataList.businessDescribe) {
             this.$message({
               message: '业务描述不能为空！',

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -143,12 +143,12 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <!--重量（吨）-->
-          <el-form-item label="重量（吨）" span="1" style="margin-left: 350px; margin-top: -40px">
+          <!--数量-->
+          <el-form-item label="数量" span="1" style="margin-left: 350px; margin-top: -40px">
             <el-input
               disabled
               v-model="dataList.weight"
-              placeholder="请输入重量"
+              placeholder="请输入数量"
               maxlength="120"
               size="small"
               class="huom"
@@ -214,7 +214,7 @@
             />
           </el-form-item>
           <!--经办人-->
-          <el-form-item label="出库经办人">
+          <!-- <el-form-item label="出库经办人">
             <el-select
               disabled
               v-model="dataList.agent"
@@ -230,7 +230,7 @@
                 :value="item.staffName"
               />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <!--业务描述=-->
           <el-form-item v-if="dataList.taskTypeKey != 3" label="业务描述" span="1">
             <el-input
@@ -356,12 +356,12 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <!--重量（吨）-->
-          <el-form-item label="重量（吨）" span="1" style="margin-left: 350px; margin-top: -40px">
+          <!--数量-->
+          <el-form-item label="数量" span="1" style="margin-left: 350px; margin-top: -40px">
             <el-input
               @input="weightchange"
               v-model="dataList1.weight"
-              placeholder="请输入重量"
+              placeholder="请输入数量"
               maxlength="120"
               size="small"
               class="huom"
@@ -431,7 +431,7 @@
             />
           </el-form-item>
           <!--经办人-->
-          <el-form-item label="入库经办人">
+          <!-- <el-form-item label="入库经办人">
             <el-select
               disabled
               v-model="dataList1.agent"
@@ -447,7 +447,7 @@
                 :value="item.staffName"
               />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <!--业务描述=-->
           <el-form-item v-if="dataList.taskTypeKey != 4" label="业务描述">
             <el-input
@@ -569,12 +569,12 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <!--重量（吨）-->
-          <el-form-item label="重量（吨）" span="1" style="margin-left: 350px; margin-top: -40px">
+          <!--数量-->
+          <el-form-item label="数量" span="1" style="margin-left: 350px; margin-top: -40px">
             <el-input
               disabled
               v-model="dataList.weight"
-              placeholder="请输入重量"
+              placeholder="请输入数量"
               maxlength="120"
               size="small"
               class="huom"
@@ -640,7 +640,7 @@
             />
           </el-form-item>
           <!--经办人-->
-          <el-form-item label="出库经办人">
+          <!-- <el-form-item label="出库经办人">
             <el-select
               v-model="dataList.agent"
               placeholder="请选择经办人"
@@ -655,7 +655,7 @@
                 :value="item.staffName"
               />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <!--业务描述=-->
           <el-form-item label="业务描述">
             <el-input
@@ -929,7 +929,7 @@ export default {
                 this.$set(this.dataList, 'gradeKey', response.gradeKey)
                 this.$set(this.dataList, 'waterContent', response.waterContent)
                 this.$set(this.dataList, 'bulkDensity', response.bulkDensity)
-                this.$set(this.dataList, 'weight', response.weight)
+                // this.$set(this.dataList, 'weight', response.weight)
                 this.$set(
                   this.dataList,
                   'unitPrice',

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -143,11 +143,11 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <!--重量（吨）-->
-          <el-form-item label="重量（吨）" span="1" style=" margin-left: 350px; margin-top: -40px">
+          <!--数量-->
+          <el-form-item label="数量" span="1" style=" margin-left: 350px; margin-top: -40px">
             <el-input
               v-model="dataList.weight"
-              placeholder="请输入重量"
+              placeholder="请输入数量"
               maxlength="120"
               size="small"
               class="huom"
@@ -212,7 +212,7 @@
             />
           </el-form-item>
           <!--经办人-->
-          <el-form-item label="出库经办人">
+          <!-- <el-form-item label="出库经办人">
             <el-select
               v-model="dataList.agent"
               placeholder="请选择经办人"
@@ -227,7 +227,7 @@
                 :value="item.staffName"
               />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <!--业务描述=-->
           <el-form-item v-if="dataList.taskTypeKey != 3" label="业务描述" span="1">
             <el-input
@@ -341,12 +341,12 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <!--重量（吨）-->
-          <el-form-item label="重量（吨）" span="1" style=" margin-left: 350px; margin-top: -40px">
+          <!--数量-->
+          <el-form-item label="数量" span="1" style=" margin-left: 350px; margin-top: -40px">
             <el-input
               @input="weightchange"
               v-model="dataList1.weight"
-              placeholder="请输入重量"
+              placeholder="请输入数量"
               maxlength="120"
               size="small"
               class="huom"
@@ -415,7 +415,7 @@
             />
           </el-form-item>
           <!--经办人-->
-          <el-form-item label="入库经办人">
+          <!-- <el-form-item label="入库经办人">
             <el-select
               v-model="dataList1.agent"
               placeholder="请选择经办人"
@@ -430,7 +430,7 @@
                 :value="item.staffName"
               />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <!--业务描述=-->
           <el-form-item v-if="dataList.taskTypeKey != 4" label="业务描述">
             <el-input
@@ -543,12 +543,12 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <!--重量（吨）-->
-          <el-form-item label="重量（吨）" span="1" style=" margin-left: 350px; margin-top: -40px">
+          <!--数量-->
+          <el-form-item label="数量" span="1" style=" margin-left: 350px; margin-top: -40px">
             <el-input
               :disabled="dataList.taskTypeKey == 4"
               v-model="dataList.weight"
-              placeholder="请输入重量"
+              placeholder="请输入数量"
               maxlength="120"
               size="small"
               class="huom"
@@ -614,7 +614,7 @@
             />
           </el-form-item>
           <!--经办人-->
-          <el-form-item label="出库经办人">
+          <!-- <el-form-item label="出库经办人">
             <el-select
               v-model="dataList.agent"
               placeholder="请选择经办人"
@@ -629,7 +629,7 @@
                 :value="item.staffName"
               />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <!--业务描述=-->
           <el-form-item label="业务描述">
             <el-input
@@ -865,7 +865,7 @@ export default {
                 this.$set(this.dataList, 'gradeKey', response.gradeKey)
                 this.$set(this.dataList, 'waterContent', response.waterContent)
                 this.$set(this.dataList, 'bulkDensity', response.bulkDensity)
-                this.$set(this.dataList, 'weight', response.weight)
+                // this.$set(this.dataList, 'weight', response.weight)
                 this.$set(
                   this.dataList,
                   'unitPrice',
@@ -951,7 +951,7 @@ export default {
         }
         if (!this.dataList.weight) {
           this.$message({
-            message: '重量（吨）不能为空！',
+            message: '数量不能为空！',
             type: 'warning'
           })
           return
@@ -963,10 +963,10 @@ export default {
               (String(this.dataList.weight).indexOf('.') + 1) >
               2) ||
           this.dataList.weight < 0 ||
-          this.dataList.weight > 200000
+          this.dataList.weight > 2000
         ) {
           this.$message({
-            message: '重量输入有误！',
+            message: '数量输入有误！',
             type: 'warning'
           })
           return
@@ -1055,13 +1055,13 @@ export default {
           })
           return
         }
-        if (!this.dataList.agent) {
-          this.$message({
-            message: '出库经办人不能为空！',
-            type: 'warning'
-          })
-          return
-        }
+        // if (!this.dataList.agent) {
+        //   this.$message({
+        //     message: '出库经办人不能为空！',
+        //     type: 'warning'
+        //   })
+        //   return
+        // }
         if (!this.dataList.businessDescribe) {
           this.$message({
             message: '业务描述不能为空！',
@@ -1087,7 +1087,7 @@ export default {
         }
         if (!this.dataList1.weight) {
           this.$message({
-            message: '重量（吨）不能为空！',
+            message: '数量不能为空！',
             type: 'warning'
           })
           return
@@ -1099,10 +1099,10 @@ export default {
               (String(this.dataList1.weight).indexOf('.') + 1) >
               2) ||
           this.dataList1.weight < 0 ||
-          this.dataList1.weight > 200000
+          this.dataList1.weight > 2000
         ) {
           this.$message({
-            message: '重量输入有误！',
+            message: '数量输入有误！',
             type: 'warning'
           })
           return
@@ -1194,13 +1194,13 @@ export default {
           })
           return
         }
-        if (!this.dataList1.agent) {
-          this.$message({
-            message: '入库经办人不能为空！',
-            type: 'warning'
-          })
-          return
-        }
+        // if (!this.dataList1.agent) {
+        //   this.$message({
+        //     message: '入库经办人不能为空！',
+        //     type: 'warning'
+        //   })
+        //   return
+        // }
         if (!this.dataList1.businessDescribe) {
           this.$message({
             message: '业务描述不能为空！',
@@ -1236,7 +1236,7 @@ export default {
         }
         if (!this.dataList1.weight) {
           this.$message({
-            message: '重量（吨）不能为空！',
+            message: '数量不能为空！',
             type: 'warning'
           })
           return
@@ -1248,10 +1248,10 @@ export default {
               (String(this.dataList1.weight).indexOf('.') + 1) >
               2) ||
           this.dataList1.weight < 0 ||
-          this.dataList1.weight > 200000
+          this.dataList1.weight > 2000
         ) {
           this.$message({
-            message: '重量输入有误！',
+            message: '数量输入有误！',
             type: 'warning'
           })
           return
@@ -1350,20 +1350,20 @@ export default {
           })
           return
         }
-        if (!this.dataList.agent) {
-          this.$message({
-            message: '出库经办人不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList1.agent) {
-          this.$message({
-            message: '入库经办人不能为空！',
-            type: 'warning'
-          })
-          return
-        }
+        // if (!this.dataList.agent) {
+        //   this.$message({
+        //     message: '出库经办人不能为空！',
+        //     type: 'warning'
+        //   })
+        //   return
+        // }
+        // if (!this.dataList1.agent) {
+        //   this.$message({
+        //     message: '入库经办人不能为空！',
+        //     type: 'warning'
+        //   })
+        //   return
+        // }
         if (!this.dataList1.businessDescribe) {
           this.$message({
             message: '业务描述不能为空！',