更新

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
-      :placeholder-name="placeholderName"
-      :key-name="keyName"
-      :show-add="showAdd"
-      @getDataList="getList"
-      @add="addNew"
-    />
+    <el-form
+      ref="formData"
+      :rules="rules"
+      :model="listQuery"
+      :inline="true"
+      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 { StateConfigList, StateConfigDelete } from '@/api/basicData/StateConfig'
-import HeadForm from '@/components/basicData/HeadForm'
+import FactoryAdd from './components/ExecutionInfoDetail.vue'
 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',
-    btnName: 'btn.edit'
+    type: 'see',
+    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',
-  components: { Pagination, BaseTable, MethodBtn, HeadForm },
+  name: 'ExecutionInfo',
+  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)
-      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(() => {})
-      }
+      this.addNew(raw.data.id)
     },
-    getList(key) {
-      this.listLoading = true
-      this.listQuery.status = key
-      StateConfigList(this.listQuery).then(response => {
-        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
+    getList() {
+      // this.listLoading = true
+      if (this.listQuery.timeSlot) {
+        this.listQuery.startTime = this.listQuery.timeSlot[0]
+        this.listQuery.endTime = this.listQuery.timeSlot[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
+      // ExecutionInfoList(this.listQuery).then(response => {
+      //   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
- * @LastEditTime: 2021-07-20 11:03:09
+ * @LastEditors: zwq
+ * @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
- * @LastEditTime: 2021-07-26 13:39:35
+ * @LastEditors: zwq
+ * @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'),