1.价格申报单 审批通过后失效原有效价格，提交提示：行号存在有效价格（生效价格+失效价格+组织+供应商+客户+价格类型）是否确认原价格失效？

2.价格目录去掉停用功能

src/api/business/purchase/apply.js

@@ -28,7 +28,8 @@ export function SUBMIT(data) {
   return request({
     url: `/pu/priceApply/submit`,
     method: "POST",
-    data: {submitIds:data},
+    // data: {submitIds:data},
+    data,
   });
 }
 

src/views/material/basicFile/details.vue

@@ -41,12 +41,9 @@
             <!-- 新增、修改、删除、复制 -->
             <el-col :span="1.5">
               <el-button-group>
-                <!-- <el-button :size="size" @click="handleInster">新增</el-button> -->
                 <el-button :size="size" @click="handleBasicEdit"
                   >修改</el-button
                 >
-                <!-- <el-button :size="size" @click="handleDel">删除</el-button> -->
-                <!-- <el-button :size="size" @click="handleCopy">复制</el-button> -->
               </el-button-group>
             </el-col>
 
@@ -140,7 +137,6 @@
 
       <div class="md-content" :key="basicData.value.id">
         <el-form :inline="true" label-position="right" :model="basicData.value">
-          <!-- <el-form-item label="所属组织"></el-form-item> -->
           <el-form-item label="物料编码">
             <el-input
               v-model="basicData.value.code"
@@ -162,7 +158,6 @@
               size="mini"
             ></el-input>
           </el-form-item>
-          <!-- <el-form-item label="版本号"></el-form-item> -->
         </el-form>
 
         <dr-tabs :tabList="detailsTabs" :handleTabClick="handleMainTabClick">
@@ -733,10 +728,6 @@
               <div slot="empty"></div>
             </el-select>
 
-            <!-- <el-select size="mini" v-else-if="mt.attribute == 'select' && mt.dictId"  placeholder="请选择"
-              :disabled="!(materialType.isEdit && mt.edit)" v-model="scope.row[mt.prop]" :key="scope.row[mt.prop]">
-              <el-option v-if="mt.dictId" v-for="d in mt.dictId" :key="d.dictValue" :label="d.dictLabel"
-                :value="d.dictValue"></el-option></el-select> -->
 
             <!-- 其他类型 -->
             <el-input
@@ -785,7 +776,6 @@
               <el-button :size="size" @click="handleOtherEdit('form')"
                 >修改</el-button
               >
-              <!-- <el-button :size="size" @click="handleOtherDel">删除</el-button> -->
             </el-button-group>
             <el-button-group>
               <el-button :size="size" @click="handleOtherRefresh"
@@ -1311,27 +1301,6 @@ export default {
       //   path: `/basic/material/basicFile`,
       // });
     },
