Ver Fonte

fix:修改半成品入库逻辑

lupeng há 2 semanas atrás
pai
commit
ccc4d9a0c6
2 ficheiros alterados com 120 adições e 108 exclusões
  1. 72 87
      src/views/storage/semi/components/details.vue
  2. 48 21
      src/views/storage/semi/index.vue

+ 72 - 87
src/views/storage/semi/components/details.vue

@@ -1,93 +1,41 @@
 <template>
   <div class="mainContentBox">
-    <el-table id="table" border :data="tableData">
-      <el-table-column prop="workOrderSeqNo" label="流转卡号" />
-      <!-- <el-table-column prop="checkStr" width="60" label="上限值">
-        <template #default="{ row }">
-          <span>{{
-            row.up ? dictS.getLableByValue("outsource_state", row.up) : "-"
-          }}</span>
-        </template>
-      </el-table-column> -->
-      <el-table-column prop="created" label="创建时间" />
-      <!-- <el-table-column label="操作" width="60">
-        <template #default="{ row }">
-          <el-button
-            link
-            type="primary"
-            size="small"
-            @click="deleteSettings(row.id)"
-            >删除</el-button
-          >
-        </template>
-      </el-table-column> -->
-    </el-table>
-    <el-form
-      style="margin-top: 10px"
-      :model="formData"
-      ref="ruleFormRef"
-      label-width="100px"
-    >
-      <el-form-item
-        label="流转卡号"
-        v-if="detailsData?.stockType != '2'"
-        prop="workOrderSeqNos"
-        :rules="[
-          {
-            required: true,
-            message: '请选择流转卡号',
-            trigger: 'blur',
-          },
-        ]"
-      >
-        <el-select v-model="formData.workOrderSeqNos" multiple>
-          <el-option
-            v-for="item in tableData"
-            :key="item"
-            :label="item.workOrderSeqNo"
-            :value="item.workOrderSeqNo"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item
-        label="出库工单号"
-        v-if="detailsData?.stockType != '2'"
-        prop="outWorkOrderCode"
-        :rules="[
-          {
-            required: true,
-            message: '请选择出库工单号',
-            trigger: 'blur',
-          },
-        ]"
-      >
-        <el-select
-          v-model="formData.outWorkOrderCode"
-          @click="dialog1.visible = true"
-        />
-      </el-form-item>
-    </el-form>
-    <el-button
-      type="primary"
-      @click="submit"
-      v-if="detailsData?.stockType != '2'"
-      >出库</el-button
-    >
-    <el-dialog
-      v-model="dialog1.visible"
-      :title="dialog1.title"
-      width="950px"
-      @close="dialog1.visible = false"
-    >
-      <work-order-page
-        :queryComplete="0"
-        :opType="1"
-        @order-info="materialInfo1"
-      />
-    </el-dialog>
+    <avue-crud
+        ref="crudRef"
+        v-model:search="search"
+        v-model="form"
+        :data="data"
+        :option="option"
+        v-model:page="page"
+        @row-save="createRow"
+        @row-update="updateRow"
+        @row-del="deleteRow"
+        @search-change="searchChange"
+        @search-reset="resetChange"
+        @size-change="dataList"
+        @current-change="dataList"
+        :row-style="rowStyle"
+        :cell-style="cellStyle"
+        @selection-change="selectionChange"
+    />
   </div>
 </template>
 <script setup>
+import { ref, getCurrentInstance } from "vue";
+import { useCrud } from "@/hooks/userCrud";
+import ButtonPermKeys from "@/common/configs/buttonPermission";
+import { useCommonStoreHook } from "@/store";
+const { isShowTable, tableType } = toRefs(useCommonStoreHook());
+// 传入一个url,后面不带/
+const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
+    useCrud({
+      src: "/api/v1/semiFinishedStock/detail",
+    });
+const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } =
+    Methords; //增删改查
+const { selectionChange, multipleDelete } = Methords; //选中和批量删除事件
+const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等工具
+const crudRef = ref(null); //crudRef.value 获取avue-crud对象
 import { getSemi, oprerate } from "@/api/storage/index";
 import { useDictionaryStore } from "@/store";
 const { dicts } = useDictionaryStore();
