''

Reviewed-on: #30

src/api/basicData/Equipment/equipmentInfo.js

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:00:14
  * @LastEditors: zwq
- * @LastEditTime: 2022-01-10 17:00:16
+ * @LastEditTime: 2022-03-04 09:06:58
  * @Description:
  */
 import request from '@/utils/request'
@@ -15,6 +15,14 @@ export function equipmentInfoList(data) { // 获取设备信息列表
   })
 }
 
+export function equipmentlistList(data) { // 获取设备信息列表
+  return request({
+    url: '/api/process/work-sequence/equipmentlistList',
+    method: 'post',
+    data
+  })
+}
+
 export function equipmentInfoDetail(id) { // 获取设备信息单条数据
   return request({
     url: '/api/wms/equipment/get',

src/api/basicData/GroupModule/staff.js

@@ -2,14 +2,14 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:00:14
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-03 15:10:05
+ * @LastEditTime: 2022-03-04 10:05:02
  * @Description:
  */
 import request from '@/utils/request'
 
 export function staffList(data) { // 获取员工列表
   return request({
-    url: '/basic/worker/page',
+    url: '/api/wms/worker/page',
     method: 'post',
     data
   })
@@ -17,7 +17,7 @@ export function staffList(data) { // 获取员工列表
 
 export function staffDetail(id) { // 获取员工单条数据
   return request({
-    url: '/basic/worker/get',
+    url: '/api/wms/worker/get',
     method: 'post',
     data: { id }
   })
@@ -25,7 +25,7 @@ export function staffDetail(id) { // 获取员工单条数据
 
 export function staffUpdate(data) { // 更新员工单条数据
   return request({
-    url: '/basic/worker/update',
+    url: '/api/wms/worker/update',
     method: 'post',
     data
   })
@@ -33,7 +33,7 @@ export function staffUpdate(data) { // 更新员工单条数据
 
 export function staffAdd(data) { // 新增员工单条数据
   return request({
-    url: '/basic/worker/add',
+    url: '/api/wms/worker/add',
     method: 'post',
     data
   })
@@ -41,14 +41,14 @@ export function staffAdd(data) { // 新增员工单条数据
 
 export function staffCode() { // 获取员工code
   return request({
-    url: '/basic/worker/get-code',
+    url: '/api/wms/worker/get-code',
     method: 'post'
   })
 }
 
 export function staffDelete(id) { // 删除员工单条数据
   return request({
-    url: '/basic/worker/delete',
+    url: '/api/wms/worker/delete',
     method: 'post',
     data: { id }
   })

src/api/orderManage/workOrder/workOrder.js

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:00:14
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-03 13:57:00
+ * @LastEditTime: 2022-03-04 09:35:14
  * @Description:
  */
 import request from '@/utils/request'
@@ -15,6 +15,14 @@ export function workOrderList(data) { // 获取工单列表
   })
 }
 
+export function workOrderListList(data) { // 00A获取工单列表
+  return request({
+    url: '/api/wms/work/order/page',
+    method: 'post',
+    data
+  })
+}
+
 export function workOrderDetail(id) { // 获取工单单条数据
   const data = {
     'id': id

src/lang/i18n/en/module/basicData.js

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
  * @LastEditors: zwq
- * @LastEditTime: 2022-01-17 15:12:18
+ * @LastEditTime: 2022-03-04 10:13:58
  * @Description: file content
  */
 export default {
@@ -225,6 +225,7 @@ export default {
     wasteGrade: 'Waste Grade',
     RegisterPerson: 'Register Person',
     updateTime: 'Update Time',
+    registrationPlace: 'Registration Place',
     cause: 'Cause',
     causeCode: 'Cause Code',
     WasteName: 'Waste Name',

src/lang/i18n/en/module/quality.js

@@ -1,7 +1,7 @@
 /*
  * @Date: 2021-03-13 13:49:16
  * @LastEditors: zwq
- * @LastEditTime: 2021-04-15 09:59:15
+ * @LastEditTime: 2022-03-04 09:21:36
  * @FilePath: \basic-admin\src\lang\i18n\en\module\quality.js
  * @Description:
  */
@@ -90,5 +90,10 @@ export default {
     subTitle: 'Scrap Category Statistics',
     completeWaste: 'Complete Waste',
     CanBeUsedAfterProcessing: 'Can be used after processing'
+  },
+  QCPplan: {
+    QCPcode: 'QCP Code',
+    getTime: 'Get Time',
+    detail: 'Detail'
   }
 }

src/lang/i18n/zh/module/basicData.js

@@ -1,8 +1,13 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
+<<<<<<< HEAD
  * @LastEditors: fzq
  * @LastEditTime: 2022-03-03 19:52:51
+=======
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-04 10:13:41
+>>>>>>> develop
  * @Description: file content
  */
 export default {
@@ -232,6 +237,7 @@ export default {
     wasteGrade: '废品等级',
     RegisterPerson: '登记人',
     updateTime: '登记时间',
+    registrationPlace: '登记地点',
     cause: '报废原因',
     causeCode: '报废原因编码',
     WasteName: '废品报废名称',

src/lang/i18n/zh/module/quality.js

@@ -1,7 +1,7 @@
 /*
  * @Date: 2021-03-13 13:49:07
  * @LastEditors: zwq
- * @LastEditTime: 2021-04-15 09:58:18
+ * @LastEditTime: 2022-03-04 09:21:04
  * @FilePath: \basic-admin\src\lang\i18n\zh\module\quality.js
  * @Description:
  */
@@ -90,5 +90,10 @@ export default {
     subTitle: '废品分类统计',
     completeWaste: '完全废品',
     CanBeUsedAfterProcessing: '加工可用'
+  },
+  QCPplan: {
+    QCPcode: 'QCP项目编码',
+    getTime: '获取时间',
+    detail: '详情'
   }
 }

src/router/index.js

@@ -209,6 +209,12 @@ export const constantRoutes = [
           }
         ]
       },
+      {
+        path: 'staff',
+        component: () => import('@/views/basicData/GroupModule/staff'),
+        name: 'staff',
+        meta: { title: routerTitle.basicData.teamManage.staff?.[language] || routerTitle.basicData.teamManage.staff.en, icon: 'form', affix: true, required: true, requireToken: true }
+      },
       {
         path: '/dataDictionary',
         component: () => import('@/views/basicData/index'),
@@ -405,12 +411,12 @@ export const constantRoutes = [
             name: 'ScrapType',
             meta: { title: routerTitle.basicData.scrap.scrapType?.[language] || routerTitle.basicData.scrap.scrapType.en, icon: 'form', affix: true, required: true, requireToken: true }
           },
-          {
+          // {
-            path: 'EquipmentScrapGrade',
+          //   path: 'EquipmentScrapGrade',
-            component: () => import('@/views/basicData/EquipmentScrapGrade'),
+          //   component: () => import('@/views/basicData/EquipmentScrapGrade'),
-            name: 'EquipmentScrapGrade',
+          //   name: 'EquipmentScrapGrade',
-            meta: { title: routerTitle.basicData.EquipmentScrapGrade?.[language] || routerTitle.basicData.EquipmentScrapGrade.en, icon: 'form', affix: true, required: true, requireToken: true }
+          //   meta: { title: routerTitle.basicData.EquipmentScrapGrade?.[language] || routerTitle.basicData.EquipmentScrapGrade.en, icon: 'form', affix: true, required: true, requireToken: true }
-          },
+          // },
           {
             path: 'scrap',
             component: () => import('@/views/QualityManager/scrap'),

src/views/QualityManager/QCPplan.vue

@@ -2,18 +2,35 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-03 14:28:58
+ * @LastEditTime: 2022-03-04 09:22:58
  * @Description:
 -->
 <template>
   <div class="app-container">
-    <head-form
+    <el-form
-      :placeholder-name="placeholderName"
+      ref="formData"
-      :key-name="keyName"
+      :rules="rules"
-      :show-add="showAdd"
+      :model="listQuery"
-      @getDataList="getList"
+      :inline="true"
-      @add="addNew"
+      size="medium"
-    />
+      label-width="100px"
+    >
+      <el-form-item :label="$t('module.basicData.Warehouse.TimeSlot')" prop="time">
+        <el-date-picker
+          v-model="listQuery.timeSlot"
+          type="daterange"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          :start-placeholder="$t('module.orderManage.order.StartTime')"
+          :end-placeholder="$t('module.orderManage.order.StartTime')"
+          :range-separator="$t('module.orderManage.order.To')"
+          clearable
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="getList()"> {{ 'btn.search' | i18nFilter }} </el-button>
+      </el-form-item>
+    </el-form>
     <base-table
       :page="listQuery.current"
       :limit="listQuery.size"
@@ -35,18 +52,17 @@
       :limit.sync="listQuery.size"
       @pagination="getList()"
     />
+    <Factory-add v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getList" />
   </div>
 </template>
 
 <script>
-import i18n from '@/lang'
+import FactoryAdd from './components/ExecutionInfoDetail.vue'
-import { StateConfigList, StateConfigDelete } from '@/api/basicData/StateConfig'
-import HeadForm from '@/components/basicData/HeadForm'
 import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
 import { timeFormatter } from '@/filters'
-import basicData from '@/filters/basicData'
+import i18n from '@/lang'
 /**
  * 表格表头配置项 TypeScript接口注释
  * tableConfig<ConfigItem> = []
@@ -65,62 +81,51 @@ import basicData from '@/filters/basicData'
 
 const tableBtn = [
   {
-    type: 'edit',
+    type: 'see',
-    btnName: 'btn.edit'
+    btnName: 'btn.see'
   }
-  // {
-  //   type: 'delete',
-  //   btnName: 'btn.delete'
-  // }
 ]
 const tableProps = [
+  {
+    prop: 'name',
+    label: i18n.t('module.quality.QCPplan.QCPcode'),
+    align: 'center'
+  },
   {
     prop: 'createTime',
-    label: i18n.t('module.basicData.factory.createTime'),
+    label: i18n.t('module.quality.QCPplan.getTime'),
     filter: timeFormatter,
     align: 'center'
-  },
-  {
-    prop: 'status',
-    label: i18n.t('module.basicData.StateConfig.status'),
-    align: 'center'
-  },
-  {
-    prop: 'twinkle',
-    label: i18n.t('module.basicData.StateConfig.Twinkle'),
-    filter: basicData('onDuty'),
-    align: 'center'
-  },
-  {
-    prop: 'colour',
-    label: i18n.t('module.basicData.StateConfig.DisplayColor'),
-    align: 'center'
-  },
-  {
-    prop: 'description',
-    label: i18n.t('module.basicData.visual.Remarks'),
-    align: 'center'
   }
 ]
 
 export default {
-  name: 'QCPplan',
+  name: 'ExecutionInfo',
-  components: { Pagination, BaseTable, MethodBtn, HeadForm },
+  components: { Pagination, BaseTable, MethodBtn, FactoryAdd },
+  filters: {
+    statusFilter(status) {
+      const statusMap = {
+        published: 'success',
+        draft: 'info',
+        deleted: 'danger'
+      }
+      return statusMap[status]
+    }
+  },
   data() {
     return {
-      keyName: i18n.t('module.basicData.visual.keyword'),
-      placeholderName: this.$t('module.basicData.StateConfig.status'),
       addOrUpdateVisible: false,
       tableBtn,
-      trueWidth: 150,
+      trueWidth: 200,
       tableProps,
       list: [],
       total: 0,
-      showAdd: false,
       listLoading: true,
+      rules: {},
       listQuery: {
         current: 1,
-        size: 10
+        size: 10,
+        timeSlot: []
       }
     }
   },
@@ -129,37 +134,32 @@ export default {
   },
   methods: {
     handleClick(raw) {
-      console.log(raw)
+      this.addNew(raw.data.id)
-      if (raw.type === 'delete') {
-        this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.status}]?`, this.$t('module.basicData.visual.Tips'), {
-          confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
-          cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
-          type: 'warning'
-        }).then(() => {
-          StateConfigDelete(raw.data.id).then(response => {
-            this.$message({
-              message: this.$t('module.basicData.visual.success'),
-              type: 'success',
-              duration: 1500,
-              onClose: () => {
-                this.getList()
-              }
-            })
-          })
-        }).catch(() => {})
-      }
     },
-    getList(key) {
+    getList() {
-      this.listLoading = true
+      // this.listLoading = true
-      this.listQuery.status = key
+      if (this.listQuery.timeSlot) {
-      StateConfigList(this.listQuery).then(response => {
+        this.listQuery.startTime = this.listQuery.timeSlot[0]
-        if (response.data.records) {
+        this.listQuery.endTime = this.listQuery.timeSlot[1]
-          this.list = response.data.records
+      } else {
-        } else {
+        this.listQuery.startTime = ''
-          this.list.splice(0, this.list.length)
+        this.listQuery.endTime = ''
-        }
+      }
-        this.total = response.data.total
+      // ExecutionInfoList(this.listQuery).then(response => {
-        this.listLoading = false
+      //   if (response.data.records) {
+      //     this.list = response.data.records
+      //   } else {
+      //     this.list.splice(0, this.list.length)
+      //   }
+      //   this.total = response.data.total
+      this.listLoading = false
+      // })
+    },
+    // 新增 / 修改
+    addNew(id) {
+      this.addOrUpdateVisible = true
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(id)
       })
     }
   }

src/views/QualityManager/components/ExecutionInfoDetail.vue

@@ -0,0 +1,115 @@
+<!--
+ * @Author: zwq
+ * @Date: 2020-12-29 16:37:56
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-01-17 15:21:50
+ * @Description:
+-->
+<template>
+  <el-dialog
+    :title="'btn.see' | i18nFilter"
+    :visible.sync="visible"
+  >
+    <el-row :gutter="10">
+      <el-form
+        ref="dataForm"
+        :model="dataForm"
+        size="medium"
+        label-width="110px"
+        label-position="left"
+      >
+        <el-col :span="8">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.OrderName')" prop="name">
+                <el-input v-model="dataForm.name" :placeholder="$t('module.basicData.Warehouse.OrderName')" readonly :style="{width: '100%'}" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.IssueOrderTime')" prop="createTime">
+                <el-input v-model="dataForm.createTime" :placeholder="$t('module.basicData.Warehouse.IssueOrderTime')" readonly :style="{width: '100%'}" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.PlanProcessQuantity')" prop="planQuantity">
+                <el-input v-model="dataForm.planQuantity" :placeholder="$t('module.basicData.Warehouse.PlanProcessQuantity')" readonly :style="{width: '100%'}" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="8">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.OrderCode')" prop="taskCode">
+                <el-input v-model="dataForm.taskCode" :placeholder="$t('module.basicData.Warehouse.OrderCode')" readonly :style="{width: '100%'}" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.OrderStatus')" prop="taskType">
+                <el-input v-model="dataForm.taskType" :placeholder="$t('module.basicData.Warehouse.OrderStatus')" readonly :style="{width: '100%'}" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="8">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.TotalProcessName')" prop="craftName">
+                <el-input v-model="dataForm.craftName" :placeholder="$t('module.basicData.Warehouse.TotalProcessName')" readonly :style="{width: '100%'}" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.SubProcessName')" prop="subProccessName">
+                <el-input
+                  v-model="dataForm.subProccessName"
+                  :placeholder="$t('module.basicData.Warehouse.SubProcessName')"
+                  readonly
+                  :style="{width: '100%'}"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-col>
+      </el-form>
+    </el-row>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { ExecutionInfoDetail } from '@/api/orderManage/00A'
+
+export default {
+  data() {
+    return {
+      visible: false,
+      dataForm: {
+        id: 0,
+        name: undefined,
+        createTime: undefined,
+        taskCode: undefined,
+        taskType: undefined,
+        craftName: undefined,
+        planQuantity: undefined,
+        subProccessName: undefined
+      }
+    }
+  },
+  methods: {
+    init(id) {
+      this.dataForm.id = id || ''
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          ExecutionInfoDetail(this.dataForm.id).then(res => {
+            this.dataForm = res.data
+          })
+        }
+      })
+    }
+  }
+}
+</script>

src/views/QualityManager/scrap/ScrapInfo-add.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
- * @LastEditors: Please set LastEditors
+ * @LastEditors: zwq
- * @LastEditTime: 2021-07-20 11:03:09
+ * @LastEditTime: 2022-03-04 10:39:52
  * @Description:
 -->
 <template>
@@ -122,6 +122,9 @@
           </el-select>
         </el-form-item>
 
+        <el-form-item :label="$t('module.basicData.ScrapInfo.registrationPlace')" prop="placeOfRegis">
+          <el-input v-model="dataForm.placeOfRegis" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.registrationPlace')])" clearable :style="{width: '100%'}" />
+        </el-form-item>
         <el-form-item :label="$t('module.basicData.ScrapInfo.remark')" prop="remark">
           <el-input v-model="dataForm.remark" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.remark')])" clearable :style="{width: '100%'}" />
         </el-form-item>
@@ -141,7 +144,7 @@ import { getScrapInfo, editScrapInfo, addScrapInfo, getScrap } from '@/api/quali
 import { scrapReasonList } from '@/api/dict'
 import { getDictWorker } from '@/api/dict'
 import { getEqList } from '@/api/equipment/maintain'
-import { workOrderList } from '@/api/orderManage/workOrder/workOrder'
+import { workOrderListList } from '@/api/orderManage/workOrder/workOrder'
 
 const wasteGradeArr = [{
   value: '加工可用',
@@ -173,6 +176,7 @@ export default {
         scrapGrade: undefined,
         description: undefined,
         substrateId: undefined,
+        placeOfRegis: '00A',
         remark: undefined
       },
       wasteGradeArr,
@@ -279,7 +283,7 @@ export default {
       })
     },
     async getDict() {
-      const result3 = await workOrderList({
+      const result3 = await workOrderListList({
         current: 1,
         size: 999
       })

src/views/QualityManager/scrap/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
- * @LastEditors: Please set LastEditors
+ * @LastEditors: zwq
- * @LastEditTime: 2021-07-26 13:39:35
+ * @LastEditTime: 2022-03-04 10:40:51
  * @Description:
 -->
 <template>
@@ -11,7 +11,7 @@
       :model="formData"
       :inline="true"
       size="medium"
-      label-width="130px"
+      label-width="100px"
     >
       <el-form-item v-if="false" :label="$t('module.basicData.ScrapInfo.PlateId')" prop="basalId">
         <el-input v-model="formData.basalId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.PlateId')])" style="width:200px" clearable />
@@ -117,11 +117,6 @@ const tableProps = [
     label: i18n.t('module.basicData.ScrapInfo.source'),
     align: 'center'
   },
-  {
-    prop: 'scrapGradeDic',
-    label: i18n.t('module.basicData.ScrapInfo.wasteGrade'),
-    align: 'center'
-  },
   {
     prop: 'equipmentName',
     label: i18n.t('module.basicData.ScrapInfo.name'),

src/views/art/components/Process-add.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
- * @LastEditors: Please set LastEditors
+ * @LastEditors: zwq
- * @LastEditTime: 2021-07-26 14:39:36
+ * @LastEditTime: 2022-03-03 16:43:26
  * @Description:
 -->
 <template>
@@ -16,14 +16,14 @@
       </el-form-item>
       <el-form-item :label="$t('module.art.processList.processEq')" prop="equipmentIds">
         <el-select v-model="dataForm.equipmentIds" clearable filterable multiple>
-          <el-option v-for="item in eqList" :key="item.id" :value="item.id" :label="item.name" />
+          <el-option v-for="item in eqList" :key="item.id" :value="item.id" :label="item.enName" />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('module.art.processList.type')" prop="type">
+      <!-- <el-form-item :label="$t('module.art.processList.type')" prop="type">
         <el-select v-model="dataForm.type" clearable filterable>
           <el-option v-for="item in typeList" :key="item.id" :value="item.id" :label="item.name" />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item :label="$t('module.art.processList.description')" prop="address">
         <el-input v-model="dataForm.description" :placeholder="$i18nForm(['placeholder.input', $t('module.art.processList.description')])" clearable />
       </el-form-item>

src/views/art/processList.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: gtz
  * @Date: 2021-04-06 20:07:22
- * @LastEditors: gtz
+ * @LastEditors: zwq
- * @LastEditTime: 2021-06-23 16:22:06
+ * @LastEditTime: 2022-03-03 17:00:54
  * @Description: file content
 -->
 <template>
@@ -23,7 +23,7 @@
 
 <script>
 // edit here
-import DataDict from './filters'
+// import DataDict from './filters'
 const tableBtn = [{
   type: 'edit',
   btnName: 'btn.edit'
@@ -35,12 +35,14 @@ const tableProps = [{
   prop: 'name',
   label: i18n.t('module.art.processList.processName'),
   align: 'center'
-}, {
+},
-  prop: 'type',
+// {
-  label: i18n.t('module.art.processList.type'),
+//   prop: 'type',
-  align: 'center',
+//   label: i18n.t('module.art.processList.type'),
-  filter: DataDict('typeFilter')
+//   align: 'center',
-}, {
+//   filter: DataDict('typeFilter')
+// },
+{
   prop: 'description',
   label: i18n.t('module.art.processList.description'),
   align: 'center'
@@ -48,7 +50,7 @@ const tableProps = [{
 import BaseTable from '@/components/BaseTable'
 // edit here
 import { list, del } from '@/api/art-manage/process'
-import { equipmentInfoList } from '@/api/basicData/Equipment/equipmentInfo'
+import { equipmentlistList } from '@/api/basicData/Equipment/equipmentInfo'
 import HeadForm from '@/components/basicData/HeadForm'
 import ProcessAdd from './components/Process-add'
 import Pagination from '@/components/Pagination'
@@ -124,10 +126,7 @@ export default {
     },
     async getEqList(key) {
       // edit here
-      const res = await equipmentInfoList({
+      const res = await equipmentlistList()
-        current: 1,
-        size: 999
-      })
       if (res.code === 0) {
         this.eqList = res.data.records
       }

src/views/basicData/GroupModule/components/staff-add.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
- * @LastEditors: gtz
+ * @LastEditors: zwq
- * @LastEditTime: 2021-04-17 16:33:37
+ * @LastEditTime: 2022-03-04 10:06:01
  * @Description:
 -->
 <template>
@@ -62,23 +62,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="20">
-              <el-form-item :label="$t('module.basicData.staff.Profession')" prop="majorId">
+              <el-form-item :label="$t('module.basicData.visual.Remarks')" prop="description">
-                <el-select
+                <el-input v-model="staffData.description" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Remarks')])" clearable :style="{width: '100%'}" />
-                  v-model="staffData.majorId"
-                  :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.staff.Profession')])"
-                  multiple
-                  filterable
-                  clearable
-                  :style="{width: '100%'}"
-                >
-                  <el-option
-                    v-for="(item, index) in majorArr"
-                    :key="index"
-                    :label="item.name"
-                    :value="item.id"
-                    :disabled="item.disabled"
-                  />
-                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
@@ -122,11 +107,6 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="20">
-              <el-form-item :label="$t('module.basicData.visual.Remarks')" prop="description">
-                <el-input v-model="staffData.description" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Remarks')])" clearable :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
           </el-row>
         </el-col>
       </el-form>
@@ -140,7 +120,6 @@
 
 <script>
 import { staffDetail, staffUpdate, staffAdd, staffCode } from '@/api/basicData/GroupModule/staff'
-import { majorList } from '@/api/basicData/GroupModule/major'
 
 export default {
   props: {
@@ -152,7 +131,6 @@ export default {
   data() {
     return {
       visible: false,
-      majorArr: [],
       staffData: {
         name: undefined,
         sex: '',
@@ -211,13 +189,6 @@ export default {
       staffCode().then(res => {
         this.staffData.code = res.data
       })
-      majorList({
-        current: 1,
-        size: 999,
-        name: ''
-      }).then(response => {
-        this.majorArr = response.data.records
-      })
       this.staffData.id = id || ''
       this.visible = true
       this.$nextTick(() => {

src/views/basicData/components/EquipmentScrapGrade-add.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: zwq
- * @LastEditTime: 2021-07-06 11:26:28
+ * @LastEditTime: 2022-03-03 16:49:10
  * @Description:
 -->
 <template>
@@ -83,7 +83,7 @@ export default {
       dataDictionaryDataList({
         current: 1,
         size: 999,
-        dictTypeId: '1412216979622785026'
+        dictTypeId: '2'
       }).then(response => {
         if (response.data.records) {
           this.scrapsArr = response.data.records