rev:清洗上料相关修改

mes/qd/src/views/wms/masterdata_manage/master/storagevehicleinfo/index.vue

@@ -101,6 +101,29 @@
           <el-button type="primary" @click="materiValueSubmit()">确认</el-button>
         </div>
       </el-dialog>
+      <el-dialog
+        :close-on-click-modal="false"
+        :visible.sync="pointMVisible"
+        title="载具信息"
+        width="540px"
+        @close="materiValueCancel()"
+      >
+        <el-form ref="form" :model="updateForm" :rules="rules" size="mini" label-width="110px">
+          <el-form-item label="载具编号" prop="material_code">
+            <template slot-scope="scope">
+              <el-input v-model="updateForm.storagevehicle_code" clearable>
+              </el-input>
+            </template>
+          </el-form-item>
+          <el-form-item label="载具重量(kg)" prop="vehicle_weight">
+            <el-input-number v-model="updateForm.vehicle_weight" clearable style="width: 370px;" />
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="materiValueCancel()">取消</el-button>
+          <el-button type="primary" @click="pointMateriSubmit()">确认</el-button>
+        </div>
+      </el-dialog>
 
       <el-dialog
         :before-close="crud.cancelCU"
@@ -167,6 +190,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="storagevehicle_name" label="载具名称" />
+        <el-table-column prop="vehicle_weight" label="载具单重(kg)" />
         <el-table-column label="是否启用" align="center" prop="is_used">
           <template slot-scope="scope">
             <el-switch
@@ -182,15 +206,18 @@
         <el-table-column
           v-permission="['admin','storagevehicleinfo:edit','storagevehicleinfo:del']"
           label="操作"
-          width="100px"
+          width="200px"
           align="center"
           fixed="right"
         >
           <template slot-scope="scope">
+            <el-button icon="el-icon-position" type="text" class="filter-item" size="mini" @click="updateweight(scope.row)">修改</el-button>
+
             <udOperation
               :data="scope.row"
               :permission="permission"
               :is-visiable-edit="false"
+              class="filter-item"
             />
           </template>
         </el-table-column>
@@ -274,6 +301,8 @@ export default {
       }
     }
     return {
+      updateForm: {},
+      pointMVisible: false,
       materType:'',
       materialShow: false,
       dialogVisible: false,
@@ -329,17 +358,17 @@ export default {
       this.materialForm.material_spec = row.material_spec
     },
     materiValueCancel(){
-      this.materialForm = {}
-      this.dialogVisible = false
+      this.updateForm = {}
+      this.pointMVisible = false
     },
     materiValueSubmit(){
-      console.log(this.materialForm)
-      crudStoragevehicleinfo.updateVehicleMaterial(this.materialForm).then(res => {
-        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        this.materiValueCancel()
-      }).catch(() => {
-
-      })
+      console.log(this.updateForm)
+      // crudStoragevehicleinfo.updateVehicleMaterial(this.materialForm).then(res => {
+      //   this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      //   this.materiValueCancel()
+      // }).catch(() => {
+      //
+      // })
     },
     hand(value) {
       this.crud.toQuery()
@@ -392,6 +421,19 @@ export default {
         this.materialForm = data
       })
     },
+    updateweight(row){
+      this.pointMVisible = true
+      this.updateForm = row
+    },
+    pointMateriSubmit(){
+      console.log(this.updateForm)
+      crudStoragevehicleinfo.edit(this.updateForm).then(res => {
+        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      })
+      this.updateForm = {}
+      this.pointMVisible = false
+      this.crud.refresh()
+    },
     addAndprint() {
       const data = this.form
       if (!this.form.storagevehicle_type) {

mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvt/index.vue

@@ -93,6 +93,7 @@
         <el-table-column show-overflow-tooltip min-width="120" prop="material_name" label="物料名称" />
         <el-table-column show-overflow-tooltip min-width="120" prop="material_spec" label="物料规格" />
         <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" />
+        <el-table-column show-overflow-tooltip prop="vehicle_weight" label="载具单重(g)" />
         <el-table-column show-overflow-tooltip prop="canuse_qty" label="可用重量(g)" :formatter="crud.formatNum3" />
 <!--        <el-table-column show-overflow-tooltip prop="unit_name" label="单位" />-->
         <el-table-column show-overflow-tooltip prop="instorage_time" label="入库时间" min-width="150" />