bug 修改

src/views/base/craftManagement/route/components/processComponent.vue

@@ -133,10 +133,20 @@ const save = async () => {
 const selectProComs = ref([]);
 const selectIndex = ref(-1);
 const currentCom = ref({});
-const handleCommand = (itme) => {
-  selectProComs.value.push(itme);
-  isChanged.value = true;
-  selectIndex.value = -1;
+const handleCommand = (item) => {
+  let status = true;
+  for (let i = 0; i < selectProComs.value.length; i++) {
+    if (selectProComs.value[i].compentName == item.compentName) {
+      status = false;
+    }
+  }
+  if (status == true) {
+    selectProComs.value.push(item);
+    isChanged.value = true;
+    selectIndex.value = -1;
+  } else {
+    ElMessage.error("请勿重复添加");
+  }
 };
 
 // 点击某一个改变下面的table

src/views/base/craftManagement/route/index.vue

@@ -267,9 +267,6 @@ option.value = Object.assign(option.value, {
         },
       ],
       readOnly: true,
-      click: () => {
-        startChooseProduct();
-      },
     },
     {
       label: "产品编号",

src/views/base/information/index.vue

@@ -311,6 +311,7 @@ option.value = Object.assign(option.value, {
       prop: "drawingVersion",
       type: "number",
       precision: 1,
+      min: 0,
       rules: [
         {
           required: true,

src/views/plan/order/index.vue

@@ -9,7 +9,7 @@
       :table-loading="loading"
       :permission="permission"
       @search-change="handleQuery"
-      @search-reset="resetQuery"
+      @search-reset="resetChange"
       @size-change="handleQuery"
       @current-change="handleQuery"
       @row-save="rowSave"
@@ -259,6 +259,9 @@ const form = ref({});
 const page = ref({ total: 0, currentPage: 1, pageSize: 10 });
 const loading = ref(false);
 const uploadRef = ref<UploadInstance>(); // 上传组件
+const resetChange = () => {
+  handleQuery(null, null);
+};
 // 导入数据
 const importData = reactive({
   file: undefined,

src/views/plan/workOrder/index.vue

@@ -34,7 +34,7 @@
           @click="aps1"
           >批量排程
           <template #icon>
-            <svg-icon icon-class="paicheng"></svg-icon>
+            <svg-icon icon-class="paicheng" />
           </template>
         </el-button>
       </template>
@@ -65,7 +65,7 @@
           :size="size"
           >排程
           <template #icon>
-            <svg-icon icon-class="paicheng"></svg-icon>
+            <svg-icon icon-class="paicheng" />
           </template>
         </el-button>
         <el-button
@@ -77,7 +77,7 @@
           :size="size"
           >冻结
           <template #icon>
-            <svg-icon icon-class="dongjie"></svg-icon>
+            <svg-icon icon-class="dongjie" />
           </template>
         </el-button>
         <el-button
@@ -89,7 +89,7 @@
           :size="size"
           >解冻
           <template #icon>
-            <svg-icon icon-class="jiedong"></svg-icon>
+            <svg-icon icon-class="jiedong" />
           </template>
         </el-button>
         <el-button
@@ -105,7 +105,7 @@
         <el-button text @click="showSeqPage(row)" type="primary" :size="size"
           >流转卡号
           <template #icon>
-            <svg-icon icon-class="luozhuankahao"></svg-icon>
+            <svg-icon icon-class="luozhuankahao" />
           </template>
         </el-button>
         <el-button
@@ -124,7 +124,7 @@
           :size="size"
           >领用申请
           <template #icon>
-            <svg-icon icon-class="lingyongshenqing"></svg-icon>
+            <svg-icon icon-class="lingyongshenqing" />
           </template>
         </el-button>
         <el-button
@@ -134,7 +134,7 @@
           :size="size"
           >生产准备
           <template #icon>
-            <svg-icon icon-class="shengchanzhunbei"></svg-icon>
+            <svg-icon icon-class="shengchanzhunbei" />
           </template>
         </el-button>
         <el-button
@@ -165,7 +165,7 @@
       width="80%"
       @close="dialog.visible = false"
     >
-      <order-page queryType="1" @orderInfo="orderInfo" />
+      <order-page queryType="1" @order-info="orderInfo" />
     </el-dialog>
 
     <el-dialog
@@ -177,7 +177,7 @@
       <choice-route-page
         :processRouteType="processRouteType"
         :material-code="form.materialCode"
-        @routeInfo="routeInfo"
+        @route-info="routeInfo"
       />
     </el-dialog>
 
@@ -187,7 +187,7 @@
       width="80%"
       @close="dialog2.visible = false"
     >
-      <choice-workshop-page @workShopInfo="workShopInfo" />
+      <choice-workshop-page @work-shop-info="workShopInfo" />
     </el-dialog>
 
     <el-dialog
@@ -199,7 +199,7 @@
       <choice-line-page
         :parentCode="form.workshopCode"
         :materialCode="form.materialCode"
-        @lineInfo="lineInfo"
+        @line-info="lineInfo"
       />
     </el-dialog>
 
@@ -248,7 +248,7 @@
               :label="item.dictLabel"
               :value="item.dictValue"
               :key="item.dictValue"
-            ></el-option>
+            />
           </el-select>
         </el-form-item>
         <el-form-item label="排程类型" prop="apsModel">
@@ -262,7 +262,7 @@
               :label="item.dictLabel"
               :value="item.dictValue"
               :key="item.dictValue"
-            ></el-option>
+            />
           </el-select>
         </el-form-item>
       </el-form>
@@ -667,6 +667,9 @@ option.value = Object.assign(option.value, {
         if (column.boxType) {
           dialog2.visible = true;
         }
+        if (column.boxType == "edit") {
+          form.value.productLineName = "";
+        }
       },
     },
     {

src/views/pro/traceability/index.vue

@@ -11,6 +11,9 @@
           v-model:page="page"
           @cell-click="handleCellClick"
           @search-change="searchChange"
+          @size-change="dataList"
+          @current-change="dataList"
+      
         >
           <template #seqNo="{ row }">
             <el-tag :type="chooseTagType(row.seqNo, 'css')">{{
@@ -56,11 +59,11 @@
             <el-tab-pane name="traceabilityComRef" label="生产履历">
               <template #label>
                 <span
-                >生产履历
+                  >生产履历
                   <el-badge
-                      :value="tabCount.traceability"
-                      class="item"
-                      type="primary"
+                    :value="tabCount.traceability"
+                    class="item"
+                    type="primary"
                   />
                 </span>
               </template>
@@ -131,19 +134,20 @@
               </template>
               <FaultCom ref="faultComRef" />
             </el-tab-pane>
-<!--            <el-tab-pane name="bugComRef" label="缺陷项">缺陷项</el-tab-pane>-->
+            <!--            <el-tab-pane name="bugComRef" label="缺陷项">缺陷项</el-tab-pane>-->
             <el-tab-pane name="mediaComRef" label="图片采集"
               ><template #label>
                 <span
-                >图片采集
+                  >图片采集
                   <el-badge
-                      :value="tabCount.medias"
-                      class="item"
-                      type="primary"
+                    :value="tabCount.medias"
+                    class="item"
+                    type="primary"
                   />
                 </span>
-            </template>
-            <media-com ref="mediaComRef"/></el-tab-pane>
+              </template>
+              <media-com ref="mediaComRef"
+            /></el-tab-pane>
           </el-tabs>
         </el-main>
       </el-container>