2023-3-1

src/Form/EnterpriseArchives/add.vue

@@ -122,7 +122,6 @@ export default {
         ],
         phonenumber: [
           { required: true, message: '输入联系电话', trigger: 'blur' },
-          { pattern:/^1[3-9]\d{9}$/, message: '请输入正确手机号码',trigger: 'blur' }
         ],
         taxno: [
           { required: true, message: '输入税号', trigger: 'blur' },

src/Form/EnterpriseArchives/edit.vue

@@ -123,7 +123,6 @@ export default {
         ],
         phonenumber: [
           { required: true, message: '输入联系电话', trigger: 'blur' },
-          { pattern:/^1[3-9]\d{9}$/, message: '请输入正确手机号码',trigger: 'blur' }
         ],
         taxno: [
           { required: true, message: '输入税号', trigger: 'blur' },

src/HDrpManagement/orderManage/details/index.vue

@@ -278,6 +278,10 @@ export default {
           label:'销售分类',
           value:this.mainData.saletype + '--' + this.mainData.saletyperemarks
         },
+        {
+          label:'运费状态',
+          value:this.mainData.freightstatus
+        },
         {
           label:'备注',
           value:this.mainData.remarks

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -349,12 +349,12 @@ export default {
       },
       pickerOptions1: {
         disabledDate(time) {
-          return time.getTime() < new Date().getTime() - 24 * 60 * 60 * 1000;
+          return time.getTime() < new Date().getTime();
         },
       },
       pickerOptions: {
         disabledDate(time) {
-          return time.getTime() < (Date.now() - 48 * 3600 * 1000);
+          return time.getTime() < (new Date().getTime() - 24 * 60 * 60 * 1000);
         },
       },
       total:0,
@@ -452,25 +452,29 @@ export default {
       this.listData()
     },
     setPickerOptions (val) {
-      /* 如果设置需求日 交期不能大于需求日 */
-      if (val.needdate) {
-        var startDate = val.needdate
-        startDate = startDate.replace(new RegExp("-","gm"),"/")
-        var startDateM = (new Date(startDate)).getTime()
-        this.pickerOptions = {
-          disabledDate(time) {
-            return time.getTime() > startDateM;
-          },
-        }
-      /* 否则不能小于今天 */
-      } else {
-        this.pickerOptions = {
-          disabledDate(time) {
-            return time.getTime() < new Date().getTime() - 24 * 60 * 60 * 1000;
-          },
-        }
+      // /* 如果设置需求日 交期不能大于需求日 */
+      // if (val.needdate) {
+      //   var startDate = val.needdate
+      //   startDate = startDate.replace(new RegExp("-","gm"),"/")
+      //   var startDateM = (new Date(startDate)).getTime()
+      //   this.pickerOptions = {
+      //     disabledDate(time) {
+      //       return time.getTime() > startDateM;
+      //     },
+      //   }
+      // /* 否则不能小于今天 */
+      // } else {
+      //   this.pickerOptions = {
+      //     disabledDate(time) {
+      //       return time.getTime() < new Date().getTime() - 24 * 60 * 60 * 1000;
+      //     },
+      //   }
+      // }
+      this.pickerOptions = {
+        disabledDate(time) {
+          return time.getTime() < new Date().getTime();
+        },
       }
-      
     },
     async dateChange (row) {
       this.tableData = this.tableData.filter(e=>{

src/SDrpManagement/ProductGroup/index.vue

@@ -178,8 +178,6 @@ export default {
     } else {
       this.$store.commit('setPageCache',[])
     }
-    console.log(this.$store.state.pageCache);
-    
     next()
   }
 };

src/SDrpManagement/agentOrder/details/index.vue

@@ -204,6 +204,10 @@ export default {
           label:'开票状态',
           value:this.mainData.invoicestatus
         },
+        {
+          label:'运费状态',
+          value:this.mainData.freightstatus
+        },
         {
           label:'项目备注',
           value:this.mainData.projectnote

src/SDrpManagement/salerOrder/details/index.vue

@@ -249,6 +249,10 @@ export default {
           label:'销售分类',
           value:this.mainData.saletype
         },
+        {
+          label:'运费状态',
+          value:this.mainData.freightstatus
+        },
         {
           label:'备注',
           value:this.mainData.remarks