Browse Source

部分需求更改

cz 1 year ago
parent
commit
66997d5520

+ 2 - 2
src/views/EHSD/productLibrary/companyProduct/index.vue

@@ -248,10 +248,10 @@
                         <el-checkbox v-model="row.isCheckBox" label="" /> <span style="position:relative;top:-2px"> {{getLabel(row.type)}}</span>
                       </td>
                       <td>
-                        <el-upload :file-list="row.fileList" :action="uploadUrl" :data="uploadData" :limit="1" :list-type="'text'"
+                        <el-upload :file-list="row.fileList" :action="uploadUrl" :data="uploadData" :limit="5" :list-type="'text'"
                                    :before-upload="(file)=>handleBeforeUploadOne(file,index)" :on-success="()=>handleSuccessOne(index)"
                                    :on-remove="(file)=>handleRemoveFile(file,index)" :on-preview="onPreviewFile"
-                                   :on-exceed="()=>msgTip(`上传文件数量不可大于1`, 2)">
+                                   :on-exceed="()=>msgTip(`上传文件数量不可大于5`, 2)">
                           <el-button text type="primary">上传附件</el-button>
                         </el-upload>
                       </td>

+ 3 - 3
src/views/EHSD/productLibrary/waitCreateProduct/index.vue

@@ -221,10 +221,10 @@
                         <el-checkbox v-model="row.isCheckBox" label="" /> <span style="position:relative;top:-2px"> {{getLabel(row.type)}}</span>
                       </td>
                       <td>
-                        <el-upload :file-list="row.fileList" :action="uploadUrl" :data="uploadData" :limit="1" :list-type="'text'"
+                        <el-upload :file-list="row.fileList" :action="uploadUrl" :data="uploadData" :limit="5" :list-type="'text'"
                                    :before-upload="(file)=>handleBeforeUploadOne(file,index)" :on-success="()=>handleSuccessOne(index)"
                                    :on-remove="(file)=>handleRemoveFile(file,index)" :on-preview="onPreviewFile"
-                                   :on-exceed="()=>msgTip(`上传文件数量不可大于1`, 2)">
+                                   :on-exceed="()=>msgTip(`上传文件数量不可大于5`, 2)">
                           <el-button text type="primary">上传附件</el-button>
                         </el-upload>
                       </td>
@@ -920,7 +920,7 @@ const submitForm = () => {
       formData.data.packAsk = "";
     }
     submitLoading.value = true;
-    proxy.post("/productInfo/" + modalType.value, formData.data).then(
+    proxy.post("/extQuotationProduct/createProduct", formData.data).then(
       (res) => {
         proxy.msgTip("操作成功", 1);
         dialogVisible.value = false;

+ 2 - 2
src/views/EHSD/saleContract/priceSheetEHSD/index.vue

@@ -428,11 +428,11 @@
                                   {{getLabelOne(row.type)}}</span>
                               </td>
                               <td>
-                                <el-upload :file-list="row.fileList" :action="uploadUrl" :data="uploadData" :limit="1" :list-type="'text'"
+                                <el-upload :file-list="row.fileList" :action="uploadUrl" :data="uploadData" :limit="5" :list-type="'text'"
                                            :before-upload="(file)=>handleBeforeUploadOne(file,index,sonIndex)"
                                            :on-success="()=>handleSuccessOne(index,sonIndex)"
                                            :on-remove="(file)=>handleRemoveFile(file,index,sonIndex)" :on-preview="onPreviewFile"
-                                           :on-exceed="()=>msgTip(`上传文件数量不可大于1`, 2)">
+                                           :on-exceed="()=>msgTip(`上传文件数量不可大于5`, 2)">
                                   <el-button text type="primary">上传附件</el-button>
                                 </el-upload>
                               </td>

+ 12 - 12
src/views/process/processConfig/vueFlow.vue

@@ -177,18 +177,18 @@ const formConfig = computed(() => {
           label: "用户",
           value: 1,
         },
-        {
-          label: "部门负责人",
-          value: 2,
-        },
-        {
-          label: "部门总监",
-          value: 3,
-        },
-        {
-          label: "岗位",
-          value: 4,
-        },
+        // {
+        //   label: "部门负责人",
+        //   value: 2,
+        // },
+        // {
+        //   label: "部门总监",
+        //   value: 3,
+        // },
+        // {
+        //   label: "岗位",
+        //   value: 4,
+        // },
         {
           label: "角色",
           value: 5,

+ 3 - 0
src/views/purchaseSales/outAndInWarehouse/manualWarehousing/index.vue

@@ -643,6 +643,9 @@ const selectGood = (row) => {
 };
 const submitForm = () => {
   submit.value.handleSubmit(() => {
+    if (!(formData.data.list.length > 0)) {
+      return proxy.msgTip("请添加入库明细");
+    }
     loadingDialog.value = true;
     proxy.post("/stock/add", formData.data).then(
       () => {