bug修改

src/components/CommonTable/configs/tableConfig.ts

@@ -444,18 +444,18 @@ export const tableConfig = {
   },
 
   MARTERIAL_BOM: {
-    url: "/api/v1/base/materialBom/list",
+    url: "/api/v1/base/materialBom",
     column: [
       {
         label: "物料版本",
         prop: "bomVersion",
-        search: true,
         type: "select",
       },
       {
         label: "物料编码",
         prop: "materialCode",
         hide: true,
+        search: true,
       },
 
       {
@@ -463,6 +463,7 @@ export const tableConfig = {
         prop: "materialName",
         overHidden: true,
         hide: true,
+        search: true,
       },
 
       {

src/views/base/apply/apply.vue

@@ -119,9 +119,9 @@
       <el-card
         style="cursor: pointer; font-size: 20px"
         shadow="always"
-        :key="item"
+        :key="index"
         @click="toShowExcel(item)"
-        v-for="item in showProList"
+        v-for="(item, index) in showProList"
         >{{ item.formName }}</el-card
       >
     </el-dialog>
@@ -164,7 +164,7 @@ const showProExcel = async (id) => {
 };
 const excelShow = ref(false);
 const ExDataObj = ref({});
-const toShowExcel = async (item) => {
+const toShowExcel = (item) => {
   ExDataObj.value = item;
   excelShow.value = true;
 };

src/views/base/bom/index.vue

@@ -437,7 +437,6 @@ const queryMaterialDetail = () => {
 };
 
 const selectedFinish = (selectedValue) => {
-  console.info(selectedValue.bomVersion);
   if (
     selectedValue.bomVersion != undefined &&
     selectedValue.bomVersion != null

src/views/base/check/check.vue

@@ -50,7 +50,10 @@
           </el-descriptions-item>
         </el-descriptions>
       </div>
-      <el-button type="success" style="margin-bottom: 10px" @click="showExcel"
+      <el-button
+        type="success"
+        style="margin-bottom: 10px"
+        @click="showProExcel(rowData.id)"
         >查看表格数据</el-button
       >
       <div class="el-descriptions__title">提交申请</div>
@@ -127,6 +130,21 @@
       </div>
     </div>
     <el-dialog
+      v-model="dialog8.visible"
+      :title="dialog8.title"
+      width="950px"
+      @close="dialog8.visible = false"
+    >
+      <el-card
+        style="cursor: pointer; font-size: 20px"
+        shadow="always"
+        :key="item"
+        @click="toShowExcel(item)"
+        v-for="item in showProList"
+        >{{ item.formName }}</el-card
+      >
+    </el-dialog>
+    <el-dialog
       v-model="excelShow"
       title="详情"
       @close="excelShow = false"
@@ -155,18 +173,23 @@ const props = defineProps({
     type: Boolean,
   },
 });
+const dialog8 = reactive({
+  title: "表单列表",
+  visible: false,
+});
+const showProList = ref([]);
+const showProExcel = async (id) => {
+  const { data, code } = await getExcelData(id);
+  showProList.value = data;
+  dialog8.visible = true;
+};
+const toShowExcel = (item) => {
+  ExDataObj.value = item;
+  excelShow.value = true;
+};
 const excelShow = ref(false);
 const ExDataObj = ref({});
-const showExcel = async () => {
-  const { code, data } = await getExcelData(props.rowData.id);
-  if (code == "200") {
-    ExDataObj.value = data;
-    excelShow.value = true;
-  } else {
-    ExDataObj.value = {};
-    excelShow.value = false;
-  }
-};
+
 const emits = defineEmits(["close", "dataList"]);
 const getStatus = (val) => {
   switch (val) {

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

@@ -134,7 +134,7 @@ const startCreat = () => {
           "value"
         );
         commonTableRef.value?.mergeOption({
-          searchShow: bomVersion.value ? false : true,
+          searchShow: true,
           selection: true,
           reserveSelection: true,
         });

src/views/plan/workOrder/components/work-order-seqNos-page.vue

@@ -57,6 +57,9 @@ const props = defineProps({
   state: {
     type: String,
   },
+  semiFinishedStock: {
+    type: String,
+  },
 });
 const selectedRows = ref([]);
 const handleSelectionChange = (selection) => {
@@ -112,6 +115,10 @@ option.value = Object.assign(option.value, {
 
 onMounted(() => {
   search.value.workOrderCode = props.workOrderCode;
+  if (props.semiFinishedStock) {
+    search.value.semiFinishedStock = props.semiFinishedStock;
+  }
+
   search.value.state = props.state;
   dataList();
 });

src/views/quality/feedback/index.vue

@@ -104,7 +104,7 @@ option.value = Object.assign(option.value, {
     },
     {
       label: "生产批号",
-      prop: "code",
+      prop: "workordercode",
     },
     {
       label: "状态",

src/views/quality/reject/index.vue

@@ -104,7 +104,7 @@ option.value = Object.assign(option.value, {
     },
     {
       label: "生产批号",
-      prop: "code",
+      prop: "workordercode",
     },
     {
       label: "状态",

src/views/storage/semi/components/details.vue

@@ -63,7 +63,12 @@
         />
       </el-form-item>
     </el-form>
-    <el-button type="primary" @click="submit">出库</el-button>
+    <el-button
+      type="primary"
+      @click="submit"
+      :disabled="detailsData?.stockType == '2'"
+      >出库</el-button
+    >
     <el-dialog
       v-model="dialog1.visible"
       :title="dialog1.title"

src/views/storage/semi/index.vue

@@ -48,6 +48,7 @@
         :workOrderCode="
           form.stockType == '1' ? form.inWorkOrderCode : form.outWorkOrderCode
         "
+        :semiFinishedStock="'1'"
         :state="'2'"
         @order-info="materialInfo2"
       />
@@ -178,6 +179,9 @@ option.value = Object.assign(option.value, {
           trigger: "trigger",
         },
       ],
+      render: ({ row }) => {
+        return h("p", row.stockType == "2" ? "-" : row.stockNum);
+      },
     },
     {
       label: "出库/入库数量",

src/views/system/role/index.vue

@@ -139,9 +139,9 @@ function resetForm() {
   roleFormRef.value.resetFields();
   roleFormRef.value.clearValidate();
 
-  formData.id = undefined;
-  formData.sort = 1;
-  formData.status = 1;
+  formData.value.id = undefined;
+  formData.value.sort = 1;
+  formData.value.status = 1;
 }
 
 /** 删除角色 */
@@ -381,15 +381,11 @@ onMounted?.(() => {
           ref="menuRef"
           node-key="id"
           show-checkbox
-          :check-strictly="true"
           :props="{
             children: 'childs',
             label: 'menuName',
-            value: 'id',
-            disabled: '',
           }"
           :data="menuList"
-          :default-expand-all="false"
         >
           <template #default="{ data }">
             {{ data.menuName }}