Browse Source

1. 质检原始记录屏蔽 添加炉号
2. 棒一确认之后推钢室界面原始记录 棒一无法修改 ; 班次实绩不受影响

zhangafei 2 weeks ago
parent
commit
9f36f986b1

+ 4 - 4
.env.development

@@ -6,15 +6,15 @@ VITE_PUBLIC_PATH = /
 
 # 跨域代理,您可以配置多个 ,请注意,没有换行符
 # VITE_PROXY = [["/jeecgboot","http://192.168.1.53:9999"],["/upload","http://localhost:3300/upload"]]
-# VITE_PROXY = [["/jeecgboot","http://192.168.1.6:9999"],["/upload","http://localhost:3300/upload"]]
-VITE_PROXY = [["/jeecgboot","http://192.168.0.119:9999"],["/upload","http://localhost:3300/upload"]]
+VITE_PROXY = [["/jeecgboot","http://192.168.1.6:9999"],["/upload","http://localhost:3300/upload"]]
+# VITE_PROXY = [["/jeecgboot","http://192.168.0.119:9999"],["/upload","http://localhost:3300/upload"]]
 # VITE_PROXY = [["/jeecgboot","http://123.57.213.14:9898"],["/upload","http://localhost:3300/upload"]]
 
 #后台接口全路径地址(必填)
 # VITE_GLOB_DOMAIN_URL=http://localhost:9999
-# VITE_GLOB_DOMAIN_URL=http://192.168.1.6:9999
+VITE_GLOB_DOMAIN_URL=http://192.168.1.6:9999
 # VITE_GLOB_DOMAIN_URL=http://192.168.1.53:9999
-VITE_GLOB_DOMAIN_URL=http://192.168.0.119:9999
+# VITE_GLOB_DOMAIN_URL=http://192.168.0.119:9999
 # VITE_GLOB_DOMAIN_URL=http://123.57.213.14:9898
 
 

+ 8 - 0
src/views/billet/operator/components/orgData.vue

@@ -274,6 +274,10 @@
                     if (!record.heatNo) {
                       return '';
                     }
+
+                    if (record.confirmTime) {
+                      return text;
+                    }
                     return h(
                       Input,
                       { class: 'total-input', size: 'small', bordered: false, value: text, onBlur: (e) => handleSizeChange(e, record, newSize) },
@@ -665,6 +669,10 @@
                       if (!record.heatNo) {
                         return '';
                       }
+                      if (record.confirmTime) {
+                        return text;
+                      }
+
                       return h(
                         Input,
                         { class: 'total-input', size: 'small', bordered: false, value: text, onBlur: (e) => handleSizeChange(e, record, column) },

+ 7 - 2
src/views/billet/operator/components/printOriginalRecords.vue

@@ -18,7 +18,9 @@
       <div class="ticket next-ticket">
         <div style="text-align: center; position: relative">
           <div class="noprint" style="position: absolute; z-index: 100">
-            <a-button v-if="isConfirmOrgData || !isEditAbled" type="primary" style="margin-right: 10px" @click="addHeatNo">添加炉号</a-button>
+            <a-button v-if="(isConfirmOrgData || !isEditAbled) && showAddHeatNo" type="primary" style="margin-right: 10px" @click="addHeatNo"
+              >添加炉号</a-button
+            >
             <a-button
               v-if="isConfirmOrgData"
               type="primary"
@@ -516,9 +518,12 @@
     return newSip;
   };
 
+  const showAddHeatNo = ref(true);
   const [registerModal, { changeOkLoading, changeLoading, closeModal }] = useModalInner(async (data) => {
-    const { ccmNo, shiftText, queryType, curShiftInfo, changeShiftId, time, confirmOrgData } = data;
+    const { ccmNo, shiftText, queryType, curShiftInfo, changeShiftId, time, confirmOrgData, isShowAddHeatNo } = data;
     printKey.value = dayjs().unix();
+    // isShowAddHeatNo 是否显示添加炉号按钮 质检页面使用
+    showAddHeatNo.value = isShowAddHeatNo !== false;
 
     // 获取堆垛信息
     getStackInfo(ccmNo);

+ 8 - 4
src/views/billet/quality/index.vue

@@ -42,7 +42,6 @@
               @click="
                 () => {
                   switchMiopen = true;
-                  switchMiNum = 0;
                 }
               "
             >
@@ -68,6 +67,7 @@
                       shiftGroup: shiftPerformanceColumns[currentShift] ? shiftPerformanceColumns[currentShift].shiftGroup : '',
                     },
                     changeShiftId: shiftPerformanceColumns[currentShift] ? shiftPerformanceColumns[currentShift].id : '',
+                    isShowAddHeatNo: false,
                   })
               "
             >
@@ -164,7 +164,7 @@
   <!-- 切换米重 -->
   <a-modal v-model:open="switchMiopen" title="切换米重" ok-text="确认" cancel-text="取消" @ok="switchMiSubmit">
     <div style="margin: 20px">
-      <a-input-number v-model:value="switchMiNum" placeholder="米重" :min="0" />
+      <a-input-number v-model:value="switchMiNum" placeholder="米重" :min="0" :precision="4" />
     </div>
   </a-modal>
 </template>
@@ -291,13 +291,18 @@
   const statisticsInfo = ref<any>({});
   const getList = async () => {
     try {
+      if (!shiftPerformanceColumns.value[currentShift.value]) {
+        setLoading(false);
+        return;
+      }
       setLoading(true);
       const res = await getQualityInspection({
         ccmNo: ccmNo.value,
         changeShiftId: shiftPerformanceColumns.value[currentShift.value].id,
       });
 
-      const { records, statistics } = res;
+      const { records, statistics, meterWeight } = res;
+      switchMiNum.value = meterWeight;
       statisticsInfo.value = { ...statistics, orgRemark: statistics.remark };
 
       let sizeArr: string[] = [];
@@ -362,7 +367,6 @@
           ...(records[index] || {}),
           dayLength: dayLengthArr[index] || '',
           workLength: workLengthArr[index] || '',
-          deliveryTimeDate: dayjs(item.deliveryTime),
         };
       });
       setColumns(oldColumns);

+ 1 - 3
src/views/billet/quality/quality.data.ts

@@ -31,13 +31,11 @@ export const getTableColumns = ({ onTimeChange, onClickRemark, onBrandNumChange
     width: 120,
     align: 'center',
     customRender({ text, record }) {
-      console.log('2222222222222', record);
-      console.log('1111111111111', text, record.deliveryTimeDate.format('YYYY-MM-DD HH:mm:ss'));
       if (!record.heatNo) return '';
       return h(DatePicker, {
         bordered: false,
         showTime: true,
-        defaultValue: record.deliveryTimeDate,
+        defaultValue: dayjs(text),
         onChange(date) {
           onTimeChange && onTimeChange(date, record);
         },