Bläddra i källkod

订单管理、订货业务、订货订单,导入提示信息调整,物流单bug修复

qymljy 4 dagar sedan
förälder
incheckning
aa66bc90f2

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

@@ -65,7 +65,7 @@
         </div>
         <el-row :gutter="10">
           <el-col :span="setcol">
-            <dispatch-table type="add" ref="dislist"></dispatch-table>
+            <dispatch-table type="add" ref="dislist" status="新建"></dispatch-table>
           </el-col>
           <el-col :span="24 - setcol">
             <add-disbill v-if="drawer" ref="addbill" :data="enterpriseInfo" :paytype="form.paytype" @onConfirm="onConfirm" :addList="selectList"></add-disbill>

+ 3 - 3
src/HDrpManagement/logistics/modules/dispatchTable.vue

@@ -34,9 +34,9 @@
     },
     methods:{
       async deleteDisBill (row,val) {
-        if (val == '删除'){
-          this.needQuery = true
-        }
+        // if (val == '删除'){
+        //   this.needQuery = true
+        // }
         if (this.needQuery) {
           const res = await this.$api.requested({
             "id": "20221122133404",

+ 4 - 1
src/HDrpManagement/orderManage/details/index.vue

@@ -723,8 +723,11 @@ export default {
         }
       })
       this.$refs['prod'].listData()
-      if (res.data !== '成功') {
+      console.log(res.data.substr(0,4))
+      if (res.data.substr(0,4) == 'http'){
         this.errorUrl = res.data
+      }else {
+        this.tool.showMessage(res,()=>{})
       }
       this.queryMainData()
     }

+ 4 - 2
src/SDrpManagement/agentOrder/details/index.vue

@@ -717,8 +717,10 @@ export default {
         },
       });
       this.$refs["prod"].listData();
-      if (res.data !== "成功") {
-        this.errorUrl = res.data;
+      if (res.data.substr(0,4) == 'http'){
+        this.errorUrl = res.data
+      }else {
+        this.tool.showMessage(res,()=>{})
       }
       this.queryMainData();
     },

+ 4 - 2
src/SDrpManagement/salerOrder/details/index.vue

@@ -861,8 +861,10 @@ export default {
         },
       });
       this.$refs["prod"].listData();
-      if (res.data !== "成功") {
-        this.errorUrl = res.data;
+      if (res.data.substr(0,4) == 'http'){
+        this.errorUrl = res.data
+      }else {
+        this.tool.showMessage(res,()=>{})
       }
       this.queryMainData();
     },

+ 5 - 5
src/SDrpManagement/salerPrivatecustomer/detail/modules/financialInfo/modules/add.vue

@@ -147,11 +147,11 @@ export default {
             message: this.$t("请输入联系电话"),
             trigger: "blur",
           },
-          {
-            pattern: /^1[3-9][0-9]\d{8}$/,
-            message: this.$t("请输入正确手机号码"),
-            trigger: "blur",
-          },
+          // {
+          //   pattern: /^1[3-9][0-9]\d{8}$/,
+          //   message: this.$t("请输入正确手机号码"),
+          //   trigger: "blur",
+          // },
         ],
       },
     };

+ 0 - 5
src/SDrpManagement/salerPrivatecustomer/detail/modules/financialInfo/modules/edit.vue

@@ -155,11 +155,6 @@ export default {
             message: this.$t("请输入联系电话"),
             trigger: "blur",
           },
-          {
-            pattern: /^1[3-9][0-9]\d{8}$/,
-            message: this.$t("请输入正确手机号码"),
-            trigger: "blur",
-          },
         ],
       },
     };

+ 5 - 0
src/template/logisticsCanUseProduct/index.vue

@@ -19,6 +19,11 @@
         type="selection"
         width="55">
       </el-table-column>
+      <el-table-column
+          prop="billno"
+          :label="$t(`发货单号`)"
+          width="180">
+      </el-table-column>
       <el-table-column
         prop="itemno"
         :label="$t(`产品编码`)"