bug修改1125

public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "2.1"
+  "version": "2.2"
 }

src/layout/index.vue

@@ -1,12 +1,19 @@
 <template>
-  <div class="wh-full" v-loading.fullscreen.lock="fullscreenLoading" element-loading-text="加载中..."
-    element-loading-background="rgba(122, 122, 122, 1 )">
+  <div
+    class="wh-full"
+    v-loading.fullscreen.lock="fullscreenLoading"
+    element-loading-text="加载中..."
+    element-loading-background="rgba(122, 122, 122, 1 )"
+  >
     <Header />
     <section class="app-main">
       <router-view>
         <template #default="{ Component, route }">
-          <transition enter-active-class="animate__animated animate__fadeIn" mode="out-in">
-            <keep-alive :include="['ProcessMain', 'ProSteps']">
+          <transition
+            enter-active-class="animate__animated animate__fadeIn"
+            mode="out-in"
+          >
+            <keep-alive :include="['ProSteps']">
               <component :is="Component" />
             </keep-alive>
           </transition>

src/styles/index.scss

@@ -194,7 +194,7 @@
   position: fixed;
   width: 100vw;
   height: 100vh;
-  z-index: 2;
+  z-index: 99999999;
   background-color: #00000030;
   top: 0;
   left: 0;

src/views/prepare-complete-suit/components/steps.vue

@@ -85,8 +85,6 @@ const props = defineProps({
 const emit = defineEmits(["setstepindex"]);
 const boxClick = (item, index) => {
   //第二层参数赋值
-  store.odersData.operationId = item.operationId;
-  store.odersData.operationType = item.operationType;
   store.processInfo.operationCode = item.operationCode;
   store.processInfo.operationName = item.operationName;
   emit("setstepindex", index);

src/views/pro-operation/remove/index.vue

@@ -57,7 +57,14 @@
             :rules="rules1"
             label-width="100"
           >
-            <el-form-item label="流转卡号" prop="seqs">
+            <el-form-item
+              label="流转卡号"
+              prop="seqs"
+              :rules="{
+                required: true,
+                trigger: 'change',
+              }"
+            >
               <el-select
                 v-model="ruleForm1.seqs"
                 multiple
@@ -72,22 +79,57 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="发生地点" prop="address">
+            <el-form-item
+              label="发生地点"
+              prop="address"
+              :rules="{
+                required: true,
+                trigger: 'change',
+              }"
+            >
               <el-input v-model="ruleForm1.address" />
             </el-form-item>
-            <el-form-item label="数量" prop="address">
+            <el-form-item
+              label="数量"
+              prop="remark1[num]"
+              :rules="{
+                required: true,
+                trigger: 'change',
+              }"
+            >
               <el-input v-model="ruleForm1.remark1.num" />
             </el-form-item>
-            <el-form-item label="问题描述" prop="remark1[content]">
+            <el-form-item
+              label="问题描述"
+              prop="remark1[content]"
+              :rules="{
+                required: true,
+                trigger: 'change',
+              }"
+            >
               <el-input type="textarea" v-model="ruleForm1.remark1.content" />
             </el-form-item>
-            <el-form-item label="审理级别：" prop="remark1[content]">
+            <el-form-item
+              label="审理级别："
+              prop="remark1[lv]"
+              :rules="{
+                required: true,
+                trigger: 'change',
+              }"
+            >
               <el-radio-group v-model="ruleForm1.remark1.lv">
                 <el-radio value="1">一级</el-radio>
                 <el-radio value="2">二级</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item label="填表人" prop="reason">
+            <el-form-item
+              label="填表人"
+              prop="remark1[user1]"
+              :rules="{
+                required: true,
+                trigger: 'change',
+              }"
+            >
               <el-select
                 v-model="ruleForm1.remark1.user1"
                 filterable
@@ -102,7 +144,14 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="发生日期" prop="reason">
+            <el-form-item
+              label="发生日期"
+              prop="remark1[time]"
+              :rules="{
+                required: true,
+                trigger: 'change',
+              }"
+            >
               <el-date-picker
                 v-model="ruleForm1.remark1.time"
                 type="date"
@@ -110,7 +159,14 @@
                 value-format="YYYY-MM-DD"
               />
             </el-form-item>
-            <el-form-item label="指定检验人" prop="reason">
+            <el-form-item
+              label="指定检验人"
+              prop="remark2[user2]"
+              :rules="{
+                required: true,
+                trigger: 'change',
+              }"
+            >
               <el-select
                 v-model="ruleForm1.remark2.user2"
                 filterable

src/views/pro-operation/rework/index.vue

@@ -37,6 +37,10 @@
             <el-form-item
               :label="`流转卡号数量[${ruleForm.seqList.length}]`"
               prop="seqNoList"
+              :rules="{
+                required: true,
+                trigger: 'change',
+              }"
             >
               <el-select
                 v-model="ruleForm.seqList"
@@ -53,7 +57,14 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="返工工序" prop="itemList">
+            <el-form-item
+              label="返工工序"
+              prop="itemList"
+              :rules="{
+                required: true,
+                trigger: 'change',
+              }"
+            >
               <el-select
                 v-model="ruleForm.itemList"
                 multiple