-    // 附件按钮
-    handleFile() {
-      console.log("附件按钮");
-    },
-    // 改变分页情况
-    handleChangePage(type) {
-      switch (type) {
-        case "first":
-          console.log("第一页");
-          break;
-        case "pre":
-          console.log("上一页");
-          break;
-        case "next":
-          console.log("下一页");
-          break;
-        case "end":
-          console.log("最后页");
-          break;
-      }
-    },
     // 切换主信息标签
     handleMainTabClick(e) {
       this.activeMainTab = detailsTabs[e.index].code;
@@ -1344,7 +1313,6 @@ export default {
     },
     // 切换副表信息
     handleViceTabClick(e) {
-      // console.log(this.basicMessage[e.index], '切换标签');
       this.activeViceTab = this.basicMessage[e.index].code;
 
       switch (this.activeViceTab) {
@@ -1384,7 +1352,6 @@ export default {
       let activeTab = this.detailsTabs.filter(
         (item) => item.code == this.activeMainTab
       )[0];
-      console.log(activeTab, "activeTab");
       this.otherDeatils.title = activeTab.label;
 
       this.getOtherListDetails(activeTab.code, this.otherDeatils.queryKey);
@@ -1491,54 +1458,6 @@ export default {
         }
       });
     },
-    // 添加参照中的label
-    // handleAddReferLabel(dataName) {
-    //   let _this = this;
-    //   this[dataName].form.map(item => {
-    //     // 查参照
-    //     if (item.apiUrl && item.apiUrl != '') {
-
-    //       let param = {};
-
-    //       if (item.relevance && item.relevance != '') {
-    //         let reList = item.relevance.split(',');
-    //         console.log(reList, 'reList-------------------');
-    //         reList.forEach(i => {
-    //           param[i] = this.basicData.value[i]
-    //         })
-    //         console.log(param, 'param/////////////////////////');
-    //       }
-
-    //       _this.getExecuteMethods(item.apiUrl, param, (data) => {
-    //         let { tableBody } = data;
-
-    //         // 维护物料类别  --- 属于列表中获取label
-    //         if (dataName == 'materialType') {
-
-    //           _this[dataName].value.length && (_this[dataName].value = _this[dataName].value.map(d => {
-
-    //             let Blabel = tableBody.filter((t) => t.id == d[item.prop])[0];
-    //             console.log(Blabel, 'Blabel``````````````````````````');
-    //             d[`${item.prop}Label`] = (Blabel && Blabel.name) || Blabel || '';
-    //             return d;
-    //           }))
-
-    //         } else {
-
-    //           let Blabel = tableBody.filter((t) => t.id == _this[dataName].value[item.prop])[0];
-    //           console.log(Blabel, 'Blabel``````````````````````````');
-    //           _this[dataName].value[`${item.prop}Label`] = (Blabel && Blabel.name) || Blabel || '';
-    //         }
-
-    //         // this.count++;
-    //         this.loading = false;
-    //         console.log(_this[dataName].value, `${dataName}//////////////////////`);
-    //       })
-    //     }
-    //   })
-    //   this.materialType.loading = false;
-
-    // },
 
     // 查询财务信息列表
     async getFinanceList(materialId) {
@@ -2021,16 +1940,6 @@ export default {
       // })
       console.log(this.detailsTabs, "this.detailsTabs ");
     },
-    // 删除
-    handleDel() {
-      console.log("删除----基本信息");
-    },
-    // 复制
-    handleCopy() {
-      console.log("复制");
-    },
-    //查询
-    handleQuery() {},
     // 刷新
     handleRefresh() {
       console.log("刷新");
@@ -2039,15 +1948,6 @@ export default {
       this.$refs.medcineRef.clearValidate();
       this.handleRest();
     },
-    // 过滤
-    handleFilter(e) {
-      console.log(e, "过滤");
-    },
-    filterCondition(type) {
-      return {
-        type,
-      };
-    },
     // 维护物料类别
     handleMaterialType() {
       console.log("维护物料类别");
@@ -2127,9 +2027,6 @@ export default {
     // 保存修改
     handleSave() {
       console.log("保存修改");
-      // this.$refs['basicMessageRef'].validate(async (valid) => {
-
-      //   if (valid) {
       this.loading = true;
       // 普通保存修改
       this.updateButtonGroup &&
@@ -2144,16 +2041,7 @@ export default {
           this.maintainNewVersion = false;
           this.handleRefresh();
         });
-      //   } else {
-      //     this.$notify.error({
-      //       title: '错误',
-      //       message: '存在必填项未填写!'
-      //     });
-
-      //     console.log('error submit!!');
-      //     return false;
-      //   }
-      // })
+      
     },
     // 物料类别列表选中
     handleSelectionType(list) {
@@ -2339,10 +2227,6 @@ export default {
     handleCollapseChange(val) {
       console.log(val, "折叠菜单改变");
     },
-    // 更新导入
-    handleUpdateImport() {
-      console.log("更新导入");
-    },
     // 确认弹窗操作
     async handleComfirmOption() {
       console.log("确认弹窗操作");
@@ -2536,7 +2420,6 @@ export default {
     },
     // 取消-关闭参照弹窗
     handleConcalRefer() {
-      console.log("关闭参照弹窗");
       this.MoreDataDialog.show = false;
       this.MoreDataDialog.key = "";
     },

src/views/purchase/apply/submit/index.vue

@@ -41,38 +41,71 @@ export default {
   methods: {
     //
     open() {
+      let _this = this;
       this.$confirm(`是否提交数据项至OA系统?`, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "info",
-        beforeClose: async (action, instance, done) => {
-          if (action === "confirm") {
-            instance.confirmButtonLoading = true;
-            instance.confirmButtonText = "执行中...";
-            try {
-              // try
-              const { selectData } = this.$props;
-              const ids = selectData.map((item) => item.id);
-              const { msg, code } = await SUBMIT(ids);
-              if (code === 200) {
-                done();
-                this.$emit("success");
-                this.$notify.success(msg);
-              }
-            } catch (err) {
-              // catch
-              console.error(err);
-              instance.confirmButtonText = "确认";
-            } finally {
-              // finally
-              instance.confirmButtonLoading = false;
+      })
+        .then(async () => {
+          try {
+            const { selectData } = this.$props;
+            const ids = selectData.map((item) => item.id);
+            const { msg, code } = await SUBMIT({
+              submitIds: ids,
+              checkAmount: true,
+            });
+            if (code === 200) {
+              done();
+              this.$emit("success");
+              this.$notify.success(msg);
+            }
+            if (code === 10000) {
+              _this.$alert(
+                "<div style='overflow: auto;overflow-x: hidden;max-height: 65vh;padding: 10px 20px 0;'>" +
+                  msg +
+                  "</div>",
+                "提示",
+                {
+                  showCancelButton: true,
+                  dangerouslyUseHTMLString: true,
+                  confirmButtonText: "确认",
+                  cancelButtonText: "取消",
+                  beforeClose: async (action, instance, done) => {
+                    if (action === "confirm") {
+                      instance.confirmButtonLoading = true;
+                      instance.confirmButtonText = "执行中...";
+                      try {
+                        let { code, msg } = await SUBMIT({
+                          submitIds: ids,
+                          checkAmount: false,
+                        });
+                        if (code == 200) {
+                          done();
+                          _this.$emit("success");
+                          _this.$notify.success(msg);
+                        }
+                      } catch (error) {
+                        instance.confirmButtonText = "确认";
+                      } finally {
+                        instance.confirmButtonLoading = false;
+                      }
+                    } else {
+                      done();
+                    }
+                  },
+                }
+              );
             }
-          } else {
-            done();
+          } catch (err) {
+            // catch
+            console.error(err);
+            instance.confirmButtonText = "确认";
+          } finally {
+            // finally
+            instance.confirmButtonLoading = false;
           }
-        },
-      })
-        .then(() => {})
+        })
         .catch(() => {});
     },
   },

src/views/purchase/catalogue/index.vue

@@ -93,25 +93,28 @@ export default {
     // 导出全部
     exportAll() {
       this.$modal.loading("正在导出数据，请稍后...");
-      exportAll(this.params).then(res => {
-        this.$modal.closeLoading();
-        const blob = new Blob([res], {
-          type: "application/vnd.ms-excel;charset=UTF-8",
-        });// 创建一个类文件对象：Blob对象表示一个不可变的、原始数据的类文件对象
-        const downloadElement = document.createElement("a"); //创建a标签
-        const href = window.URL.createObjectURL(blob); // 创建下载的链接
-        // var temp = res.headers["content-disposition"]; 
-        // var fileName = decodeURIComponent(temp.split("filename=")[1]); // 中文需要转码 (前端乱码）
-        // var name = fileName.split(";")[0]; //切割成文件名
-        downloadElement.href = href;  //下载地址
-        downloadElement.download = '价格目录全部导出' + this.parseTime(new Date().getTime()) + ".xlsx"; 
-        document.body.appendChild(downloadElement);
-        downloadElement.click(); // 点击下载
-        document.body.removeChild(downloadElement); // 下载完成移除元素
-        window.URL.revokeObjectURL(href); // 释放blob对象
-      }).catch(err => {
-        this.$modal.closeLoading();
-      })
+      exportAll(this.params)
+        .then((res) => {
+          this.$modal.closeLoading();
+          const blob = new Blob([res], {
+            type: "application/vnd.ms-excel;charset=UTF-8",
+          }); // 创建一个类文件对象：Blob对象表示一个不可变的、原始数据的类文件对象
+          const downloadElement = document.createElement("a"); //创建a标签
+          const href = window.URL.createObjectURL(blob); // 创建下载的链接
+          // var temp = res.headers["content-disposition"];
+          // var fileName = decodeURIComponent(temp.split("filename=")[1]); // 中文需要转码 (前端乱码）
+          // var name = fileName.split(";")[0]; //切割成文件名
+          downloadElement.href = href; //下载地址
+          downloadElement.download =
+            "价格目录全部导出" + this.parseTime(new Date().getTime()) + ".xlsx";
+          document.body.appendChild(downloadElement);
+          downloadElement.click(); // 点击下载
+          document.body.removeChild(downloadElement); // 下载完成移除元素
+          window.URL.revokeObjectURL(href); // 释放blob对象
+        })
+        .catch((err) => {
+          this.$modal.closeLoading();
+        });
     },
   },
 };
@@ -143,12 +146,12 @@ export default {
           status="Y"
           @success="useQuery(params, page)"
         ></ena-button>
-        <ena-button
+        <!-- <ena-button
           :size="size"
           :select-data="selectData"
           status="N"
           @success="useQuery(params, page)"
-        ></ena-button>
+        ></ena-button> -->
       </el-button-group>
       <el-button-group>
         <inv-button

src/views/purchase/purchase-order/index.vue

@@ -741,10 +741,10 @@ export default {
             :key="checkedList.length"
             @click="handlePurchaseReturn"
           >采购退货</el-button> -->
-          <el-button size="mini" @click="handlePaymentRequest"
+          <el-button :size="size" @click="handlePaymentRequest"
             >付款申请</el-button
           >
-          <el-button size="mini" @click="handleDownload">批量导出</el-button>
+          <el-button :size="size" @click="handleDownload">批量导出</el-button>
         </el-button-group>
         <el-button-group>
           <zp-button