add：临时通道移库

lms/nladmin-ui/src/views/wms/st/inStor/moveStor/AddDialog.vue

@@ -117,6 +117,22 @@
           :disabled="crud.status.view > 0"
         />
       </el-form-item>
+      <el-form-item v-if="form.bill_type === '30'" label="所属区域" prop="block_num">
+        <el-select
+          v-model="form.block_num"
+          clearable
+          placeholder="所属区域"
+          class="filter-item"
+          :disabled="crud.status.view > 0"
+        >
+          <el-option
+            v-for="item in blockList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="备注" prop="remark">
         <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
         <el-input
@@ -137,6 +153,7 @@
         <slot name="left" />
         <el-button
           slot="left"
+          v-if="form.bill_type !== '30'"
           class="filter-item"
           type="primary"
           icon="el-icon-plus"
@@ -244,8 +261,9 @@ import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 const defaultForm = {
   bill_code: '',
   stor_id: '1582991156504039424',
-  stor_code: '',
-  stor_name: '',
+  stor_code: 'AC01',
+  stor_name: '兰州仓库',
+  block_num: null,
   bill_status: '10',
   total_qty: '0',
   detail_count: '0',
@@ -279,6 +297,41 @@ export default {
       storlist: [],
       invtypelist: [],
       layer_num: null,
+      blockList: [
+        { 'label': '101', 'value': '101' },
+        { 'label': '103', 'value': '103' },
+        { 'label': '105', 'value': '105' },
+        { 'label': '107', 'value': '107' },
+        { 'label': '109', 'value': '109' },
+        { 'label': '111', 'value': '111' },
+        { 'label': '113', 'value': '113' },
+        { 'label': '115', 'value': '115' },
+        { 'label': '117', 'value': '117' },
+        { 'label': '119', 'value': '119' },
+        { 'label': '121', 'value': '121' },
+        { 'label': '201', 'value': '201' },
+        { 'label': '203', 'value': '203' },
+        { 'label': '205', 'value': '205' },
+        { 'label': '207', 'value': '207' },
+        { 'label': '209', 'value': '209' },
+        { 'label': '211', 'value': '211' },
+        { 'label': '213', 'value': '213' },
+        { 'label': '215', 'value': '215' },
+        { 'label': '217', 'value': '217' },
+        { 'label': '219', 'value': '219' },
+        { 'label': '221', 'value': '221' },
+        { 'label': '301', 'value': '301' },
+        { 'label': '303', 'value': '303' },
+        { 'label': '305', 'value': '305' },
+        { 'label': '307', 'value': '307' },
+        { 'label': '309', 'value': '309' },
+        { 'label': '311', 'value': '311' },
+        { 'label': '313', 'value': '313' },
+        { 'label': '315', 'value': '315' },
+        { 'label': '317', 'value': '317' },
+        { 'label': '319', 'value': '319' },
+        { 'label': '321', 'value': '321' }
+      ],
       rules: {
         stor_id: [
           { required: true, message: '仓库不能为空', trigger: 'blur' }
@@ -320,7 +373,6 @@ export default {
       })
     },
     [CRUD.HOOK.afterToView]() {
-      debugger
       handmovestor.getOutBillDtl({ 'moveinv_id': this.form.moveinv_id }).then(res => {
         this.form.tableData = res
         // 将明细变成不可编辑
@@ -332,7 +384,6 @@ export default {
       })
     },
     bill_statusFormat(row) {
-      debugger
       return this.dict.label.work_status[row.work_status]
     },
     quality_scodeFormat(row) {
@@ -470,13 +521,20 @@ export default {
       }
     },
     [CRUD.HOOK.beforeSubmit]() {
-      if (this.form.tableData.length === 0) {
-        this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
-        return false
-      }
-      for (let i = 0; i < this.form.tableData.length; i++) {
-        if (!this.form.tableData[i].edit) {
-          this.crud.notify('尚有未完成编辑的物料明细序号' + (i + 1) + '，请检查！')
+      if (this.form.bill_type !== '30') {
+        if (this.form.tableData.length === 0) {
+          this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
+        for (let i = 0; i < this.form.tableData.length; i++) {
+          if (!this.form.tableData[i].edit) {
+            this.crud.notify('尚有未完成编辑的物料明细序号' + (i + 1) + '，请检查！')
+            return false
+          }
+        }
+      } else {
+        if (!this.form.block_num) {
+          this.crud.notify('请选择所属区域', CRUD.NOTIFICATION_TYPE.INFO)
           return false
         }
       }

lms/nladmin-ui/src/views/wms/st/inStor/moveStor/index.vue

@@ -303,6 +303,17 @@ export default {
       return row.bill_status !== '99'
     },
     taskOpen() {
+      this.loadingConfirm = true
+      debugger
+      const a = this.currentRow
+      handmovestor.handdown({ 'moveinv_id': this.currentRow.moveinv_id, 'bill_type': this.currentRow.bill_type }).then(res => {
+        this.querytable()
+        this.loadingConfirm = false
+      }).catch(() => {
+        this.loadingConfirm = false
+      })
+    },
+    taskOpen2() {
       this.loadingConfirm = true
       handmovestor.handdown({ 'moveinv_id': this.currentRow.moveinv_id }).then(res => {
         this.querytable()