完善入库--增加公司入库日期

anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue

@@ -193,11 +193,15 @@
             </el-table-column>
           </el-table>
           <el-row>
-            <el-col :span="12">
+            <el-col :span="8">
               <div class="span-sty spanOneWidth"><span>厂家入库日期</span></div>
               <el-form-item><el-date-picker value-format="yyyy-MM-dd" v-model="formobj.priceDate" clearable type="date" class="addinputw addinputwOne" placeholder=""/></el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="8">
+              <div class="span-sty spanOneWidth"><span>公司入库日期</span></div>
+              <el-form-item><el-date-picker value-format="yyyy-MM-dd" v-model="formobj.orgPriceDate" :picker-options="pickerOptions" clearable type="date" class="addinputw addinputwOne" placeholder=""/></el-form-item>
+            </el-col>
+            <el-col :span="8">
               <div class="span-sty spanOneWidth"><span>物流发车日期</span></div>
               <el-form-item><el-date-picker value-format="yyyy-MM-dd" v-model="formobj.departureDate" clearable type="date" class="addinputw addinputwOne" placeholder=""/></el-form-item>
             </el-col>
@@ -225,6 +229,12 @@ export default {
   },
   data() {
     return {
+      pickerOptions: {
+        disabledDate(time) {
+          let oneDay = 3600 * 1000 * 24 * 5
+          return Date.now() < time.getTime() || time.getTime() < Date.now() - oneDay
+        }
+      },
       viewTitle: '',
       index: 0,
       tableKey: 0,
@@ -281,7 +291,8 @@ export default {
         scmFiles: [],
         vehicleList: [],
         vehicleOrderSid: '',
-        orgPath: ''
+        orgPath: '',
+        priceDate: ''
       },
       rules: {},
       submitdisabled: false
@@ -773,14 +784,6 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '采购订单编号不能为空' })
         return
       }
-      if (this.formobj.priceDate === '' || this.formobj.priceDate === null) {
-        this.$message({ showClose: true, type: 'error', message: '厂家入库日期不能为空' })
-        return
-      }
-      if (this.formobj.departureDate === '') {
-        this.$message({ showClose: true, type: 'error', message: '物流发车日期不能为空' })
-        return
-      }
       if (this.formobj.onceFreight === '') {
         this.$message({ showClose: true, type: 'error', message: '一次运费不能为空' })
         return
@@ -789,6 +792,18 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '因一次运费不能为零，请完善一次运费' })
         return
       }
