feature/bug修复

src/layout/components/TagsView/index.vue

@@ -14,7 +14,7 @@
         @click.middle="!isAffix(tag) ? closeSelectedTag(tag) : ''"
         @contextmenu.prevent="openContentMenu(tag, $event)"
       >
-        {{ translateRouteTitle(tag.title) }}
+        {{ setTitle(translateRouteTitle(tag.title)) }}
         <i-ep-close
           class="close-icon"
           size="12px"
@@ -77,8 +77,17 @@ const route = useRoute();
 const permissionStore = usePermissionStore();
 const tagsViewStore = useTagsViewStore();
 const appStore = useAppStore();
-
 const { visitedViews } = storeToRefs(tagsViewStore);
+//针对动态路由形成的新tags增加区别提示
+const setTitle = (title: any) => {
+  if (route.name == "processCom/:id/:prodtCode/:operationId") {
+    let newStr = title + ":工序ID" + route.fullPath.split("/")[4];
+    return newStr;
+  } else {
+    return title;
+  }
+};
+
 const settingsStore = useSettingsStore();
 const layout = computed(() => settingsStore.layout);
 

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

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

src/views/base/excel/template/index.vue

@@ -379,6 +379,7 @@ option.value = Object.assign(option.value, {
       search: true,
       headerAlign: "center",
       align: "center",
+      type: "select",
       prop: "formType",
       addDisplay: false,
       dicData: dicts.excel_type,
@@ -388,6 +389,7 @@ option.value = Object.assign(option.value, {
       label: "表格状态",
       slot: true,
       search: true,
+      type: "select",
       headerAlign: "center",
       align: "center",
       prop: "state",

src/views/device/allocate/index.vue

@@ -29,7 +29,7 @@
       </template>
       <template #menu="{ size, row, index }">
         <el-button
-          @click="maintenance(row, 0)"
+          @click="maintenance(row, 0, false)"
           icon="el-icon-check"
           text
           v-hasPerm="[ButtonPermKeys.DEVICE.BTNS.allocate_audit]"
@@ -38,7 +38,7 @@
           >流程</el-button
         >
         <el-button
-          @click="maintenance(row, 1)"
+          @click="maintenance(row, 1, true)"
           icon="el-icon-fold"
           text
           type="primary"
@@ -85,7 +85,9 @@
             <p>申请时间： {{ maintenanceInfo.created }}</p>
             <el-form-item label="是否需要公司分管领导审批">
               <el-radio-group
-                :disabled="maintenanceInfo.state > 8"
+                :disabled="
+                  maintenanceInfo.state > 8 || maintenanceInfo.disabled
+                "
                 v-model="maintenanceInfo.isApprove"
                 class="ml-4"
                 @change="showCard"
@@ -530,9 +532,10 @@ const showCard = () => {
   }
 };
 const maintenanceInfo = ref({});
-const maintenance = (row, type) => {
+const maintenance = (row, type, status) => {
   viewPage.value = type === 0 ? false : true;
   maintenanceInfo.value = row;
+  maintenanceInfo.value.disabled == status;
   dialog1.visible = true;
   if (null == maintenanceInfo.value.auditResult) {
     maintenanceInfo.value.auditResult = 0;

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"
@@ -697,7 +697,9 @@ const queryExpandAlias = () => {
     }
   );
 };
-
+const resetChange = () => {
+  handleQuery(null, null);
+};
 const handleQuery = (params, done) => {
   // console.log(JSON.stringify(option.value.column));
   loading.value = true;
@@ -720,7 +722,6 @@ const handleQuery = (params, done) => {
       }
     });
 };
-const resetQuery = () => {};
 const rowSave = (form, done, loading) => {
   loading();
   addOrder(form).then((data: any) => {

src/views/plan/workOrder/index.vue

@@ -526,7 +526,7 @@ const workShopInfo = (value) => {
   form.value.workshopName = value.id;
   form.value.workshopCode = value.code;
   form.value.workshopName = value.name;
-  form.value.productLineId = ""
+  form.value.productLineId = "";
   form.value.productLineName = "";
   dialog2.visible = false;
 };
@@ -730,7 +730,7 @@ option.value = Object.assign(option.value, {
       ],
       click: ({ value, column }) => {
         if (column.boxType) {
-          if (!form.value.workshopCode) {
+          if (!form.value.workshopName) {
             ElMessage({
               message: "请先选择生产车间",
               type: "warning",

src/views/storage/vehicleMaterial/index.vue

@@ -129,7 +129,7 @@
       },
       {
         label: "物料编号",
-        prop: "code",
+        prop: "materialCode",
         hide:true,
         click:({ value, column }) => {
           ctableRef.value.startSelect();