luobang 1 rok temu
rodzic
commit
1eaef21288

+ 2 - 2
build/utils.js

@@ -16,9 +16,9 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 
-// let devModules = ['all']
-// let devModules = ['index', 'statisticalReport', 'sale']
 let devModules = ['all']
+// let devModules = ['index', 'statisticalReport', 'sale']
+// let devModules = ['all']
 
 // let devModules = ['index', 'ADMINISTRATORS']
 

+ 12 - 3
src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckDetailsOrderNew.vue

@@ -881,11 +881,18 @@
             type="number"
           ></el-input>
         </el-form-item>
-        <el-form-item label="发票期">
+        <el-form-item label="发票期">
           <el-date-picker
             v-model="statementTime"
             type="date"
-            placeholder="选择日期"
+            placeholder="选择账单起始日期"
+            style="width:200px"
+          >
+          </el-date-picker>
+          <el-date-picker
+            v-model="statementEndTime"
+            type="date"
+            placeholder="选择账单结束日期"
             style="width:200px"
           >
           </el-date-picker>
@@ -1274,6 +1281,7 @@ export default {
   data() {
     return {
       statementTime: null,
+      statementEndTime: null,
       saleOrderMaterialIds: [],
       batchAddressProvince: '',
       batchAddressDistrict: '',
@@ -2052,7 +2060,7 @@ export default {
     },
     generateStatement() {
       this.isLoading = true
-      if (!this.excludeTax || !this.statementTime) {
+      if (!this.excludeTax || !this.statementTime || !this.statementEndTime) {
         this.$message.warning('请填写所有信息!')
         this.isLoading = false
       } else if (this.statementList.length < 1) {
@@ -2078,6 +2086,7 @@ export default {
         formData.append('userId', getCookie('userId'))
         console.log('statementTime:', this.statementTime)
         formData.append('statementTime', this.statementTime.getTime())
+        formData.append('statementEndTime', this.statementEndTime.getTime())
         let options = {
           url: '/api/v1/bms/addTruckStatement',
           data: formData,

+ 15 - 2
src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -4727,7 +4727,14 @@ export default {
         .post('/api/v1/ams/updateCarAddress', map)
         .then(res => {
           if (res.data.code == '200') {
-            this.$message.success('修改收货地址成功!')
+            // this.$message.success('修改收货地址成功!')
+            this.$message({
+              type: 'success',
+              message:
+                '修改收货地址成功,请提醒相关人员核对单价及详单数据是否生成正确',
+              offset: '250',
+              duration: 2500
+            })
             this.operation(this.steelMap)
             this.onclick(this.filterMap)
             loading.close()
@@ -4764,7 +4771,13 @@ export default {
           .post('/api/v1/ams/updateCarAddress', map)
           .then(res => {
             if (res.data.code == '200') {
-              this.$message.success('修改收货地址成功!')
+              this.$message({
+                type: 'success',
+                message:
+                  '修改收货地址成功,请提醒相关人员核对单价及详单数据是否生成正确',
+                offset: '250',
+                duration: 2500
+              })
             } else {
               this.$message.error('修改失败,请联系管理员!')
             }