diff --git a/src/api/role.js b/src/api/role.js
index 4d2a51b..3f28695 100644
--- a/src/api/role.js
+++ b/src/api/role.js
@@ -10,7 +10,7 @@ import request from '@/utils/request'
 // 获取角色详细信息
 export function getRoleInfo(data) {
   return request({
-    url: `/upms/role/get`,
+    url: `/api/upms/role/get`,
     method: 'post',
     data
   })
@@ -18,7 +18,7 @@ export function getRoleInfo(data) {
 
 export function RoleCode() { // 获取code
   return request({
-    url: '/upms/role/get-code',
+    url: '/api/upms/role/get-code',
     method: 'post'
   })
 }
@@ -26,7 +26,7 @@ export function RoleCode() { // 获取code
 // 获取角色列表
 export function getRoleList(data) {
   return request({
-    url: '/upms/role/list',
+    url: '/api/upms/role/list',
     method: 'post',
     data
   })
@@ -35,7 +35,7 @@ export function getRoleList(data) {
 // 添加角色
 export function addRole(data) {
   return request({
-    url: '/upms/role/add',
+    url: '/api/upms/role/add',
     method: 'post',
     data
   })
@@ -44,7 +44,7 @@ export function addRole(data) {
 // 修改角色
 export function updateRole(data) {
   return request({
-    url: '/upms/role/update',
+    url: '/api/upms/role/update',
     method: 'post',
     data
   })
@@ -53,7 +53,7 @@ export function updateRole(data) {
 // 删除角色
 export function deleteRole(data) {
   return request({
-    url: `/upms/role/delete`,
+    url: `/api/upms/role/delete`,
     method: 'post',
     data
   })
@@ -62,7 +62,7 @@ export function deleteRole(data) {
 // 启停角色
 export function enableRole(data) {
   return request({
-    url: `/upms/role/enabled`,
+    url: `/api/upms/role/enabled`,
     method: 'post',
     data
   })
@@ -71,7 +71,7 @@ export function enableRole(data) {
 // 用户-角色关联授权
 export function saveUserRole(data) {
   return request({
-    url: '/upms/role/saveUserRole',
+    url: '/api/upms/role/saveUserRole',
     method: 'post',
     data
   })
@@ -80,7 +80,7 @@ export function saveUserRole(data) {
 // 用户-角色关联获取
 export function listByUser(id) {
   return request({
-    url: '/upms/role/listByUser',
+    url: '/api/upms/role/listByUser',
     method: 'post',
     data: { id }
   })
diff --git a/src/lang/i18n/en/module/basicData.js b/src/lang/i18n/en/module/basicData.js
index af28a1d..ef36529 100644
--- a/src/lang/i18n/en/module/basicData.js
+++ b/src/lang/i18n/en/module/basicData.js
@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-09 15:14:15
+ * @LastEditTime: 2022-03-09 16:34:56
  * @Description: file content
  */
 export default {
@@ -296,15 +296,20 @@ export default {
     TaskLocation: 'Task Location',
     TargetLocation: 'Target Location',
     OrderName: 'Order Name',
+    OrderType: 'Order Type',
     OrderCode: 'Order Code',
     IssueOrderTime: 'Issue Order Time',
+    startProduceTime: 'Start Produce Time',
     TotalProcessName: 'Total Process Name',
     Priority: 'Priority',
     OrderStatus: 'Order Status',
+    triggerOrigin: 'Trigger Origin',
     ProcessOrNot: 'Process Or Not',
     Unit: 'Unit',
+    scrapQuantity: 'Scrap Quantity',
     RelateProcess: 'Relate Process',
     PlanProcessQuantity: 'Plan Process Quantity',
+    actualProcessQuantity: 'Actual Process Quantity',
     SubProcessName: 'Sub Process Name',
     TaskBoxNumber: 'Task Box Number',
     FullBoxNumber: 'Full Box Number',
diff --git a/src/lang/i18n/zh/module/basicData.js b/src/lang/i18n/zh/module/basicData.js
index 2646129..7a2ce2b 100644
--- a/src/lang/i18n/zh/module/basicData.js
+++ b/src/lang/i18n/zh/module/basicData.js
@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-09 15:14:07
+ * @LastEditTime: 2022-03-09 16:34:50
  */
 export default {
   visual: {
@@ -310,15 +310,20 @@ export default {
     TaskLocation: '任务库位',
     TargetLocation: '目标库位',
     OrderName: '工单名',
+    OrderType: '工单类型',
     OrderCode: '工单编码',
     IssueOrderTime: '下发工单时间',
+    startProduceTime: '开始生产时间',
     TotalProcessName: '总工艺名称',
     Priority: '优先级',
+    scrapQuantity: '废片数量',
     OrderStatus: '工单状态',
+    triggerOrigin: '工单发起方',
     ProcessOrNot: '是否关联工艺',
     Unit: '单位',
     RelateProcess: '关联工艺',
     PlanProcessQuantity: '计划加工数量',
+    actualProcessQuantity: '实际加工数量',
     SubProcessName: '分工艺',
     TaskBoxNumber: '任务箱号',
     FullBoxNumber: '空箱号',
diff --git a/src/views/QualityManager/scrap/ScrapInfo-add.vue b/src/views/QualityManager/scrap/ScrapInfo-add.vue
index 7f4ba1f..d203afc 100644
--- a/src/views/QualityManager/scrap/ScrapInfo-add.vue
+++ b/src/views/QualityManager/scrap/ScrapInfo-add.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-09 14:38:36
+ * @LastEditTime: 2022-03-09 14:59:52
  * @Description:
 -->
 <template>
@@ -178,16 +178,6 @@ export default {
       wasteGradeArr,
       entryType,
       rules: {
-        name: [{
-          required: true,
-          message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.ScrapInfo.WasteName')]),
-          trigger: 'blur'
-        }],
-        code: [{
-          required: true,
-          message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.ScrapInfo.WasteCode')]),
-          trigger: 'blur'
-        }],
         equipmentId: [{
           required: true,
           message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.ScrapInfo.name')]),
@@ -202,6 +192,11 @@ export default {
           required: true,
           message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.ScrapInfo.registerPerson')]),
           trigger: 'change'
+        }],
+        scrapReasonId: [{
+          required: true,
+          message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.ScrapInfo.cause')]),
+          trigger: 'change'
         }]
       },
       dict: {
diff --git a/src/views/art/components/Process-add.vue b/src/views/art/components/Process-add.vue
index c98acf6..9683e14 100644
--- a/src/views/art/components/Process-add.vue
+++ b/src/views/art/components/Process-add.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-03 16:43:26
+ * @LastEditTime: 2022-03-09 16:17:23
  * @Description:
 -->
 <template>
@@ -16,7 +16,7 @@
       </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.enName" />
+          <el-option v-for="item in eqList" :key="item.id" :value="item.id" :label="item.name" />
         </el-select>
       </el-form-item>
       <!-- <el-form-item :label="$t('module.art.processList.type')" prop="type">
diff --git a/src/views/art/processList.vue b/src/views/art/processList.vue
index 8b5e5d4..eb92784 100644
--- a/src/views/art/processList.vue
+++ b/src/views/art/processList.vue
@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2021-04-06 20:07:22
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-03 17:00:54
+ * @LastEditTime: 2022-03-09 16:19:15
  * @Description: file content
 -->
 <template>
@@ -128,7 +128,7 @@ export default {
       // edit here
       const res = await equipmentlistList()
       if (res.code === 0) {
-        this.eqList = res.data.records
+        this.eqList = res.data
       }
       this.getList()
     },
diff --git a/src/views/orderManage/components/ExecutionInfoDetail.vue b/src/views/orderManage/components/ExecutionInfoDetail.vue
index 023a9d1..71c7470 100644
--- a/src/views/orderManage/components/ExecutionInfoDetail.vue
+++ b/src/views/orderManage/components/ExecutionInfoDetail.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: zwq
- * @LastEditTime: 2022-01-17 15:21:50
+ * @LastEditTime: 2022-03-09 16:43:01
  * @Description:
 -->
 <template>
@@ -26,8 +26,8 @@
               </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 :label="$t('module.basicData.Warehouse.OrderStatus')" prop="status">
+                <el-input v-model="dataForm.status" :placeholder="$t('module.basicData.Warehouse.OrderStatus')" readonly :style="{width: '100%'}" />
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -35,18 +35,33 @@
                 <el-input v-model="dataForm.planQuantity" :placeholder="$t('module.basicData.Warehouse.PlanProcessQuantity')" readonly :style="{width: '100%'}" />
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.Priority')" prop="priority">
+                <el-input v-model="dataForm.priority" :placeholder="$t('module.basicData.Warehouse.Priority')" 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 :label="$t('module.basicData.Warehouse.OrderCode')" prop="code">
+                <el-input v-model="dataForm.code" :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 :label="$t('module.basicData.Warehouse.startProduceTime')" prop="startProduceTime">
+                <el-input v-model="dataForm.startProduceTime" :placeholder="$t('module.basicData.Warehouse.startProduceTime')" readonly :style="{width: '100%'}" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.actualProcessQuantity')" prop="actualQuantity">
+                <el-input v-model="dataForm.actualQuantity" :placeholder="$t('module.basicData.Warehouse.actualProcessQuantity')" readonly :style="{width: '100%'}" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.triggerOrigin')" prop="triggerOrigin">
+                <el-input v-model="dataForm.triggerOrigin" :placeholder="$t('module.basicData.Warehouse.triggerOrigin')" readonly :style="{width: '100%'}" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -68,6 +83,16 @@
                 />
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.scrapQuantity')" prop="scrapQuantity">
+                <el-input v-model="dataForm.scrapQuantity" :placeholder="$t('module.basicData.Warehouse.scrapQuantity')" readonly :style="{width: '100%'}" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.OrderType')" prop="type">
+                <el-input v-model="dataForm.type" :placeholder="$t('module.basicData.Warehouse.OrderType')" readonly :style="{width: '100%'}" />
+              </el-form-item>
+            </el-col>
           </el-row>
         </el-col>
       </el-form>
@@ -79,7 +104,7 @@
 </template>
 
 <script>
-import { ExecutionInfoDetail } from '@/api/orderManage/00A'
+import { ProcessInfoDetail } from '@/api/orderManage/00A'
 
 export default {
   data() {
@@ -89,8 +114,14 @@ export default {
         id: 0,
         name: undefined,
         createTime: undefined,
-        taskCode: undefined,
-        taskType: undefined,
+        priority: '',
+        actualQuantity: '',
+        startProduceTime: '',
+        scrapQuantity: '',
+        triggerOrigin: '',
+        type: '',
+        code: undefined,
+        status: undefined,
         craftName: undefined,
         planQuantity: undefined,
         subProccessName: undefined
@@ -104,11 +135,44 @@ export default {
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
-          ExecutionInfoDetail(this.dataForm.id).then(res => {
+          ProcessInfoDetail(this.dataForm.id).then(res => {
+            res.data.status = this.statusfilter('orderStatus', res.data.status)
+            res.data.type = this.statusfilter('orderType', res.data.type)
+            res.data.priority = this.statusfilter('priority', res.data.priority)
+            res.data.triggerOrigin = this.statusfilter('triggerOrigin', res.data.triggerOrigin)
             this.dataForm = res.data
           })
         }
       })
+    },
+    statusfilter(type, val) {
+      const filterObj = {
+        orderStatus: {
+          '1': '未激活',
+          '2': '等待',
+          '3': '激活',
+          '4': '暂停',
+          '9': '完成'
+        },
+        priority: {
+          '1': '低',
+          '2': '正常',
+          '3': '高'
+        },
+        orderType: {
+          '1': '生产工单',
+          '2': '重工工单',
+          '3': '测试工单'
+        },
+        triggerOrigin: {
+          '1': 'MES',
+          '2': 'ERP',
+          '3': 'PID1',
+          '4': '00A',
+          '5': '00C'
+        }
+      }
+      return filterObj?.[type]?.[val]
     }
   }
 }
diff --git a/src/views/orderManage/components/ProcessInfoDetail.vue b/src/views/orderManage/components/ProcessInfoDetail.vue
index b66ebb7..c03e83c 100644
--- a/src/views/orderManage/components/ProcessInfoDetail.vue
+++ b/src/views/orderManage/components/ProcessInfoDetail.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: zwq
- * @LastEditTime: 2022-01-17 15:22:08
+ * @LastEditTime: 2022-03-09 16:40:11
  * @Description:
 -->
 <template>
@@ -26,8 +26,8 @@
               </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 :label="$t('module.basicData.Warehouse.OrderStatus')" prop="status">
+                <el-input v-model="dataForm.status" :placeholder="$t('module.basicData.Warehouse.OrderStatus')" readonly :style="{width: '100%'}" />
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -35,18 +35,33 @@
                 <el-input v-model="dataForm.planQuantity" :placeholder="$t('module.basicData.Warehouse.PlanProcessQuantity')" readonly :style="{width: '100%'}" />
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.Priority')" prop="priority">
+                <el-input v-model="dataForm.priority" :placeholder="$t('module.basicData.Warehouse.Priority')" 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 :label="$t('module.basicData.Warehouse.OrderCode')" prop="code">
+                <el-input v-model="dataForm.code" :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 :label="$t('module.basicData.Warehouse.startProduceTime')" prop="startProduceTime">
+                <el-input v-model="dataForm.startProduceTime" :placeholder="$t('module.basicData.Warehouse.startProduceTime')" readonly :style="{width: '100%'}" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.actualProcessQuantity')" prop="actualQuantity">
+                <el-input v-model="dataForm.actualQuantity" :placeholder="$t('module.basicData.Warehouse.actualProcessQuantity')" readonly :style="{width: '100%'}" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.triggerOrigin')" prop="triggerOrigin">
+                <el-input v-model="dataForm.triggerOrigin" :placeholder="$t('module.basicData.Warehouse.triggerOrigin')" readonly :style="{width: '100%'}" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -68,6 +83,16 @@
                 />
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.scrapQuantity')" prop="scrapQuantity">
+                <el-input v-model="dataForm.scrapQuantity" :placeholder="$t('module.basicData.Warehouse.scrapQuantity')" readonly :style="{width: '100%'}" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.OrderType')" prop="type">
+                <el-input v-model="dataForm.type" :placeholder="$t('module.basicData.Warehouse.OrderType')" readonly :style="{width: '100%'}" />
+              </el-form-item>
+            </el-col>
           </el-row>
         </el-col>
       </el-form>
@@ -89,8 +114,14 @@ export default {
         id: 0,
         name: undefined,
         createTime: undefined,
-        taskCode: undefined,
-        taskType: undefined,
+        priority: '',
+        actualQuantity: '',
+        startProduceTime: '',
+        scrapQuantity: '',
+        triggerOrigin: '',
+        type: '',
+        code: undefined,
+        status: undefined,
         craftName: undefined,
         planQuantity: undefined,
         subProccessName: undefined
@@ -105,10 +136,43 @@ export default {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
           ProcessInfoDetail(this.dataForm.id).then(res => {
+            res.data.status = this.statusfilter('orderStatus', res.data.status)
+            res.data.type = this.statusfilter('orderType', res.data.type)
+            res.data.priority = this.statusfilter('priority', res.data.priority)
+            res.data.triggerOrigin = this.statusfilter('triggerOrigin', res.data.triggerOrigin)
             this.dataForm = res.data
           })
         }
       })
+    },
+    statusfilter(type, val) {
+      const filterObj = {
+        orderStatus: {
+          '1': '未激活',
+          '2': '等待',
+          '3': '激活',
+          '4': '暂停',
+          '9': '完成'
+        },
+        priority: {
+          '1': '低',
+          '2': '正常',
+          '3': '高'
+        },
+        orderType: {
+          '1': '生产工单',
+          '2': '重工工单',
+          '3': '测试工单'
+        },
+        triggerOrigin: {
+          '1': 'MES',
+          '2': 'ERP',
+          '3': 'PID1',
+          '4': '00A',
+          '5': '00C'
+        }
+      }
+      return filterObj?.[type]?.[val]
     }
   }
 }
diff --git a/src/views/orderManage/components/processLinkBtn.vue b/src/views/orderManage/components/processLinkBtn.vue
index 9c8668e..36dc40f 100644
--- a/src/views/orderManage/components/processLinkBtn.vue
+++ b/src/views/orderManage/components/processLinkBtn.vue
@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-01-07 20:09:37
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-07 09:25:31
+ * @LastEditTime: 2022-03-09 15:52:23
  * @FilePath: \basic-admin\src\components\BaseTable\subcomponents\CheckDetail.vue
  * @Description:
 -->
@@ -16,9 +16,9 @@
         <el-select v-model="value" placeholder="请选择">
           <el-option
             v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
           />
         </el-select>
       </div>
@@ -32,6 +32,7 @@
 </template>
 
 <script>
+import { list } from '@/api/art-manage/art.js'
 export default {
   props: {
     injectData: {
@@ -53,7 +54,18 @@ export default {
       value: ''
     }
   },
+  created() {
+    this.init()
+  },
   methods: {
+    init() {
+      list({
+        current: 1,
+        size: 999
+      }).then(response => {
+        this.options = response.data.records
+      })
+    },
     emitClick() {
       console.log(this.injectData)
       console.log(this.value)