Bläddra i källkod

超期原因添加

dengrui 3 månader sedan
förälder
incheckning
4bc36dc149
3 ändrade filer med 35 tillägg och 15 borttagningar
  1. 1 1
      .env.development
  2. 1 0
      src/store/modules/dictionary.ts
  3. 33 14
      src/views/pro-operation/report-work/index.vue

+ 1 - 1
.env.development

@@ -11,7 +11,7 @@ VITE_APP_BASE_API = '/dev-api'
 VITE_APP_UPLOAD_URL = 'http://192.168.1.4:9000'
 
 # 开发接口地址
-VITE_APP_API_URL = 'http://121.41.179.41:8079'
+VITE_APP_API_URL = 'http://10.88.11.200:8079'
 # Websocket地址
 VITE_WEBSOCKET_URL = 'ws://192.168.101.178:8079'
 ``

+ 1 - 0
src/store/modules/dictionary.ts

@@ -17,6 +17,7 @@ export const useDictionaryStore = defineStore("dictionaryStore", () => {
     "escalation_fault_state",
     "station_task_state",
     "device_type",
+    "out_time_reason",
   ];
   const dicts = ref<{ [key: string]: any[] }>({});
 

+ 33 - 14
src/views/pro-operation/report-work/index.vue

@@ -21,21 +21,21 @@
             size="large"
           >
             <el-select
-                v-if="processStore.scanInfo.batchReport == 1"
-                v-model="selectedProcess"
-                :filterable="true"
-                multiple
-                placeholder="请选择流转卡号,可以输入或者扫码筛选"
-                style="margin-bottom: 20px"
+              v-if="processStore.scanInfo.batchReport == 1"
+              v-model="selectedProcess"
+              :filterable="true"
+              multiple
+              placeholder="请选择流转卡号,可以输入或者扫码筛选"
+              style="margin-bottom: 20px"
             >
               <template #prefix
-              ><img src="@/assets/icons/shaoma.svg"
+                ><img src="@/assets/icons/shaoma.svg"
               /></template>
               <el-option
-                  v-for="item in processList"
-                  :key="item"
-                  :label="item"
-                  :value="item"
+                v-for="item in processList"
+                :key="item"
+                :label="item"
+                :value="item"
               />
             </el-select>
             <el-row
@@ -101,6 +101,25 @@
       </el-scrollbar>
     </template>
     <template #footer>
+      <div
+        style="display: flex; margin-bottom: 10px"
+        v-if="processStore.scanInfo.outTime == true"
+      >
+        <div style="width: 120px">超期原因:</div>
+
+        <el-select
+          v-model="outTimeReason"
+          placeholder="Select"
+          style="width: 240px"
+        >
+          <el-option
+            v-for="item in dictStroe.dicts.out_time_reason"
+            :key="item.value"
+            :label="item.dictLabel"
+            :value="item.dictValue"
+          />
+        </el-select>
+      </div>
       <div class="bottom-btns">
         <el-button class="cancelBtn el-button-big" @click="cancelClick"
           >取消</el-button
@@ -120,7 +139,7 @@
 <script lang="ts" setup>
 import { useProcessStore } from "@/store/modules/processView";
 import { useDictionaryStore } from "@/store/modules/dictionary";
-import { getProcessInfo,getunProcessedList } from "@/api/prosteps";
+import { getProcessInfo, getunProcessedList } from "@/api/prosteps";
 import { emitter, EventsNames } from "@/utils/common";
 import { CirclePlus, Remove } from "@element-plus/icons-vue";
 import { useUserStore } from "@/store/modules/user";
@@ -128,6 +147,7 @@ import { reportWork } from "@/api/process/reportBreak";
 
 const processStore = useProcessStore();
 const dictStroe = useDictionaryStore();
+console.log(dictStroe.dicts.out_time_reason, "2");
 const userStore = useUserStore();
 // ================= 选择工序相关
 const selectedProcess = ref<any[]>([]);
@@ -136,7 +156,7 @@ const router = useRouter();
 
 const drawerVisible = ref(false);
 const formDisabled = ref(true);
-
+const outTimeReason = ref("");
 const formRef = ref<InstanceType<typeof ElForm>>();
 
 const persons = ref<
@@ -165,7 +185,6 @@ const openReportWorkDrawer = () => {
       });
     }
   });
-
 };
 
 const cancelClick = () => {