代码更新

2023-04-21 17:38:20 +08:00
parent db89a4abb1
commit 4ba04da9c5
33 changed files with 2030 additions and 101 deletions
--- a/lms/nladmin-ui/src/views/wms/basedata/master/customer/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/master/customer/index.vue
@@ -129,6 +129,14 @@
                </el-select>
              </el-form-item>
            </el-col>
+            <el-col :span="8">
+              <el-form-item label="是否自动贴标" prop="is_auto_table">
+                <el-radio v-model="form.is_auto_table" label="0">否</el-radio>
+                <el-radio v-model="form.is_auto_table" label="1">是</el-radio>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
            <el-col :span="16">
              <el-form-item label="备注">
                <el-input v-model="form.remark" style="width: 550px;" type="textarea" />
@@ -159,6 +167,7 @@
        <el-table-column prop="bz_print_no" label="包装打印模板" width="150px" :formatter="printTemple" show-overflow-tooltip />
        <el-table-column prop="shd_print_no" label="送货单打印模板路径" width="180px" show-overflow-tooltip/>
        <el-table-column prop="shd_dtl_num" label="送货单明细数" width="150px" show-overflow-tooltip />
+        <el-table-column prop="is_auto_table" label="是否自动贴标" width="150px" show-overflow-tooltip :formatter="autoTable"/>
        <el-table-column prop="update_optname" label="修改者" />
        <el-table-column prop="update_time" label="修改时间" width="150" />
        <el-table-column label="启用" align="center" prop="is_used">
@@ -239,7 +248,8 @@ const defaultForm = {
  class_name: null,
  zj_print_no: null,
  bz_print_no: null,
-  shd_print_no: null
+  shd_print_no: null,
+  is_auto_table: '1'
 }
 export default {
  name: 'Customerbase',
@@ -369,6 +379,9 @@ export default {
    },
    printTemple(row) {
      return this.dict.label.print_temple[row.bz_print_no]
+    },
+    autoTable(row) {
+      return this.dict.label.is_used[row.is_auto_table]
    }
  }
 }
--- a/lms/nladmin-ui/src/views/wms/basedata/master/faultdevice/faultdevice.js
+++ b/lms/nladmin-ui/src/views/wms/basedata/master/faultdevice/faultdevice.js
@@ -0,0 +1,42 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/faultdevice',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/faultdevice/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/faultdevice',
+    method: 'put',
+    data
+  })
+}
+
+export function syncInfo() {
+  return request({
+    url: 'api/faultdevice/syncInfo',
+    method: 'post'
+  })
+}
+
+export function deviceCharge(params) {
+  return request({
+    url: 'api/faultdevice/deviceCharge',
+    method: 'get',
+    params
+  })
+}
+
+export default { add, edit, del, syncInfo, deviceCharge }
--- a/lms/nladmin-ui/src/views/wms/basedata/master/faultdevice/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/master/faultdevice/index.vue
@@ -0,0 +1,211 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="80px"
+          label-suffix=":"
+        >
+          <el-form-item label="故障编码">
+            <el-input
+              v-model="query.fault_code"
+              size="mini"
+              clearable
+              placeholder="故障编码"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="异常类型">
+            <el-select
+              v-model="query.fault_type"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.DEVICE_ERROR_TYPE"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <rrOperation />
+        </el-form>
+      </div>
+      <rrOperation />
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-thumb"
+          size="mini"
+          :loading="syncLoading"
+          @click="syncInfo"
+        >
+          同步
+        </el-button>
+      </crudOperation>
+      <!--表单组件-->
+      <el-dialog
+        :close-on-click-modal="false"
+        :before-close="crud.cancelCU"
+        :visible.sync="crud.status.cu > 0"
+        :title="crud.status.title"
+        width="550px"
+      >
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="140px">
+          <el-form-item label="故障编码:" prop="fault_code">
+            <el-input v-model="form.fault_code" style="width: 300px;" :disabled="true" />
+          </el-form-item>
+          <el-form-item label="故障信息:" prop="fault_info">
+            <el-input v-model="form.fault_info" style="width: 300px;" :disabled="true" />
+          </el-form-item>
+          <el-form-item label="异常类型:" prop="fault_type">
+            <el-select
+              v-model="form.fault_type"
+              size="mini"
+              :disabled="true"
+              placeholder="请选择"
+              class="filter-item"
+              style="width: 300px"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.DEVICE_ERROR_TYPE"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="解决方式:" prop="solve_mode">
+            <el-input v-model="form.solve_mode" type="textarea" :rows="2" style="width: 300px;" />
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        size="mini"
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column prop="fault_code" label="故障编码" show-overflow-tooltip />
+        <el-table-column prop="fault_info" label="故障信息 " show-overflow-tooltip width="150px" />
+        <el-table-column prop="fault_type" label="异常类型 " show-overflow-tooltip width="100px" :formatter="formatType" />
+        <el-table-column prop="solve_mode" label="解决方式" show-overflow-tooltip width="300px" />
+        <el-table-column prop="create_name" label="创建人" />
+        <el-table-column prop="create_time" label="创建时间" width="150" />
+        <el-table-column prop="update_name" label="修改者" />
+        <el-table-column prop="update_time" label="修改时间" width="150" />
+        <el-table-column
+          v-permission="['admin','customerbase:edit','customerbase:del']"
+          label="操作"
+          width="150px"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+              :disabled-dle="true"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudFaultdevice from '@/views/wms/basedata/master/faultdevice/faultdevice'
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+
+const defaultForm = {
+  fault_id: null,
+  fault_code: null,
+  fault_info: null,
+  acs_type: null,
+  solve_mode: null,
+  create_id: null,
+  create_name: null,
+  create_time: null,
+  update_id: null,
+  update_name: null,
+  update_time: null
+}
+export default {
+  name: 'Faultdevice',
+  dicts: ['DEVICE_ERROR_TYPE'],
+  components: { pagination, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({
+      title: '设备故障处理',
+      url: 'api/faultdevice',
+      optShow: {
+        add: false,
+        reset: true
+      },
+      idField: 'device_id',
+      sort: 'device_id,desc',
+      crudMethod: { ...crudFaultdevice }
+    })
+  },
+  data() {
+    return {
+      permission: {},
+      syncLoading: false,
+      rules: {
+      }
+    }
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    syncInfo() {
+      this.syncLoading = true
+      crudFaultdevice.syncInfo().then(res => {
+        this.crud.notify('同步成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.toQuery()
+        this.syncLoading = false
+      }).catch(() => {
+        this.syncLoading = false
+      })
+    },
+    formatType(row) {
+      return this.dict.label.DEVICE_ERROR_TYPE[row.fault_type]
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>