@@ -135,12 +83,49 @@ const submit = async () => {
   });
 };
 onMounted(() => {
-  getData();
+  search.value.inStockId=props.id;
+  dataList();
+});
+
+// 设置表格列或者其他自定义的option
+option.value = Object.assign(option.value, {
+  searchEnter: true,
+  delBtn: false,
+  selection: true,
+  labelWidth: 100,
+  editBtn: false,
+  viewBtn: false,
+  menu: false,
+  addBtn: false,
+  column: [
+    {
+      label: "生产批号",
+      prop: "workOrderCode",
+      editDisabled: true,
+      addDisplay: false,
+      search: true,
+      rules: [
+        {
+          required: true,
+          trigger: "trigger",
+        },
+      ],
+    },
+    {
+      label: "管号",
+      prop: "workOrderSeqNo",
+      editDisabled: true,
+      addDisplay: false,
+      search: true,
+    },
+
+  ]
 });
 watch(
   () => props.id,
   () => {
-    getData();
+    search.value.inStockId=props.id;
+    dataList();
   }
 );
 </script>

+ 48 - 21
src/views/storage/semi/index.vue

@@ -149,6 +149,7 @@ option.value = Object.assign(option.value, {
   labelWidth: 100,
   editBtn: false,
   viewBtn: false,
+  addBtn: false,
   column: [
     {
       label: "产品编码",
@@ -174,23 +175,49 @@ option.value = Object.assign(option.value, {
         },
       ],
     },
-    {
-      label: "库存数量",
-      prop: "stockNum",
-      editDisabled: true,
-      addDisplay: false,
-      rules: [
-        {
-          required: true,
-          trigger: "trigger",
-        },
-      ],
-      render: ({ row }) => {
-        return h("p", row.stockType == "2" ? "-" : row.stockNum);
+
+      {
+          label: "工艺路线版本",
+          prop: "processRouteVersion",
+          editDisabled: true,
+          addDisplay: false,
+          rules: [
+              {
+                  required: true,
+                  trigger: "trigger",
+              },
+          ],
       },
-    },
+
+      {
+          label: "分组标识",
+          prop: "opGroup",
+          editDisabled: true,
+          addDisplay: false,
+          rules: [
+              {
+                  required: true,
+                  trigger: "trigger",
+              },
+          ],
+      },
+      /*{
+        label: "库存数量",
+        prop: "stockNum",
+        editDisabled: true,
+        addDisplay: false,
+        rules: [
+          {
+            required: true,
+            trigger: "trigger",
+          },
+        ],
+        render: ({ row }) => {
+          return h("p", row.stockType == "2" ? "-" : row.stockNum);
+        },
+      },*/
     {
-      label: "出库/入库数量",
+      label: "出库数量",
       prop: "operateNum",
       addDisplay: false,
       editDisabled: true,
@@ -202,7 +229,7 @@ option.value = Object.assign(option.value, {
       ],
     },
 
-    {
+    /*{
       label: "出入库类型",
       prop: "stockType",
       editDisabled: true,
@@ -226,8 +253,8 @@ option.value = Object.assign(option.value, {
         },
       ],
       value: "1",
-    },
-    {
+    },*/
+    /*{
       label: "入库工单",
       prop: "inWorkOrderCode",
       editDisabled: true,
@@ -286,7 +313,7 @@ option.value = Object.assign(option.value, {
               : "-"
         );
       },
-    },
+    },*/
     {
       label: "流转卡号",
       prop: "workOrderSeqNos",
@@ -307,7 +334,7 @@ option.value = Object.assign(option.value, {
         }
       },
     },
-    {
+   /* {
       label: "库位",
       prop: "location",
       addDisplay: true,
@@ -317,7 +344,7 @@ option.value = Object.assign(option.value, {
           trigger: "trigger",
         },
       ],
-    },
+    },*/
 
     // {
     //   label: "物料类型",