소스 검색

公称压力展示调整,商品新建调整,合同、报价单、项目商机调整

qymljy 10 달 전
부모
커밋
db9c6ea935

+ 1 - 1
src/HDrpManagement/ProductMag/modules/add.vue

@@ -618,7 +618,7 @@ export default {
     onSubmit () {
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false
-        this.form.nominalpressure = [this.form.nominalpressure]
+        this.form.nominalpressure = this.form.nominalpressure?typeof (this.form.nominalpressure) == 'object'?this.form.nominalpressure:[this.form.nominalpressure]:''
         this.$store.commit('setLoading',true)
         const res = await this.$api.requested({
           "id": 20220923141502,

+ 0 - 2
src/HDrpManagement/ProductMag/modules/edit.vue

@@ -601,8 +601,6 @@ export default {
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false
         this.form.nominalpressure = this.form.nominalpressure?typeof (this.form.nominalpressure) == 'object'?this.form.nominalpressure:[this.form.nominalpressure]:''
-        console.log(typeof (this.form.nominalpressure))
-        console.log(this.form.nominalpressure,'nominalpressure')
         const res = await this.$api.requested({
           "id": 20220923141502,
           "content": this.form

+ 8 - 5
src/HDrpManagement/contractManage/components/productDetailList/productDetailList.vue

@@ -511,11 +511,14 @@ export default {
           ],
         },
       });
-      this.tool.showMessage(res, () => {
-        this.editIndex = "";
-        this.listData();
-        this.$emit("editSuccess", res.data.signamount);
-      });
+      if (res.code == 0){
+        this.tool.showMessage(res, () => {
+        });
+      }
+      this.editIndex = "";
+      this.listData();
+      this.$emit("editSuccess", res.data.signamount);
+
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);

+ 9 - 5
src/HDrpManagement/contractManage/components/productList/productBillno.vue

@@ -495,11 +495,15 @@ export default {
           ],
         },
       });
-      this.tool.showMessage(res, () => {
-        this.editIndex = "";
-        this.listData();
-        this.$emit("editSuccess", res.data.signamount);
-      });
+      if (res.code == 0){
+        this.tool.showMessage(res, () => {
+
+        });
+      }
+      this.editIndex = "";
+      this.listData();
+      this.$emit("editSuccess", res.data.signamount);
+
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);

+ 0 - 1
src/HDrpManagement/contractManage/modules/detail.vue

@@ -55,7 +55,6 @@
                     {{$t('到表体')}}。
                   </span> <br><br>
                   </el-radio>
-
                   <el-radio v-model="cooperateForm.isadd" label="0">
                     <span style="font-size: 16px;color: #333333">{{$t('仅更新合作协议的产品折扣价格')}}</span><br><br>
                     <span style="font-size: 14px;color: #8C8C8C;margin: 20px 0 0 22px;padding-top: 20px">

+ 4 - 0
src/HDrpManagement/projectChange/modules/modules/productSet/index.vue

@@ -620,6 +620,10 @@ export default {
           ],
         },
       });
+      if (res.code == 0){
+        this.tool.showMessage(res,()=>{
+        })
+      }
       this.listData();
       this.$emit("productSetSuccess");
     },

+ 8 - 6
src/SDrpManagement/QuotedPrice/detail/modules/productInventory/index.vue

@@ -772,12 +772,14 @@ export default {
           ],
         },
       });
-      this.tool.showMessage(res, () => {
-        this.saveShow = false;
-        this.index = "";
-        this.productData();
-        this.$emit("productSuccess");
-      });
+      if (res.code == 0){
+        this.tool.showMessage(res, () => {
+        });
+      }
+      this.saveShow = false;
+      this.index = "";
+      this.productData();
+      this.$emit("productSuccess");
     },
     async importSuccess(val) {
       const res = await this.$api.requested({

+ 13 - 12
src/utils/tool.js

@@ -315,18 +315,19 @@ export default {
         if (index == 0){
           newPressure = item
         }else {
-          let str1 = item.substring(0,2)
-          let str2 = val[index -1].substring(0,2)
-          let str3 = item.substring(2)
-          if (str1 == str2){
-            if (newPressure == val[index -1]){
-              newPressure = val[index -1] + '/' + str3
-            }else {
-              newPressure = newPressure + '/' + str3
-            }
-          }else {
-            newPressure = newPressure + '/' + item
-          }
+          newPressure = newPressure + '/' + item
+          // let str1 = item.substring(0,2)
+          // let str2 = val[index -1].substring(0,2)
+          // let str3 = item.substring(2)
+          // if (str1 == str2){
+          //   if (newPressure == val[index -1]){
+          //     newPressure = val[index -1] + '/' + str3
+          //   }else {
+          //     newPressure = newPressure + '/' + str3
+          //   }
+          // }else {
+          //
+          // }
         }
       })
     }else {