@@ -68,10 +79,24 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="返工原因" prop="reason">
+            <el-form-item
+              label="返工原因"
+              prop="reason"
+              :rules="{
+                required: true,
+                trigger: 'change',
+              }"
+            >
               <el-input v-model="ruleForm.reason" />
             </el-form-item>
-            <el-form-item label="返工内容" prop="remark">
+            <el-form-item
+              label="返工内容"
+              prop="remark"
+              :rules="{
+                required: true,
+                trigger: 'change',
+              }"
+            >
               <el-input v-model="ruleForm.remark" />
             </el-form-item>
           </el-form>

src/views/pro-steps/components/operates.vue

@@ -31,9 +31,9 @@ const reportWorkRef = ref<InstanceType<typeof ReportWork>>();
 
 const router = useRouter();
 
-const selectIndex = ref(0);
+const selectIndex = ref(null);
 const setIndex = (index: number) => {
-  selectIndex.value = index;
+  // selectIndex.value = index;
   switch (stepComponents.value[index].compentType) {
     case "baogu":
       reportBreakRef.value?.openReportBreakDrawer();
@@ -77,10 +77,10 @@ const setIndex = (index: number) => {
 };
 
 const stepComponents = ref([
-  {
-    compentName: "叫料",
-    compentType: "jiaoliao",
-  },
+  // {
+  //   compentName: "叫料",
+  //   compentType: "jiaoliao",
+  // },
   // {
   //   compentName: "物料流转",
   //   compentType: "liuzhuan",

src/views/pro-steps/components/wuliaocaiji.vue

@@ -73,6 +73,10 @@ const scanData = ref([]);
 provide("scanData", scanData);
 const enterfnc = async () => {
   let str = scanCode.value;
+  if (str.length < 1) {
+    ElMessage.error("请扫码采集物料");
+    return;
+  }
   scanCode.value = "";
   scanCodeCopyValue.value = str;
   const { code, data } = await searchMaterial({

src/views/pro-steps/index.vue

@@ -154,7 +154,7 @@ const defaultComponents = [
     name: "Excel",
   },
   {
-    compentName: "测试数据",
+    compentName: "设备数据",
     iconName: "ceshishuju",
     path: "ceshishuju",
     name: "Ceshishuju",

src/views/pro-steps/popUpView/caijiRightPopUp.vue

@@ -4,7 +4,7 @@
       <div class="headerTittle">物料采集</div>
       <div class="header">
         <div class="inputBox">
-          <ScanCodeInput v-model="showSeqNo" />
+          <ScanCodeInput v-model="scanSum" @keyup.enter="enterfnc" />
         </div>
       </div>
       <el-scrollbar>
@@ -47,7 +47,10 @@
   </div>
 </template>
 
-<script lang="ts" setup>
+<script setup>
+import { useProcessStore } from "@/store";
+import { searchMaterial } from "@/api/prosteps/wuliaocaiji";
+const store = useProcessStore();
 const emits = defineEmits(["update:modelValue", "submit"]);
 const props = defineProps({
   modelValue: {
@@ -60,11 +63,31 @@ const props = defineProps({
   },
 });
 const selectIndex = ref();
-const setSelectIndex = (index: number) => {
+const setSelectIndex = (index) => {
   selectIndex.value = index;
 };
 const scanData = inject("scanData");
-const scanSum = ref(0);
+const scanSum = ref("");
+const enterfnc = async () => {
+  let str = scanSum.value;
+  if (str.length < 1) {
+    ElMessage.error("请扫码采集物料");
+    return;
+  }
+  scanSum.value = "";
+  const { code, data } = await searchMaterial({
+    operationId: store.odersData.operationId,
+    processId: store.scanInfo.id,
+    seqNo: store.scanInfo.seqNo,
+    scanCode: str,
+    workOrderCode: store.odersData.workOrderCode,
+  });
+  if (code == "200") {
+    console.log(data);
+    scanData.value.push(data[0]);
+    console.log(scanData.value);
+  }
+};
 const handleClose = () => {
   emits("update:modelValue", false);
 };

src/views/process/components/operate.vue

@@ -2,13 +2,13 @@
   <div class="commonTitle">操作</div>
   <div class="body">
     <ScanCode />
-    <div class="btnBox">
+    <!-- <div class="btnBox">
       <el-button class="btn el-button-big" color="#0A59F7" round @click="call">
         <span class="btnText">叫料</span>
       </el-button>
-    </div>
+    </div> -->
     <template v-for="(item, index) in operationObjs" :key="index">
-      <Transition>
+      <Transition style="margin-top: 20px">
         <div
           v-if="
             index == 1

src/views/process/components/steps.vue

@@ -132,6 +132,7 @@ emitter.on(EventsNames.PROCESS_REDER, () => {
 // };
 const boxClick = (item, index) => {
   if (item.exists != true) return;
+  store.odersData.operationType = item.operationType;
   selectSeqArray.value =
     ordersDataArray.value[selectOrderIndex.value].ops[index].seqs;
   store.odersData.operationId = item.operationId;