提交代码

src/views/NCcode/index.vue

@@ -976,7 +976,7 @@ const selectedDeviceIds = ref<any>([])
 
 function handlerConnectionDevice(row:any) {
   deviceDocumentConnectionVisible.value = true
-  title.value = row.deviceName + "设备工艺文档关联"
+  title.value = row.ncName + "关联设备"
   deviceDocumentConnection.sourceId = row.id
   getDeviceList(deviceDocumentConnection.sourceId)
 }

src/views/biz/defectiveWarehouse/index.vue

@@ -272,6 +272,9 @@ const columns: DataTableColumns<DefectiveWarehouse> = [
       var status = row.status
       if (status == 0 || status == 1) {
         return h('div', {style: {display: 'flex', alignItems: 'center', gap: '8px', flexWrap: 'nowrap'}}, [
+          h(NButton, {size: 'small', quaternary: true, onClick: () => handleDetail(row)}, {
+            default: () => ['详情']
+          }),
           h(NButton, {size: 'small', quaternary: true, onClick: () => handleConfirm(row)}, {
             default: () => [h(NIcon, null, {default: () => h(CreateOutline)}), '确认入库']
           }),
@@ -280,18 +283,15 @@ const columns: DataTableColumns<DefectiveWarehouse> = [
           }),
           h(NButton, {size: 'small', quaternary: true, type: 'error', onClick: () => handleDelete(row)}, {
             default: () => [h(NIcon, null, {default: () => h(TrashOutline)}), ' 删除']
-          }),
-          h(NButton, {size: 'small', quaternary: true, onClick: () => handleDetail(row)}, {
-            default: () => ['详情']
           })
         ])
       } else if (status == 2) {
         return h('div', {style: {display: 'flex', alignItems: 'center', gap: '8px', flexWrap: 'nowrap'}}, [
-          h(NButton, {size: 'small', quaternary: true, onClick: () => handleCancel(row)}, {
-            default: () => [h(NIcon, null, {default: () => h(CreateOutline)}), '撤回入库']
-          }),
           h(NButton, {size: 'small', quaternary: true,  onClick: () => handleDetail(row)}, {
             default: () => ['详情']
+          }),
+          h(NButton, {size: 'small', quaternary: true, onClick: () => handleCancel(row)}, {
+            default: () => [h(NIcon, null, {default: () => h(CreateOutline)}), '撤回入库']
           })
         ])
       }

src/views/biz/orderProcessPlan/board.vue

