add PDA送空

2023-05-13 17:42:10 +08:00
parent 5ffca09127
commit 65734963c5
14 changed files with 227 additions and 50 deletions
--- a/lms/nladmin-ui/src/utils/nladmin.js
+++ b/lms/nladmin-ui/src/utils/nladmin.js
@@ -234,14 +234,16 @@ export async function blobValidate(data) {
 * 注：prop,title有一个必传
 */
 export function flexWidth(prop, tableData, title, num = 0) {
-  if (tableData.length === 0) { // 表格没数据不做处理
-    return
-  }
  let flexWidth = 0// 初始化表格列宽
  let columnContent = ''// 占位最宽的内容
  const canvas = document.createElement('canvas')
  const context = canvas.getContext('2d')
  context.font = '14px Microsoft YaHei'
+  if (tableData.length === 0) { // 表格没数据采用标题
+    const width = context.measureText(title)
+    flexWidth = width.width + 20 + num
+    return flexWidth + 'px'
+  }
  // 获取占位最宽的内容
  let index = 0
  for (let i = 0; i < tableData.length; i++) { // 循环表格内容，获取表格内容中最长的数据
--- a/lms/nladmin-ui/src/views/wms/pdm/device/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/device/index.vue
@@ -33,7 +33,7 @@
        :title="crud.status.title"
        width="600px"
      >
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="160px">
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="160px" label-suffix="：">
          <el-form-item label="设备编码" prop="device_code">
            <el-input v-model="form.device_code" :disabled="crud.status.edit" style="width: 300px" />
          </el-form-item>
@@ -44,7 +44,6 @@
            <el-select
              v-model="form.region_code"
              placeholder="所属区域"
-              class="filter-item"
              style="width: 300px"
              clearable
            >
@@ -60,7 +59,6 @@
            <el-select
              v-model="form.device_model"
              placeholder="设备类型"
-              class="filter-item"
              style="width: 300px"
              clearable
            >
@@ -75,6 +73,10 @@
          <el-form-item label="设备产能">
            <el-input v-model="form.productivity" type="number" style="width: 300px" />
          </el-form-item>
+          <el-form-item label="是否工单设备" prop="is_workorder">
+            <el-radio v-model="form.is_workorder" label="1">是</el-radio>
+            <el-radio v-model="form.is_workorder" label="0">否</el-radio>
+          </el-form-item>
          <el-form-item label="外部编码">
            <el-input v-model="form.extend_code" style="width: 300px" />
          </el-form-item>
@@ -97,16 +99,46 @@
        @selection-change="crud.selectionChangeHandler"
      >
        <el-table-column type="selection" width="55" />
-        <el-table-column prop="device_code" label="设备编码" :min-width="flexWidth('device_code',crud.data,'设备编码')" />
-        <el-table-column prop="device_name" label="设备名称" :min-width="flexWidth('device_name',crud.data,'设备名称')" />
-        <el-table-column prop="region_name" label="所属区域" :min-width="flexWidth('region_name',crud.data,'所属区域')" />
-        <el-table-column prop="device_model" label="设备类型" :min-width="flexWidth('device_model',crud.data,'设备类型')">
+        <el-table-column
+          prop="device_code"
+          label="设备编码"
+          :min-width="flexWidth('device_code',crud.data,'设备编码')"
+        />
+        <el-table-column
+          prop="device_name"
+          label="设备名称"
+          :min-width="flexWidth('device_name',crud.data,'设备名称')"
+        />
+        <el-table-column
+          prop="region_name"
+          label="所属区域"
+          :min-width="flexWidth('region_name',crud.data,'所属区域')"
+        />
+        <el-table-column
+          prop="device_model"
+          label="设备类型"
+          :min-width="flexWidth('device_model',crud.data,'设备类型')"
+        >
          <template slot-scope="scope">
            {{ dict.label.pdm_device_type[scope.row.device_model] }}
          </template>
        </el-table-column>
-        <el-table-column prop="productivity" label="设备产能" :min-width="flexWidth('productivity',crud.data,'设备产能')" />
-        <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" show-overflow-tooltip />
+        <el-table-column
+          prop="productivity"
+          label="设备产能"
+          :min-width="flexWidth('productivity',crud.data,'设备产能')"
+        />
+        <el-table-column prop="is_workorder" label="是否工单设备" :min-width="flexWidth('is_workorder',crud.data,'是否工单设备')">
+          <template slot-scope="scope">
+            {{ dict.label.true_or_false[scope.row.is_workorder] }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="remark"
+          label="备注"
+          :min-width="flexWidth('remark',crud.data,'备注')"
+          show-overflow-tooltip
+        />
        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
          <template slot-scope="scope">
            <udOperation
@@ -145,12 +177,13 @@ const defaultForm = {
  create_name: null,
  create_time: null,
  is_delete: null,
-  productivity: null
+  productivity: null,
+  is_workorder: '1'
 }
 export default {
  name: 'Device',
  components: { pagination, crudOperation, rrOperation, udOperation },
-  dicts: ['pdm_device_type'],
+  dicts: ['pdm_device_type', 'true_or_false'],
  mixins: [presenter(), header(), form(defaultForm), crud()],
  cruds() {
    return CRUD({
@@ -180,6 +213,9 @@ export default {
        ],
        region_code: [
          { required: true, message: '所属区域不能为空', trigger: 'blur' }
+        ],
+        is_workorder: [
+          { required: true, message: '是否工单设备不能为空', trigger: 'blur' }
        ]
      },
      regionList: []
--- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/hl/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/hl/index.vue
@@ -349,6 +349,9 @@ export default {
        ],
        is_pri: [
          { required: true, message: '是否优先包装不能为空', trigger: 'blur' }
+        ],
+        is_new: [
+          { required: true, message: '是否新料不能为空', trigger: 'blur' }
        ]
      }
    }
@@ -388,6 +391,7 @@ export default {
      crudWorkorder.forceFinish({ row: this.orderData }).then(res => {
        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
        this.crud.toQuery()
+        this.finishShow = false
      })
    },
    // 取两位小数点
--- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
@@ -430,6 +430,7 @@ export default {
      crudWorkorder.forceFinish({ row: this.orderData }).then(res => {
        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
        this.crud.toQuery()
+        this.finishShow = false
      })
    },
    // 取两位小数点
--- a/lms/nladmin-ui/src/views/wms/pub/DeviceDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/pub/DeviceDialog.vue
@@ -83,7 +83,10 @@ export default {
      title: '设备',
      url: 'api/device',
      crudMethod: { ...crudDevice },
-      optShow: {}
+      optShow: {},
+      query: {
+        is_workorder: '1'
+      }
    })
  },
  mixins: [presenter(), header()],