+      if (this.formobj.priceDate === '' || this.formobj.priceDate === null) {
+        this.$message({ showClose: true, type: 'error', message: '厂家入库日期不能为空' })
+        return
+      }
+      if (this.formobj.orgPriceDate === '') {
+        this.$message({ showClose: true, type: 'error', message: '公司入库日期不能为空' })
+        return
+      }
+      if (this.formobj.departureDate === '') {
+        this.$message({ showClose: true, type: 'error', message: '物流发车日期不能为空' })
+        return
+      }
       if (this.freightChecked) {
         this.formobj.deductionFreight = 0
       } else {

anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue

@@ -196,11 +196,15 @@
             </el-table-column>
           </el-table>
           <el-row>
-            <el-col :span="12">
+            <el-col :span="8">
               <div class="span-sty spanOneWidth"><span>厂家入库日期</span></div>
               <el-form-item><span class="addinputwOne addinputInfo">{{ formobj.priceDate }}</span></el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="8">
+              <div class="span-sty spanOneWidth"><span>公司入库日期</span></div>
+              <el-form-item><span class="addinputwOne addinputInfo">{{ formobj.orgPriceDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
               <div class="span-sty spanOneWidth"><span>物流发车日期</span></div>
               <el-form-item><span class="addinputwOne addinputInfo">{{ formobj.departureDate }}</span></el-form-item>
             </el-col>
@@ -281,7 +285,8 @@ export default {
         deductionPolicyTwoOne: '',
         scmFiles: [],
         vehicleList: [],
-        vehicleOrderSid: ''
+        vehicleOrderSid: '',
+        priceDate: ''
       },
       rules: {},
       submitdisabled: false

anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue

@@ -198,11 +198,15 @@
             </el-table-column>
           </el-table>
           <el-row>
-            <el-col :span="12">
+            <el-col :span="8">
               <div class="span-sty spanOneWidth"><span>厂家入库日期</span></div>
               <el-form-item><span class="addinputwOne addinputInfo">{{ formobj.priceDate }}</span></el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="8">
+              <div class="span-sty spanOneWidth"><span>公司入库日期</span></div>
+              <el-form-item><span class="addinputwOne addinputInfo">{{ formobj.orgPriceDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
               <div class="span-sty spanOneWidth"><span>物流发车日期</span></div>
               <el-form-item><span class="addinputwOne addinputInfo">{{ formobj.departureDate }}</span></el-form-item>
             </el-col>
@@ -316,7 +320,8 @@ export default {
         deductionPolicyTwoOne: '',
         scmFiles: [],
         vehicleList: [],
-        vehicleOrderSid: ''
+        vehicleOrderSid: '',
+        priceDate: ''
       },
       // 环节所需参数
       linkByParameter: {

anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue

@@ -192,11 +192,15 @@
             </el-table-column>
           </el-table>
           <el-row>
-            <el-col :span="12">
+            <el-col :span="8">
               <div class="span-sty spanOneWidth"><span>厂家入库日期</span></div>
               <el-form-item><el-date-picker value-format="yyyy-MM-dd" v-model="formobj.priceDate" clearable type="date" class="addinputw addinputwOne" placeholder=""/></el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="8">
+              <div class="span-sty spanOneWidth"><span>公司入库日期</span></div>
+              <el-form-item><el-date-picker value-format="yyyy-MM-dd" v-model="formobj.orgPriceDate" :picker-options="pickerOptions" clearable type="date" class="addinputw addinputwOne" placeholder=""/></el-form-item>
+            </el-col>
+            <el-col :span=8>
               <div class="span-sty spanOneWidth"><span>物流发车日期</span></div>
               <el-form-item><el-date-picker value-format="yyyy-MM-dd" v-model="formobj.departureDate" clearable type="date" class="addinputw addinputwOne" placeholder=""/></el-form-item>
             </el-col>
@@ -224,6 +228,12 @@ export default {
   },
   data() {
     return {
+      pickerOptions: {
+        disabledDate(time) {
+          let oneDay = 3600 * 1000 * 24 * 5
+          return Date.now() < time.getTime() || time.getTime() < Date.now() - oneDay
+        }
+      },
       viewTitle: '',
       index: 0,
       tableKey: 0,
@@ -278,7 +288,8 @@ export default {
         scmFiles: [],
         vehicleList: [],
         vehicleOrderSid: '',
-        orgPath: ''
+        orgPath: '',
+        priceDate: ''
       },
       rules: {},
       submitdisabled: false
@@ -720,10 +731,6 @@ export default {
     },
     saveEdit() {
       this.getUrl()
-      if (this.formobj.departureDate === '') {
-        this.$message({ showClose: true, type: 'error', message: '厂家发车日期不能为空' })
-        return
-      }
       if (this.formobj.onceFreight === '') {
         this.$message({ showClose: true, type: 'error', message: '一次运费不能为空' })
         return
@@ -732,6 +739,14 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '因一次运费不能为零，请完善一次运费' })
         return
       }
+      if (this.formobj.departureDate === '') {
+        this.$message({ showClose: true, type: 'error', message: '厂家发车日期不能为空' })
+        return
+      }
+      if (this.formobj.orgPriceDate === '') {
+        this.$message({ showClose: true, type: 'error', message: '公司入库日期不能为空' })
+        return
+      }
       if (this.freightChecked) {
         this.formobj.deductionFreight = 0
       } else {
@@ -792,14 +807,6 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '采购订单编号不能为空' })
         return
       }
-      if (this.formobj.priceDate === '' || this.formobj.priceDate === null) {
-        this.$message({ showClose: true, type: 'error', message: '厂家入库日期不能为空' })
-        return
-      }
-      if (this.formobj.departureDate === '') {
-        this.$message({ showClose: true, type: 'error', message: '物流发车日期不能为空' })
-        return
-      }
       if (this.formobj.onceFreight === '') {
         this.$message({ showClose: true, type: 'error', message: '一次运费不能为空' })
         return
@@ -808,6 +815,18 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '因一次运费不能为零，请完善一次运费' })
         return
       }
+      if (this.formobj.priceDate === '' || this.formobj.priceDate === null) {
+        this.$message({ showClose: true, type: 'error', message: '厂家入库日期不能为空' })
+        return
+      }
+      if (this.formobj.orgPriceDate === '') {
+        this.$message({ showClose: true, type: 'error', message: '公司入库日期不能为空' })
+        return
+      }
+      if (this.formobj.departureDate === '') {
+        this.$message({ showClose: true, type: 'error', message: '物流发车日期不能为空' })
+        return
+      }
       if (this.freightChecked) {
         this.formobj.deductionFreight = 0
       } else {

anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue

@@ -196,11 +196,15 @@
             </el-table-column>
           </el-table>
           <el-row>
-            <el-col :span="12">
+            <el-col :span="8">
               <div class="span-sty spanOneWidth"><span>厂家入库日期</span></div>
               <el-form-item><span class="addinputwOne addinputInfo">{{ formobj.priceDate }}</span></el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="8">
+              <div class="span-sty spanOneWidth"><span>公司入库日期</span></div>
+              <el-form-item><span class="addinputwOne addinputInfo">{{ formobj.orgPriceDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
               <div class="span-sty spanOneWidth"><span>物流发车日期</span></div>
               <el-form-item><span class="addinputwOne addinputInfo">{{ formobj.departureDate }}</span></el-form-item>
             </el-col>
@@ -281,7 +285,8 @@ export default {
         deductionPolicyTwoOne: '',
         scmFiles: [],
         vehicleList: [],
-        vehicleOrderSid: ''
+        vehicleOrderSid: '',
+        priceDate: ''
       },
       // 环节所需参数
       linkByParameter: {