rev: 修改业务

add: 添加对接类

lms/nladmin-ui/src/api/wms/sch/point.js

@@ -68,4 +68,12 @@ export function changeLock(data) {
   })
 }
 
-export default { add, edit, del, changeActive, findPoints, getPoint, getRegion, changeUsed, changeLock }
+export function clearPoint(data) {
+  return request({
+    url: 'api/point/clearPoint',
+    method: 'post',
+    data: data
+  })
+}
+
+export default { add, edit, del, changeActive, findPoints, getPoint, getRegion, changeUsed, changeLock, clearPoint }

lms/nladmin-ui/src/views/wms/sch/point/index.vue

@@ -69,6 +69,9 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="物料柜号" prop="vehicle_code">
+            <el-input v-model="query.material_code" clearable @focus="getMaterialQuery" />
+          </el-form-item>
           <el-form-item
             v-if="(query.region_id=='1663803432005406720' || query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624')"
             label="块"
@@ -192,6 +195,17 @@
         >
           解锁
         </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          size="mini"
+          type="warning"
+          icon="el-icon-refresh"
+          :disabled="crud.selections.length === 0"
+          @click="clearPoint(crud.selections, 0)"
+        >
+          清空点位
+        </el-button>
       </crudOperation>
       <!--表单组件-->
       <el-dialog
@@ -357,7 +371,7 @@
             {{ scope.row.is_used == '1' ? '是' : '否' }}
           </template>
         </el-table-column>
-        <el-table-column prop="update_name" label="修改人" />
+        <el-table-column prop="update_optname" label="修改人" />
         <el-table-column prop="update_time" label="修改时间" width="150" />
         <el-table-column
           v-permission="[]"
@@ -378,6 +392,7 @@
       <pagination />
     </div>
     <MaterialDialog :dialog-show.sync="materialDialog" @tableChanged3="tableChanged" />
+    <MaterialDialog :dialog-show.sync="materialDialogQuery" @tableChanged3="tableChanged2" />
     <WorkOrderDialog :dialog-show.sync="workOrderDialog" @tableChanged4="tableChanged" />
     <ViewDialog ref="viewDialog" />
   </div>
@@ -443,6 +458,7 @@ export default {
       syncLoading: false,
       materialDialog: false,
       workOrderDialog: false,
+      materialDialogQuery: false,
       choose: '物料',
       invtypelist: [],
       pointStatusList: [],
@@ -573,9 +589,25 @@ export default {
         this.workOrderDialog = true
       }
     },
+    getMaterialQuery() {
+      this.materialDialogQuery = true
+    },
     tableChanged(row) {
       this.form.material_name = row.material_name
       this.form.material_id = row.material_id
+    },
+    tableChanged2(row) {
+      this.query.material_id = row.material_id
+      this.query.material_code = row.material_code
+    },
+    clearPoint(data) {
+      console.log(data)
+      const param = {}
+      param.data = data
+      crudPoint.clearPoint(param).then(res => {
+        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.toQuery()
+      })
     }
   }
 }

lms/nladmin-ui/src/views/wms/sch/task/index.vue

@@ -151,11 +151,11 @@
           align="center"
         >
           <template slot-scope="scope">
-            <el-button
-              type="text"
-              icon="el-icon-upload"
-              @click="doOperate(scope.row, 'c')"
-            >下发</el-button>
+<!--            <el-button-->
+<!--              type="text"-->
+<!--              icon="el-icon-upload"-->
+<!--              @click="doOperate(scope.row, 'c')"-->
+<!--            >下发</el-button>-->
             <el-button
               type="text"
               icon="el-icon-success"