1

src/components/byTable/index.vue

@@ -2,7 +2,7 @@
   <el-form :inline="true" :model="pagination" v-if="searchConfig && searchConfig.length > 0" @submit.native.prevent>
     <template v-for="item in searchConfig">
       <el-form-item v-if="item.type" :label="item.label + ':'" :prop="item.prop">
-        <el-input v-if="item.type === 'input'" v-model="pagination[item.prop]" :placeholder="'请输入' + item.label" @keyup.enter.native="searchFn" />
+        <el-input v-if="item.type === 'input'" v-model="pagination[item.prop]" :placeholder="'请输入' + item.label" @keyup.enter.native="searchFn" clearable />
         <el-select
           v-else-if="item.type === 'select'"
           v-model="pagination[item.prop]"

src/components/select-picture/index.vue

@@ -6,6 +6,7 @@
         :pagination="sourceList.pagination"
         :config="config"
         :loading="loading"
+        :searchConfig="searchConfig"
         highlight-current-row
         @get-list="getList"
         @clickReset="clickReset">
@@ -32,9 +33,20 @@ const sourceList = ref({
     total: 0,
     pageNum: 1,
     pageSize: 10,
+    artworkName: "",
   },
 });
 const loading = ref(false);
+//
+const searchConfig = computed(() => {
+  return [
+    {
+      type: "input",
+      prop: "artworkName",
+      label: "图稿名称",
+    },
+  ];
+});
 const config = computed(() => {
   return [
     {

src/views/production/operation/batching/index.vue

@@ -47,6 +47,18 @@
             highlight-current-row
             @get-list="getListTwo"
             @clickReset="clickResetTwo">
+            <template #blueprint="{ item }">
+              <div>
+                <img
+                  v-if="item.blueprint"
+                  style="margin-top: 3px; width: 40px; height: 40px; cursor: pointer; object-fit: contain; vertical-align: middle"
+                  v-lazy="item.blueprint"
+                  @click="openFile(item.blueprint)" />
+              </div>
+            </template>
+            <template #size="{ item }">
+              <div>{{ item.length }} * {{ item.width }} * {{ item.height }}</div>
+            </template>
           </byTable>
         </el-tab-pane>
       </el-tabs>
@@ -389,9 +401,10 @@ const clickAccomplish = () => {
         "/stockPreparation/submit",
         selectData.value.map((item) => item.orderSkuId)
       )
-      .then();
-    ElMessage({ message: "提交完成", type: "success" });
-    getList();
+      .then(() => {
+        ElMessage({ message: "提交完成", type: "success" });
+        getList();
+      });
   } else {
     return ElMessage("请选择操作的数据");
   }

src/views/production/schedule/production-order/index.vue

@@ -438,7 +438,7 @@ const submitForm = () => {
   proxy.$refs["packingForm"].validate((valid) => {
     if (valid) {
       if (formData.data.packageList && formData.data.packageList.length > 0) {
-        proxy.post("/productionOrder/rapidPackaging".formData.data).then(() => {
+        proxy.post("/productionOrder/rapidPackaging", formData.data).then(() => {
           ElMessage({ message: "提交成功", type: "success" });
           openPacking.value = false;
           getList();