rev:任务下发

2023-06-03 11:14:49 +08:00
parent 88f543c843
commit a5fd09c00c
11 changed files with 155 additions and 29 deletions
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductCheck/CheckDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductCheck/CheckDialog.vue
@@ -84,6 +84,17 @@
        >
          新增一行
        </el-button>
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          :disabled="add_flag"
+          @click="issueTask"
+        >
+          下发任务
+        </el-button>
      </span>

    </div>
@@ -370,6 +381,13 @@ export default {
        this.dialogVisible = false
      })
    },
+    issueTask(){
+      if (this.nowrow === null) {
+        this.crud.notify('请先选中一条已存在的库存明细！', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      check.issueTask(this.nowrow)
+    },
    saveCheck() {
      if (this.tableData.length === 0) {
        this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductCheck/StructIvt.vue
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductCheck/StructIvt.vue
@@ -85,7 +85,6 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
 import DateRangePicker from '@/components/DateRangePicker/index'
-import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'

 const start = new Date()
 export default {
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductCheck/check.js
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductCheck/check.js
@@ -111,6 +111,14 @@ export function process1(data) {
  })
 }

+export function issueTask(data) {
+  return request({
+    url: '/api/bcp/check/issueTask',
+    method: 'post',
+    data
+  })
+}
+
 export default {
  add,
  edit,
@@ -122,6 +130,7 @@ export default {
  getInvTypes,
  saveCheck,
  process0,
+  issueTask,
  getOutBillDis,
  process1
 }
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/index.vue
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/index.vue
@@ -111,7 +111,7 @@
              />
            </el-select>
          </el-form-item>
-          <rrOperation />
+          <rrOperation/>
        </el-form>

      </div>
@@ -154,19 +154,19 @@
        @select="handleSelectionChange"
        @select-all="onSelectAll"
      >
-        <el-table-column :selectable="checkboxT" type="selection" width="55" />
+        <el-table-column :selectable="checkboxT" type="selection" width="55"/>
        <el-table-column prop="bill_code" min-width="140" label="订单编码">
          <template slot-scope="scope">
            <el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.bill_code }}</el-link>
          </template>
        </el-table-column>
-        <el-table-column :formatter="stateFormat" min-width="100" prop="bill_status" label="单据状态" />
-        <el-table-column prop="stor_name" label="仓库" min-width="100" />
-        <el-table-column prop="bill_type" :formatter="bill_typeFormat" min-width="100" label="业务类型" />
-        <el-table-column min-width="135" prop="biz_date" label="业务日期" />
-        <el-table-column :formatter="create_modeFormat" prop="create_mode" label="生成方式" min-width="100" />
-        <el-table-column label="制单人" align="center" prop="create_name" min-width="100" />
-        <el-table-column prop="create_time" min-width="135" label="制单时间" />
+        <el-table-column :formatter="stateFormat" min-width="100" prop="bill_status" label="单据状态"/>
+        <el-table-column prop="stor_name" label="仓库" min-width="100"/>
+        <el-table-column prop="bill_type" :formatter="bill_typeFormat" min-width="100" label="业务类型"/>
+        <el-table-column min-width="135" prop="biz_date" label="业务日期"/>
+        <el-table-column :formatter="create_modeFormat" prop="create_mode" label="生成方式" min-width="100"/>
+        <el-table-column label="制单人" align="center" prop="create_name" min-width="100"/>
+        <el-table-column prop="create_time" min-width="135" label="制单时间"/>
        <el-table-column
          label="操作"
          width="160"
@@ -184,15 +184,15 @@
        </el-table-column>
      </el-table>
      <!--分页组件-->
-      <pagination />
+      <pagination/>
    </div>
-    <AddDialog @AddChanged="querytable" />
+    <AddDialog @AddChanged="querytable"/>
  </div>
 </template>

 <script>
 import shutframe from '@/views/wms/storage_manage/semiproduct/semiproductShutFrame/shutframe'
-import CRUD, { crud, header, presenter } from '@crud/crud'
+import CRUD, {crud, header, presenter} from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
@@ -202,21 +202,23 @@ import crudStorattr from '@/views/wms/storage_manage/basedata/basedata'

 export default {
  name: 'ShutFrame',
-  components: { AddDialog, crudOperation, rrOperation, udOperation, pagination },
+  components: {AddDialog, crudOperation, rrOperation, udOperation, pagination},
  cruds() {
-    return CRUD({ title: '拼盘',
+    return CRUD({
+      title: '拼盘',
      props: {
        // 每页数据条数
        size: 20
      },
-      idField: 'shutframeinv_id', url: 'api/shutframe', crudMethod: { ...shutframe },
+      idField: 'shutframeinv_id', url: 'api/shutframe', crudMethod: {...shutframe},
      optShow: {
        add: true,
        edit: false,
        del: false,
        reset: true,
        download: false
-      }})
+      }
+    })
  },
  mixins: [presenter(), header(), crud()],
  // 数据字典
@@ -230,14 +232,14 @@ export default {
      storlist: []
    }
  },
-  mounted: function() {
+  mounted: function () {
    const that = this
    window.onresize = function temp() {
      that.height = document.documentElement.clientHeight - 180 + 'px;'
    }
  },
  created() {
-    crudStorattr.getStor({ 'stor_type': '2' }).then(res => {
+    crudStorattr.getStor({'stor_type': '2'}).then(res => {
      this.storlist = res.content
    })
  },
@@ -290,12 +292,12 @@ export default {
      }
    },
    taskOpen() {
-      shutframe.handdown({ 'shutframeinv_id': this.currentRow.shutframeinv_id }).then(res => {
+      shutframe.issueTask({'shutframeinv_id': this.currentRow.shutframeinv_id}).then(res => {
        this.querytable()
      })
    },
    confirm() {
-      shutframe.confirm({ 'shutframeinv_id': this.currentRow.shutframeinv_id }).then(res => {
+      shutframe.confirm({'shutframeinv_id': this.currentRow.shutframeinv_id}).then(res => {
        this.querytable()
      })
    },
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/shutframe.js
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/shutframe.js
@@ -131,6 +131,6 @@ export default {
  confirm,
  getInvTypes,
  getOutBillDtl2,
-  getStructIvt2,
+  issueTask,
  getStruct
 }
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/StructIvt.vue
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/StructIvt.vue
@@ -82,7 +82,6 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
 import DateRangePicker from '@/components/DateRangePicker/index'
-import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'

 const start = new Date()
 export default {