@@ -1326,7 +1326,8 @@ function disphand(process: ProcessPlanItemVO, order?: OrderProcessPlanVO) {
 
   const planQty = Number(entity.quantity) || 0
   const completedQty = Number(process.completedQty) || 0
-  const remainQty = Math.max(0, planQty - completedQty)
+  const patchNum = Number(process.patchNum) || 0
+  const remainQty = Math.max(0, planQty - patchNum)
   dispatchmodal.value = true
   dispatchformRef.value?.restoreValidation()
   dispatchform.id = entity.id

src/views/biz/qualityTesting/index.vue

@@ -180,8 +180,8 @@
 
 
     <!--质检单详情面板-->
-    <n-modal v-model:show="detailVisible" preset="card" :title="detailTitle" style="width: 800px">
+    <n-drawer v-model:show="detailVisible" preset="card" :title="detailTitle" style="width: 1200px">
-      <n-card hoverable style="margin-bottom: 12px" >
+      <n-card hoverable style="margin: 10px" >
         <template #header>
           <div style="display:flex;justify-content:space-between;align-items:center;width:100%">
             <span>主表信息</span>
@@ -190,7 +190,7 @@
             </n-button>
           </div>
         </template>
-        <n-descriptions :column="3" bordered v-show="!infoIsCollapse">
+        <n-descriptions :column="8" bordered v-show="!infoIsCollapse">
           <n-descriptions-item
               v-for="item in mappedInfoList"
               :key="item.key"
@@ -200,7 +200,7 @@
           </n-descriptions-item>
         </n-descriptions>
       </n-card>
-      <n-card hoverable style="margin-bottom: 12px">
+      <n-card hoverable style="margin: 10px">
          <template #header>
           <div style="display:flex;justify-content:space-between;align-items:center;width:100%">
             <span>明细列表</span>
@@ -223,7 +223,7 @@
 <!--      <n-card title="追溯码" hoverable>-->
 <!--        追溯码：{{}}-->
 <!--      </n-card>-->
-    </n-modal>
+    </n-drawer>
 
     <!-- 提交判定明细抽屉 -->
      <n-drawer v-model:show="showSubmitOuter" :width="900">
@@ -328,7 +328,7 @@ const detailVisible = ref(false)
 const detailTitle = ref('')
 
 const infoIsCollapse = ref(false)
-const detailIsCollapse = ref(true)
+const detailIsCollapse = ref(false)
 
 //提交判定明细
 // const submitDetailModalVisible = ref(false)
@@ -401,29 +401,13 @@ const detailColumns: DataTableColumns<QcResultDetail> = [
   {
     title: '批次号',
     key: 'traceCode',
-    width: 80,
+    width: 150,
     align: 'center',
     render: (row) => {
       const val = row.traceCode
       return val ?? '-'
     }
   },
-  {
-    title: '不良代码',
-    key: 'defectCode',
-    width: 80,
-    align: 'center',
-    render: (row) => {
-      const val = row.defectCode
-      return val ?? '-'
-    }
-  },
-  {
-    title: '后续动作',
-    key: 'handleAction',
-    width: 80,
-    align: 'center'
-  },
   {
     title: '动作执行状态',
     key: 'actionStatus',
@@ -638,8 +622,8 @@ const columns: DataTableColumns<QualityTesting> = [
             { label: '提交判定明细', key: 'submitResultDetail',show:row.status == 1 },
             // { type: 'divider',show:row.status == 1 }, // 分割线
             // { label: '提交部分判定明细', key: 'submitBFResultDetail',show:(row.status == 1 || row.status == 2) },
-            { type: 'divider',show:(row.status == 1 || row.status == 2) }, // 分割线
+            // { type: 'divider',show:(row.status == 1 || row.status == 2) }, // 分割线
-            { label: '查询判定明细', key: 'queryResultDetail' },
+            // { label: '查询判定明细', key: 'queryResultDetail' },
             // { type: 'divider' }, // 分割线
             // { label: '质检撤回', key: 'cancelQuality' },
           ],

src/views/lllustrated/index.vue

@@ -1050,7 +1050,7 @@ const selectedDeviceIds = ref<Device[]>([])
 
 function handlerConnectionDevice(row:any) {
   deviceDocumentConnectionVisible.value = true
-  title.value = row.deviceName + "图文工艺文档关联"
+  title.value = row.drawingName + "关联设备"
   deviceDocumentConnection.sourceId = row.id
   getDeviceList(deviceDocumentConnection.sourceId)
 }

src/views/production/myassigtask/index.vue

@@ -21,6 +21,9 @@
           <n-form-item-gi :span="4" label="工序名称">
             <n-input v-model:value="searchForm.processName" placeholder="请输入工序名称" clearable />
           </n-form-item-gi>
+          <n-form-item-gi :span="4" label="工单号">
+            <n-input v-model:value="searchForm.workOrderCode" placeholder="请输入工单号" clearable />
+          </n-form-item-gi>
           <n-form-item-gi :span="4">
             <n-space> 
               <n-button type="primary" @click="search">
@@ -268,6 +271,7 @@ const searchForm = reactive({
   assingCode:'',
   materialCode:'',
   materialName:'',
+  workOrderCode:''
 })
 
 
@@ -499,6 +503,7 @@ function search() {
     assingCode: searchForm.assingCode,
     materialCode: searchForm.materialCode,
     materialName: searchForm.materialName,
+    workOrderCode:searchForm.workOrderCode
   })
 }
 
@@ -509,6 +514,7 @@ function reset() {
   searchForm.assingCode = ''
   searchForm.materialCode = ''
   searchForm.materialName = ''
+  searchForm.workOrderCode = ''
   treeTableRef.value?.loadTableData({})
 }
 
@@ -519,6 +525,7 @@ function getlist() {
     assingCode: searchForm.assingCode,
     materialCode: searchForm.materialCode,
     materialName: searchForm.materialName,
+    workOrderCode: searchForm.workOrderCode
   })
 }