更新

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'),