From 2dd91f07309415d962aed1e9e628acaaf947b335 Mon Sep 17 00:00:00 2001
From: shawnzhang <z784836221@outlook.com>
Date: Sun, 26 Jul 2020 18:22:54 +0800
Subject: [PATCH] =?UTF-8?q?7/26=E6=97=A5=E5=89=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |   2 +-
 index.html                                    |   2 +-
 src/api/InstallmentApply.js                   |   3 +
 src/api/Stockenter.js                         |  36 +++
 src/lang/en.js                                |  10 +-
 src/lang/zh.js                                |   3 +-
 src/views/BuildUp/BuildUpList.vue             |   6 +-
 src/views/CheckReport/AddCheckReport.vue      |  18 +-
 .../CheckReport/components/DetailReport.vue   |  31 +-
 .../CheckReport/components/DetailReport2.vue  |  32 +-
 .../CheckReport/components/DetailReport3.vue  |  30 +-
 .../CheckReport/components/DetailReport4.vue  |  30 +-
 .../CheckReport/components/MyArrival.vue      |  18 +-
 .../CheckReport/components/MyQuality.vue      |  17 +-
 .../CheckReport/components/OutSource.vue      |  14 +-
 .../CheckReport/components/ProduceTask.vue    |  16 +-
 src/views/Collection/AddRecoverVehicle.vue    |   2 +-
 src/views/Customer/NewCustomer.vue            |   5 +-
 src/views/Expenses/AddExpenses.vue            |   2 +-
 .../InstallmentApply/AddInstallmentApply.vue  |   2 +-
 .../InstallmentApply/InstallmentApplyList.vue |   1 +
 .../OutSourceEnter/AddOutSourceEnter.vue      | 241 ++++++++-------
 .../OutSourceEnter/components/MyDialog.vue    |   2 +-
 src/views/OutSourceOut/AddOutSourceOut.vue    | 291 +++++++++---------
 src/views/OutSourceOut/components/MyEdit.vue  |   2 +-
 src/views/OutSourcing/AddOutSourcing.vue      | 191 ++++++------
 src/views/PrepReceipt/AddPrepReceipt.vue      |   2 +-
 src/views/Product/NewProduct.vue              |   8 +-
 src/views/Receipt/AddReceipt.vue              |   2 +-
 src/views/Recycling/AddRecycling.vue          |   2 +-
 .../ReturnExchange/AddReturnExchange.vue      |  36 ++-
 src/views/SaleOrder/AddSaleOrder.vue          |   2 +-
 src/views/SaleOut/AddSaleOut.vue              |   4 +-
 src/views/SaleOut/NewAccessoriesOut.vue       |  19 +-
 src/views/SaleOut/NewBatteryOut.vue           | 128 ++++++--
 src/views/SaleOut/components/DetailList.vue   |   2 +-
 src/views/SaleOut/components/MyDialog.vue     |   2 +-
 src/views/SaleOut/components/MyDialog2.vue    |   2 +-
 src/views/SaleOut/components/MyDialog3.vue    |   2 +-
 src/views/SaleReturn/AddSaleReturn.vue        |   2 +-
 src/views/StockArrival/AddStockArrival.vue    |   2 +-
 src/views/StockArrival/StockArrivalList.vue   |   4 +-
 .../StockArrival/components/MyDialog.vue      |   2 +-
 src/views/StockInquiry/AddStockInquiry.vue    |   2 +-
 .../StockInvoice/components/DetailList.vue    |   2 +-
 .../StockInvoice/components/MyDialog.vue      |   2 +-
 src/views/StockOrder/AddStockOrder.vue        |   2 +-
 src/views/StockRetreat/AddStockRetreat.vue    |   1 +
 .../StockRetreat/components/MyDialog.vue      |   1 +
 src/views/Stockenter/OtherEnterList.vue       |  10 +-
 .../Stockenter/components/DetailList.vue      |  33 +-
 .../SupplierAdjust/AddSupplierAdjust.vue      |   2 +
 .../SupplierAdjust/components/MyDialog.vue    |  11 +-
 src/views/Transfer/AddTransfer.vue            |  37 ++-
 src/views/Transfer/components/MyDialog.vue    |   2 +-
 src/views/income/AddIncome.vue                |   2 +-
 56 files changed, 857 insertions(+), 478 deletions(-)

diff --git a/README.md b/README.md
index 268c69fb..6d0ffd2b 100644
--- a/README.md
+++ b/README.md
@@ -483,7 +483,7 @@ for (let i = 0, l = newarr.length; i < l - 1; i++) {
     pickerOptions2: {
         disabledDate: (time) => {
           const _now = Date.now()
-          const seven = 10 * 24 * 60 * 60 * 1000
+          const seven = 30 * 24 * 60 * 60 * 1000
           const sevenDays = _now - seven
           return time.getTime() > _now || time.getTime() < sevenDays
         }
diff --git a/index.html b/index.html
index 9852a061..e71bbd7e 100644
--- a/index.html
+++ b/index.html
@@ -8,7 +8,7 @@
   </head>
   <body>
     <script src=<%= BASE_URL %>/tinymce4.7.5/tinymce.min.js></script>
-    <script async defer type="text/javascript" src="https://maps.googleapis.com/maps/api/js?&key=AIzaSyCcpq4V2NmldO9DdD0LHkYdyMYDQt-7Miw"></script>
+    <script async defer type="text/javascript" src="https://maps.googleapis.com/maps/api/js?&key=AIzaSyB37jXlk9_-rcuRxc5YBB3qmLeKCl70UGU"></script>
     <script src=<%= BASE_URL %>/tinymce4.7.5/markerwithlabel.js></script>
     <div id="app"></div>
   </body>
diff --git a/src/api/InstallmentApply.js b/src/api/InstallmentApply.js
index 82f4edff..38f17e6d 100644
--- a/src/api/InstallmentApply.js
+++ b/src/api/InstallmentApply.js
@@ -24,6 +24,9 @@ export function addinstallmentapply(query, query2, query4) {
 // 分期申请列表
 export function applylist(query) {
   var params = new URLSearchParams()
+  if (query.applyNumber !== '' && query.applyNumber !== null && query.applyNumber !== undefined) {
+    params.append('applyNumber', query.applyNumber) // 你要传给后台的参数值 key/value
+  }
   if (query.inquirePersonId !== '' && query.inquirePersonId !== null && query.inquirePersonId !== undefined) {
     params.append('inquirePersonId', query.inquirePersonId) // 你要传给后台的参数值 key/value
   }
diff --git a/src/api/Stockenter.js b/src/api/Stockenter.js
index acf3a0a1..2384a6dc 100644
--- a/src/api/Stockenter.js
+++ b/src/api/Stockenter.js
@@ -717,3 +717,39 @@ export function updateotherenter5(query, query2, query3) {
     data: params
   })
 }
+
+export function updateotherenter6(query, query2, query3) {
+  var params = new URLSearchParams()
+  if (query !== '' && query !== null && query !== undefined) {
+    params.append('id', query) // 你要传给后台的参数值 key/value
+  }
+  if (query3 !== '' && query3 !== null && query3 !== undefined) {
+    params.append('judgePersonId', query3) // 你要传给后台的参数值 key/value
+  }
+  if (query2 !== '' && query2 !== null && query2 !== undefined) {
+    params.append('receiptStat', query2) // 你要传给后台的参数值 key/value
+  }
+  return request({
+    url: '/otherenter/updateotherenter',
+    method: 'post',
+    data: params
+  })
+}
+
+export function updateotherenter7(query, query2, query3) {
+  var params = new URLSearchParams()
+  if (query !== '' && query !== null && query !== undefined) {
+    params.append('id', query) // 你要传给后台的参数值 key/value
+  }
+  if (query2 !== '' && query2 !== null && query2 !== undefined) {
+    params.append('judgeStat', query2) // 你要传给后台的参数值 key/value
+  }
+  if (query3 !== '' && query3 !== null && query3 !== undefined) {
+    params.append('judgePersonId', query3) // 你要传给后台的参数值 key/value
+  }
+  return request({
+    url: '/otherenter/updateotherenter',
+    method: 'post',
+    data: params
+  })
+}
diff --git a/src/lang/en.js b/src/lang/en.js
index cd8daf36..80f165d8 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -4509,11 +4509,11 @@ export default {
     allIncludeTaxMoney: 'allIncludeTaxMoney',
     allPlanMoney: 'allPlanMoney',
     allTaxMoney: 'allTaxMoney',
-    applyPhone: 'applyPhone',
-    acceptPhone: 'acceptPhone',
-    emergencyPhone: 'emergencyPhone',
-    outPhone: 'outPhone',
-    sendPhone: 'sendPhone',
+    applyPhone: 'applicant contact#',
+    acceptPhone: 'receiver contact#',
+    emergencyPhone: 'TL/manager contact#',
+    outPhone: 'stock out contact#',
+    sendPhone: ' helper/deliverer contact#',
     sendEmergencyPhone: 'sendEmergencyPhone',
     yearDepreciationRate: 'yearDepreciationRate',
     danhao: 'receiptNumber'
diff --git a/src/lang/zh.js b/src/lang/zh.js
index ddc5de4b..f22f918c 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -4516,6 +4516,7 @@ export default {
     sendPhone: '配送人电话',
     sendEmergencyPhone: '配送紧急联系人电话',
     yearDepreciationRate: '年残值率',
-    danhao: '单号'
+    danhao: '单号',
+    actialdiffermoney: '实际差异金额'
   }
 }
diff --git a/src/views/BuildUp/BuildUpList.vue b/src/views/BuildUp/BuildUpList.vue
index f5e074c0..e209ca17 100644
--- a/src/views/BuildUp/BuildUpList.vue
+++ b/src/views/BuildUp/BuildUpList.vue
@@ -127,7 +127,7 @@
         <el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
           <template slot-scope="scope">
             <el-button v-permission="['131-157-3']" v-show="scope.row.judgeStat === 0" type="primary" size="mini" @click="handleEdit(scope.row)">{{ $t('public.edit') }}</el-button>
-            <el-button v-show="isReview(scope.row)" type="warning" size="mini" @click="handleReview(scope.row)">{{ $t('public.review') }}</el-button>
+            <el-button v-show="isReview(scope.row)" :loading="shloading" type="warning" size="mini" @click="handleReview(scope.row)">{{ $t('public.review') }}</el-button>
             <el-button v-permission="['131-157-76']" v-show="isReview4(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fsp')" type="warning" size="mini" circle @click="handleReview4(scope.row)"><svg-icon icon-class="fanhui"/></el-button>
             <el-button v-permission="['131-157-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>
             <el-button v-permission="['131-157-17']" v-show="isReview3(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fjd')" type="success" size="mini" icon="el-icon-back" circle @click="handleReview3(scope.row)"/>
@@ -184,6 +184,7 @@ export default {
   },
   data() {
     return {
+      shloading: false,
       tableHeight: 200,
 
       // 搜索数据----------------------
@@ -474,6 +475,7 @@ export default {
     },
     // 审批操作
     handleReview(row) {
+      this.shloading = true
       this.reviewParms = {}
       this.reviewParms.id = row.id
       this.reviewParms.judgePersonId = this.$store.getters.userId
@@ -493,6 +495,7 @@ export default {
             })
             this.getlist()
           }
+          this.shloading = false
         })
       }).catch(action => {
         if (action === 'cancel') {
@@ -525,6 +528,7 @@ export default {
             })
           // ================取消弹框结束
         }
+        this.shloading = false
       })
     },
     // 批量操作
diff --git a/src/views/CheckReport/AddCheckReport.vue b/src/views/CheckReport/AddCheckReport.vue
index a1de69e1..59369d21 100644
--- a/src/views/CheckReport/AddCheckReport.vue
+++ b/src/views/CheckReport/AddCheckReport.vue
@@ -124,10 +124,10 @@
                 <el-form-item :label="$t('CheckReport.productCode')" prop="productCode" style="margin-left: 18px;width: 100%;margin-bottom: 0">
                   <el-input v-model="personalForm.productCode" style="margin-left: 18px;width:200px" @focus="handlemater"/>
                   <my-mater :matercontrol.sync="matercontrol" @mater="mater"/>
-                  <detail-report :reportcontrol.sync="reportcontrol" :reportdata.sync="reportdata" @report="report"/>
-                  <detail-report2 :reportcontrol2.sync="reportcontrol2" :reportdata2.sync="reportdata2" @report2="report2"/>
-                  <detail-report3 :reportcontrol3.sync="reportcontrol3" :reportdata3.sync="reportdata3" @report3="report3"/>
-                  <detail-report4 :reportcontrol4.sync="reportcontrol4" :reportdata4.sync="reportdata4" @report4="report4"/>
+                  <detail-report :reportcontrol.sync="reportcontrol" :number.sync="number3" :reportdata.sync="reportdata" @report="report"/>
+                  <detail-report2 :reportcontrol2.sync="reportcontrol2" :number.sync="number2" :reportdata2.sync="reportdata2" @report2="report2"/>
+                  <detail-report3 :reportcontrol3.sync="reportcontrol3" :number.sync="number4" :reportdata3.sync="reportdata3" @report3="report3"/>
+                  <detail-report4 :reportcontrol4.sync="reportcontrol4" :number.sync="number5" :reportdata4.sync="reportdata4" @report4="report4"/>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -326,6 +326,10 @@ export default {
       }
     }
     return {
+      number5: null,
+      number4: null,
+      number3: null,
+      number2: null,
       outsourcecontrol: false,
       // 判断是否大于源单数量
       judgequilty: null,
@@ -666,12 +670,16 @@ export default {
     // 物品信息focus事件
     handlemater() {
       if (this.personalForm.sourceType === '1') {
+        this.number3 = this.personalForm.sourceNumber
         this.reportcontrol = true
       } else if (this.personalForm.sourceType === '2') {
+        this.number2 = this.personalForm.sourceNumber
         this.reportcontrol2 = true
       } else if (this.personalForm.sourceType === '3') {
+        this.number4 = this.personalForm.sourceNumber
         this.reportcontrol3 = true
       } else if (this.personalForm.sourceType === '4') {
+        this.number5 = this.personalForm.sourceNumber
         this.reportcontrol4 = true
       }
     },
@@ -1116,7 +1124,6 @@ export default {
         regionId: this.$store.getters.regionId,
         inspectionPersonId: this.$store.getters.userId,
         isRecheck: 1,
-        sourceType: '2',
         sampleQuantity: null,
         checkQuantity: null,
         failedQuantity: '',
@@ -1129,7 +1136,6 @@ export default {
       }
       this.judgequilty = null
       this.inspectionPersonId = this.$store.getters.name
-      this.supplierId = null
       this.workCenterId = null
       this.produceManagerId = null
       this.checkPersonId = this.$store.getters.name
diff --git a/src/views/CheckReport/components/DetailReport.vue b/src/views/CheckReport/components/DetailReport.vue
index cfe40ce2..1f9fe346 100644
--- a/src/views/CheckReport/components/DetailReport.vue
+++ b/src/views/CheckReport/components/DetailReport.vue
@@ -71,6 +71,8 @@
 
 <script>
 var _that
+import { qualitychecklist } from '@/api/QualityCheck'
+
 export default {
   props: {
     reportcontrol: {
@@ -80,6 +82,10 @@ export default {
     reportdata: {
       type: Array,
       default: null
+    },
+    number: {
+      type: String,
+      default: null
     }
   },
   data() {
@@ -98,7 +104,17 @@ export default {
       // 表格数据条数
       total: 0,
       // 表格识别
-      tableKey: 0
+      tableKey: 0,
+      getemplist: {
+        pageNum: 1,
+        pageSize: 10,
+        judgeStat: 2,
+        receiptStat: 2,
+        repositoryId: this.$store.getters.repositoryId,
+        regionIds: this.$store.getters.regionIds,
+        isActive: 1,
+        checkNumber: this.number
+      }
     }
   },
   watch: {
@@ -112,13 +128,24 @@ export default {
     },
     reportdata() {
       console.log(this.reportdata)
-      this.list = this.reportdata
+      // this.list = this.reportdata
+    },
+    number() {
+      this.getemplist.number = this.number
+      this.getdata()
     }
   },
   beforeCreate() {
     _that = this
   },
   methods: {
+    getdata() {
+      qualitychecklist(this.getemplist).then(res => {
+        if (res.data.ret === 200) {
+          this.list = res.data.data.content.list[0].qualityCheckDetailVos
+        }
+      })
+    },
     handleCurrentChange(val) {
       console.log(val)
       this.choosedata = val
diff --git a/src/views/CheckReport/components/DetailReport2.vue b/src/views/CheckReport/components/DetailReport2.vue
index 6977292a..69c1a738 100644
--- a/src/views/CheckReport/components/DetailReport2.vue
+++ b/src/views/CheckReport/components/DetailReport2.vue
@@ -61,6 +61,8 @@
 
 <script>
 var _that
+import { searchstockArrival } from '@/api/StockArrival'
+
 export default {
   props: {
     reportcontrol2: {
@@ -70,6 +72,10 @@ export default {
     reportdata2: {
       type: Array,
       default: null
+    },
+    number: {
+      type: String,
+      default: null
     }
   },
   data() {
@@ -88,7 +94,17 @@ export default {
       // 表格数据条数
       total: 0,
       // 表格识别
-      tableKey: 0
+      tableKey: 0,
+      getemplist: {
+        pageNum: 1,
+        pageSize: 100,
+        judgeStat: 2,
+        receiptStat: 2,
+        repositoryId: this.$store.getters.repositoryId,
+        regionIds: this.$store.getters.regionIds,
+        isActive: 2,
+        number: this.number
+      }
     }
   },
   watch: {
@@ -101,13 +117,25 @@ export default {
       }
     },
     reportdata2() {
-      this.list = this.reportdata2
+
+    },
+    number() {
+      this.getemplist.number = this.number
+      this.getData()
     }
   },
   beforeCreate() {
     _that = this
   },
   methods: {
+    getData() {
+      searchstockArrival(this.getemplist).then(res => {
+        if (res.data.ret === 200) {
+          console.log('res.data', res.data)
+          this.list = res.data.data.content.list[0].stockArrivalDetailVos
+        }
+      })
+    },
     handleCurrentChange(val) {
       console.log(val)
       this.choosedata = val
diff --git a/src/views/CheckReport/components/DetailReport3.vue b/src/views/CheckReport/components/DetailReport3.vue
index 0b5ecdca..fea9b745 100644
--- a/src/views/CheckReport/components/DetailReport3.vue
+++ b/src/views/CheckReport/components/DetailReport3.vue
@@ -51,6 +51,8 @@
 
 <script>
 var _that
+import { producetasklist } from '@/api/ProduceTask'
+
 export default {
   props: {
     reportcontrol3: {
@@ -60,6 +62,10 @@ export default {
     reportdata3: {
       type: Array,
       default: null
+    },
+    number: {
+      type: String,
+      default: null
     }
   },
   data() {
@@ -78,7 +84,16 @@ export default {
       // 表格数据条数
       total: 0,
       // 表格识别
-      tableKey: 0
+      tableKey: 0,
+      getemplist: {
+        pageNum: 1,
+        pageSize: 10,
+        judgeStat: 2, receiptStat: 2,
+        repositoryId: this.$store.getters.repositoryId,
+        regionIds: this.$store.getters.regionIds,
+        isActive: 1,
+        taskNumber: this.number
+      }
     }
   },
   watch: {
@@ -91,13 +106,24 @@ export default {
       }
     },
     reportdata3() {
-      this.list = this.reportdata3
+      // this.list = this.reportdata3
+    },
+    number() {
+      this.getemplist.taskNumber = this.number
+      this.getData()
     }
   },
   beforeCreate() {
     _that = this
   },
   methods: {
+    getData() {
+      producetasklist(this.getemplist).then(res => {
+        if (res.data.ret === 200) {
+          this.list = res.data.data.content.list[0].produceTaskDetailVos
+        }
+      })
+    },
     handleCurrentChange(val) {
       console.log(val)
       this.choosedata = val
diff --git a/src/views/CheckReport/components/DetailReport4.vue b/src/views/CheckReport/components/DetailReport4.vue
index b511930c..f1a0e6e1 100644
--- a/src/views/CheckReport/components/DetailReport4.vue
+++ b/src/views/CheckReport/components/DetailReport4.vue
@@ -46,6 +46,7 @@
 
 <script>
 var _that
+import { searchoutsourcing } from '@/api/OutSourcing'
 export default {
   props: {
     reportcontrol4: {
@@ -55,6 +56,10 @@ export default {
     reportdata4: {
       type: Array,
       default: null
+    },
+    number: {
+      type: String,
+      default: null
     }
   },
   data() {
@@ -73,7 +78,17 @@ export default {
       // 表格数据条数
       total: 0,
       // 表格识别
-      tableKey: 0
+      tableKey: 0,
+      getemplist: {
+        isActive: 3,
+        judgeStat: 2,
+        receiptStat: 2,
+        pageNum: 1,
+        pageSize: 10,
+        repositoryId: this.$store.getters.repositoryId,
+        regionIds: this.$store.getters.regionIds,
+        number: this.number
+      }
     }
   },
   watch: {
@@ -86,13 +101,24 @@ export default {
       }
     },
     reportdata4() {
-      this.list = this.reportdata4
+      // this.list = this.reportdata4
+    },
+    number() {
+      this.getemplist.number = this.number
+      this.getdata()
     }
   },
   beforeCreate() {
     _that = this
   },
   methods: {
+    getdata() {
+      searchoutsourcing(this.getemplist).then(res => {
+        if (res.data.ret === 200) {
+          this.list = res.data.data.content.list[0].outsourcingEnterDetailVos
+        }
+      })
+    },
     handleCurrentChange(val) {
       console.log(val)
       this.choosedata = val
diff --git a/src/views/CheckReport/components/MyArrival.vue b/src/views/CheckReport/components/MyArrival.vue
index ccdd85d6..98613701 100644
--- a/src/views/CheckReport/components/MyArrival.vue
+++ b/src/views/CheckReport/components/MyArrival.vue
@@ -84,7 +84,23 @@
         @current-change="handleCurrentChange">
         <el-table-column :label="$t('public.id')" :resizable="false" align="center" min-width="150">
           <template slot-scope="scope">
-            <span>{{ scope.row.number }}</span>
+            <el-popover
+              placement="right"
+              width="720"
+              trigger="hover">
+              <el-table :data="scope.row.stockArrivalDetailVos" border size="small">
+                <el-table-column :label="$t('Hmodule.wpbh')" min-width="200" property="productCode"/>
+                <el-table-column :label="$t('Hmodule.wpmc')" min-width="200" property="productName"/>
+                <el-table-column :label="$t('updates.dhsl')" min-width="100" property="arrivalQuantity"/>
+                <el-table-column :label="$t('Hmodule.gg')" min-width="100" property="typeName"/>
+                <!-- <el-table-column :label="$t('updates.jhrq')" min-width="200" property="deliveryDate"/> -->
+                <el-table-column :label="$t('updates.ys')" min-width="100" property="color"/>
+                <el-table-column :label="$t('Hmodule.dw')" min-width="100" property="unit"/>
+              </el-table>
+              <div slot="reference" class="name-wrapper">
+                <el-tag size="small">{{ scope.row.number }}</el-tag>
+              </div>
+            </el-popover>
           </template>
         </el-table-column>
         <el-table-column :label="$t('StockArrival.title')" :resizable="false" align="center" min-width="150">
diff --git a/src/views/CheckReport/components/MyQuality.vue b/src/views/CheckReport/components/MyQuality.vue
index bb6dcd7b..3d62f59b 100644
--- a/src/views/CheckReport/components/MyQuality.vue
+++ b/src/views/CheckReport/components/MyQuality.vue
@@ -81,7 +81,22 @@
         @current-change="handleCurrentChange">
         <el-table-column :label="$t('public.id')" :resizable="false" align="center" min-width="150">
           <template slot-scope="scope">
-            <span>{{ scope.row.checkNumber }}</span>
+            <el-popover
+              placement="right"
+              width="720"
+              trigger="hover">
+              <el-table :data="scope.row.qualityCheckDetailVos" border size="small">
+                <el-table-column :label="$t('Hmodule.wpbh')" min-width="200" property="productCode"/>
+                <el-table-column :label="$t('Hmodule.wpmc')" min-width="200" property="productName"/>
+                <el-table-column :label="$t('updates.dhsl')" min-width="100" property="arrivalQuantity"/>
+                <!-- <el-table-column :label="$t('updates.jhrq')" min-width="200" property="deliveryDate"/> -->
+                <el-table-column :label="$t('updates.ys')" min-width="100" property="color"/>
+                <el-table-column :label="$t('Hmodule.dw')" min-width="100" property="unit"/>
+              </el-table>
+              <div slot="reference" class="name-wrapper">
+                <el-tag size="small">{{ scope.row.checkNumber }}</el-tag>
+              </div>
+            </el-popover>
           </template>
         </el-table-column>
         <el-table-column :label="$t('QualityCheck.title')" :resizable="false" align="center" min-width="150">
diff --git a/src/views/CheckReport/components/OutSource.vue b/src/views/CheckReport/components/OutSource.vue
index 92a07e06..a5ff5747 100644
--- a/src/views/CheckReport/components/OutSource.vue
+++ b/src/views/CheckReport/components/OutSource.vue
@@ -65,7 +65,19 @@
         @current-change="handleCurrentChange">
         <el-table-column :label="$t('public.id')" :resizable="false" fixed="left" align="center" min-width="150">
           <template slot-scope="scope">
-            <span>{{ scope.row.number }}</span>
+            <el-popover
+              placement="right"
+              width="720"
+              trigger="hover">
+              <el-table :data="scope.row.outsourcingEnterDetailVos" border size="small">
+                <el-table-column :label="$t('Hmodule.wpbh')" min-width="200" property="productCode"/>
+                <el-table-column :label="$t('Hmodule.wpmc')" min-width="200" property="productName"/>
+                <el-table-column :label="$t('Hmodule.dw')" min-width="100" property="unit"/>
+              </el-table>
+              <div slot="reference" class="name-wrapper">
+                <el-tag size="small">{{ scope.row.number }}</el-tag>
+              </div>
+            </el-popover>
           </template>
         </el-table-column>
         <el-table-column :label="$t('OutSourcing.title')" :resizable="false" fixed="left" align="center" min-width="150">
diff --git a/src/views/CheckReport/components/ProduceTask.vue b/src/views/CheckReport/components/ProduceTask.vue
index 4d851c10..92d90059 100644
--- a/src/views/CheckReport/components/ProduceTask.vue
+++ b/src/views/CheckReport/components/ProduceTask.vue
@@ -87,7 +87,21 @@
         @current-change="handleCurrentChange">
         <el-table-column :label="$t('ProduceTask.taskNumber')" :resizable="false" align="center" min-width="150">
           <template slot-scope="scope">
-            <span>{{ scope.row.taskNumber }}</span>
+            <el-popover
+              placement="right"
+              width="720"
+              trigger="hover">
+              <el-table :data="scope.row.produceTaskDetailVos" border size="small">
+                <el-table-column :label="$t('Hmodule.wpbh')" min-width="200" property="productCode"/>
+                <el-table-column :label="$t('Hmodule.wpmc')" min-width="200" property="productName"/>
+                <el-table-column :label="$t('Hmodule.gg')" min-width="100" property="productType"/>
+                <el-table-column :label="$t('updates.dhsl')" min-width="100" property="actualCheckQuantity"/>
+                <el-table-column :label="$t('Hmodule.dw')" min-width="100" property="unit"/>
+              </el-table>
+              <div slot="reference" class="name-wrapper">
+                <el-tag size="small">{{ scope.row.taskNumber }}</el-tag>
+              </div>
+            </el-popover>
           </template>
         </el-table-column>
         <el-table-column :label="$t('ProduceTask.title')" :resizable="false" align="center" min-width="150">
diff --git a/src/views/Collection/AddRecoverVehicle.vue b/src/views/Collection/AddRecoverVehicle.vue
index 2c207d31..04ef4674 100644
--- a/src/views/Collection/AddRecoverVehicle.vue
+++ b/src/views/Collection/AddRecoverVehicle.vue
@@ -265,7 +265,7 @@ export default {
       pickerOptions2: {
         disabledDate: (time) => {
           const _now = Date.now()
-          const seven = 10 * 24 * 60 * 60 * 1000
+          const seven = 30 * 24 * 60 * 60 * 1000
           const sevenDays = _now - seven
           return time.getTime() > _now || time.getTime() < sevenDays
         }
diff --git a/src/views/Customer/NewCustomer.vue b/src/views/Customer/NewCustomer.vue
index dc5cbb08..54862308 100644
--- a/src/views/Customer/NewCustomer.vue
+++ b/src/views/Customer/NewCustomer.vue
@@ -88,7 +88,7 @@
               </template>
             </el-select>
           </el-form-item> -->
-                <el-form-item :label="$t('Customer.newold')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
+                <el-form-item :label="$t('Customer.newold')" prop="newold" style="margin-left: 18px;width: 100%;margin-bottom: 0">
                   <el-select v-model="customerForm.newold" :value="customerForm.newold" :placeholder="$t('updates.qxz')" style="width: 200px">
                     <el-option :label="$t('update4.bdkh')" value="1"/>
                     <el-option :label="$t('update4.fbdkh')" value="2"/>
@@ -225,6 +225,9 @@ export default {
       },
       // 客户信息规则数据
       customerFormrules: {
+        newold: [
+          { required: true, message: 'please input IS our customers', trigger: 'change' }
+        ],
         phone: [
           { required: true, validator: checkphone, trigger: 'change' }
         ],
diff --git a/src/views/Expenses/AddExpenses.vue b/src/views/Expenses/AddExpenses.vue
index 9c4dfd42..097a3d6a 100644
--- a/src/views/Expenses/AddExpenses.vue
+++ b/src/views/Expenses/AddExpenses.vue
@@ -202,7 +202,7 @@ export default {
       pickerOptions2: {
         disabledDate: (time) => {
           const _now = Date.now()
-          const seven = 10 * 24 * 60 * 60 * 1000
+          const seven = 30 * 24 * 60 * 60 * 1000
           const sevenDays = _now - seven
           return time.getTime() > _now || time.getTime() < sevenDays
         }
diff --git a/src/views/InstallmentApply/AddInstallmentApply.vue b/src/views/InstallmentApply/AddInstallmentApply.vue
index e26557e5..d348f7d2 100644
--- a/src/views/InstallmentApply/AddInstallmentApply.vue
+++ b/src/views/InstallmentApply/AddInstallmentApply.vue
@@ -883,7 +883,7 @@ export default {
       pickerOptions2: {
         disabledDate: (time) => {
           const _now = Date.now()
-          const seven = 10 * 24 * 60 * 60 * 1000
+          const seven = 30 * 24 * 60 * 60 * 1000
           const sevenDays = _now - seven
           return time.getTime() > _now || time.getTime() < sevenDays
         }
diff --git a/src/views/InstallmentApply/InstallmentApplyList.vue b/src/views/InstallmentApply/InstallmentApplyList.vue
index 1fd7e64d..97b8c0c3 100644
--- a/src/views/InstallmentApply/InstallmentApplyList.vue
+++ b/src/views/InstallmentApply/InstallmentApplyList.vue
@@ -8,6 +8,7 @@
 
       <el-input v-model="salePersonId" :placeholder="$t('InstallmentApply.salePersonId')" size="small" class="filter-item" @clear="restFilter" @keyup.enter.native="handleFilter" @focus="handlechooseStock"/>
       <my-emp :control.sync="stockControl" @stockName="stockName"/>
+      <el-input v-model="getemplist.applyNumber" :placeholder="$t('update4.danhao')" size="small" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
 
       <el-popover
         v-model="visible2"
diff --git a/src/views/OutSourceEnter/AddOutSourceEnter.vue b/src/views/OutSourceEnter/AddOutSourceEnter.vue
index fbe5bb18..0736ee63 100644
--- a/src/views/OutSourceEnter/AddOutSourceEnter.vue
+++ b/src/views/OutSourceEnter/AddOutSourceEnter.vue
@@ -159,7 +159,7 @@
       <!--操作123-->
       <div class="buttons" style="position:fixed;bottom: 0;width: 100%;height: 40px; background: #fff;z-index: 99">
 
-        <el-button v-no-more-click v-loading="issure" type="primary" style="background:#3696fd;border-color:#3696fd;width: 98px" @click="handlesave()">{{ $t('Hmodule.baoc') }}</el-button>
+        <el-button :loading="issure" type="primary" style="background:#3696fd;border-color:#3696fd;width: 98px" @click="handlesave()">{{ $t('Hmodule.baoc') }}</el-button>
         <el-button type="danger" @click="handlecancel()">{{ $t('Hmodule.cancel') }}</el-button>
       </div>
       <el-dialog :visible.sync="receiptVisible2" title="库存快照" class="normal" width="600px" center>
@@ -246,7 +246,7 @@ export default {
       pickerOptions2: {
         disabledDate: (time) => {
           const _now = Date.now()
-          const seven = 10 * 24 * 60 * 60 * 1000
+          const seven = 30 * 24 * 60 * 60 * 1000
           const sevenDays = _now - seven
           return time.getTime() > _now || time.getTime() < sevenDays
         }
@@ -603,126 +603,137 @@ export default {
     // 保存操作
     handlesave() {
       this.issure = true
-      const EnterDetail = this.$refs.editable.getRecords()
-      console.log(EnterDetail)
-      for (const i in EnterDetail) {
-        if (EnterDetail[i].actualEnterQuantity === 0) {
+
+      setTimeout(() => {
+        const EnterDetail = this.$refs.editable.getRecords()
+        console.log(EnterDetail)
+        for (const i in EnterDetail) {
+          if (EnterDetail[i].actualEnterQuantity === 0) {
+            this.$notify.error({
+              title: 'wrong',
+              message: '商品数量不能为0',
+              offset: 100
+            })
+            this.issure = false
+            return false
+          }
+        }
+        let i = 1
+        EnterDetail.map(function(elem) {
+          return elem
+        }).forEach(function(elem) {
+          if (elem.locationId === null || elem.locationId === '' || elem.locationId === undefined) {
+            i = 2
+          }
+        })
+        if (i === 2) {
           this.$notify.error({
             title: 'wrong',
-            message: '商品数量不能为0',
+            message: '商品货位不能为空',
             offset: 100
           })
           this.issure = false
           return false
         }
-      }
-      let i = 1
-      EnterDetail.map(function(elem) {
-        return elem
-      }).forEach(function(elem) {
-        if (elem.locationId === null || elem.locationId === '' || elem.locationId === undefined) {
-          i = 2
+        console.log(this.personalForm)
+        console.log(EnterDetail)
+        if (EnterDetail.length === 0) {
+          this.$notify.error({
+            title: 'wrong',
+            message: this.$t('prompt.mxbbnwk'),
+            offset: 100
+          })
+          this.issure = false
+          return false
         }
-      })
-      if (i === 2) {
-        this.$notify.error({
-          title: 'wrong',
-          message: '商品货位不能为空',
-          offset: 100
+        EnterDetail.map(function(elem) {
+          return elem
+        }).forEach(function(elem) {
+          if (elem.locationId === null || elem.locationId === '' || elem.locationId === undefined) {
+            delete elem.locationId
+          }
+          if (elem.productCode === null || elem.productCode === '' || elem.productCode === undefined) {
+            delete elem.productCode
+          }
+          if (elem.productName === null || elem.productName === '' || elem.productName === undefined) {
+            delete elem.productName
+          }
+          if (elem.color === null || elem.color === '' || elem.color === undefined) {
+            delete elem.color
+          }
+          if (elem.typeId === null || elem.typeId === '' || elem.typeId === undefined) {
+            delete elem.typeId
+          }
+          if (elem.unit === null || elem.unit === '' || elem.unit === undefined) {
+            delete elem.unit
+          }
+          if (elem.actualEnterQuantity === null || elem.actualEnterQuantity === '' || elem.actualEnterQuantity === undefined) {
+            delete elem.actualEnterQuantity
+          }
+          if (elem.enterQuantity === null || elem.enterQuantity === '' || elem.enterQuantity === undefined) {
+            delete elem.enterQuantity
+          }
+          if (elem.enterPrice === null || elem.enterPrice === '' || elem.enterPrice === undefined) {
+            delete elem.enterPrice
+          }
+          if (elem.enterMoney === null || elem.enterMoney === '' || elem.enterMoney === undefined) {
+            delete elem.enterMoney
+          }
+          if (elem.remarks === null || elem.remarks === '' || elem.remarks === undefined) {
+            delete elem.remarks
+          }
+          return elem
         })
-        this.issure = false
-        return false
-      }
-      console.log(this.personalForm)
-      console.log(EnterDetail)
-      if (EnterDetail.length === 0) {
-        this.$notify.error({
-          title: 'wrong',
-          message: this.$t('prompt.mxbbnwk'),
-          offset: 100
-        })
-        this.issure = false
-        return false
-      }
-      EnterDetail.map(function(elem) {
-        return elem
-      }).forEach(function(elem) {
-        if (elem.locationId === null || elem.locationId === '' || elem.locationId === undefined) {
-          delete elem.locationId
-        }
-        if (elem.productCode === null || elem.productCode === '' || elem.productCode === undefined) {
-          delete elem.productCode
-        }
-        if (elem.productName === null || elem.productName === '' || elem.productName === undefined) {
-          delete elem.productName
-        }
-        if (elem.color === null || elem.color === '' || elem.color === undefined) {
-          delete elem.color
-        }
-        if (elem.typeId === null || elem.typeId === '' || elem.typeId === undefined) {
-          delete elem.typeId
-        }
-        if (elem.unit === null || elem.unit === '' || elem.unit === undefined) {
-          delete elem.unit
-        }
-        if (elem.actualEnterQuantity === null || elem.actualEnterQuantity === '' || elem.actualEnterQuantity === undefined) {
-          delete elem.actualEnterQuantity
-        }
-        if (elem.enterQuantity === null || elem.enterQuantity === '' || elem.enterQuantity === undefined) {
-          delete elem.enterQuantity
-        }
-        if (elem.enterPrice === null || elem.enterPrice === '' || elem.enterPrice === undefined) {
-          delete elem.enterPrice
-        }
-        if (elem.enterMoney === null || elem.enterMoney === '' || elem.enterMoney === undefined) {
-          delete elem.enterMoney
-        }
-        if (elem.remarks === null || elem.remarks === '' || elem.remarks === undefined) {
-          delete elem.remarks
-        }
-        return elem
-      })
-      const parms = JSON.stringify(EnterDetail)
-      this.$refs.personalForm.validate((valid) => {
-        if (valid) {
-          this.$refs.editable.validate().then(valid => {
-            if (valid) {
-              console.log('newOrOld', this.personalForm.newOrOld)
-              const Data = this.personalForm
-              for (const key in Data) {
-                if (Data[key] === '' || Data[key] === undefined || Data[key] === null) {
-                  delete Data[key]
-                }
+        const parms = JSON.stringify(EnterDetail)
+        this.$refs.personalForm.validate((valid) => {
+          if (valid) {
+            this.$refs.editable.validate().then(valid => {
+              if (valid) {
+                console.log('newOrOld', this.personalForm.newOrOld)
+                const Data = this.personalForm
+                for (const key in Data) {
+                  if (Data[key] === '' || Data[key] === undefined || Data[key] === null) {
+                    delete Data[key]
+                  }
                 // if (key === 'judgeStat') {
                 //   delete Data[key]
                 // }
-              }
-              const parmss = JSON.stringify(Data)
-              addOutsourceEnter(parmss, parms, this.personalForm).then(res => {
-                console.log(res)
-                if (res.data.ret === 200) {
-                  this.$notify({
-                    title: 'successful',
-                    message: 'save successful',
-                    type: 'success',
-                    offset: 100
-                  })
-                  this.issure = false
-                  this.restAllForm()
-                  this.$refs.editable.clear()
-                  this.$refs.personalForm.clearValidate()
-                  this.$refs.personalForm.resetFields()
-                } else {
-                  this.$notify.error({
-                    title: 'wrong',
-                    message: res.data.msg,
-                    offset: 100
-                  })
-                  this.issure = false
                 }
+                const parmss = JSON.stringify(Data)
+                addOutsourceEnter(parmss, parms, this.personalForm).then(res => {
+                  console.log(res)
+                  if (res.data.ret === 200) {
+                    this.$notify({
+                      title: 'successful',
+                      message: 'save successful',
+                      type: 'success',
+                      offset: 100
+                    })
+                    this.issure = false
+                    this.restAllForm()
+                    this.$refs.editable.clear()
+                    this.$refs.personalForm.clearValidate()
+                    this.$refs.personalForm.resetFields()
+                  } else {
+                    this.$notify.error({
+                      title: 'wrong',
+                      message: res.data.msg,
+                      offset: 100
+                    })
+                    this.issure = false
+                  }
+                })
+              }
+            }).catch(valid => {
+              this.$notify.error({
+                title: 'wrong',
+                message: 'Information is incomplete',
+                offset: 100
               })
-            }
-          }).catch(valid => {
+              this.issure = false
+              return false
+            })
+          } else {
             this.$notify.error({
               title: 'wrong',
               message: 'Information is incomplete',
@@ -730,17 +741,9 @@ export default {
             })
             this.issure = false
             return false
-          })
-        } else {
-          this.$notify.error({
-            title: 'wrong',
-            message: 'Information is incomplete',
-            offset: 100
-          })
-          this.issure = false
-          return false
-        }
-      })
+          }
+        })
+      }, 1000 * 0.5)
     },
     // 取消操作
     handlecancel() {
diff --git a/src/views/OutSourceEnter/components/MyDialog.vue b/src/views/OutSourceEnter/components/MyDialog.vue
index 14cce5f0..d1985978 100644
--- a/src/views/OutSourceEnter/components/MyDialog.vue
+++ b/src/views/OutSourceEnter/components/MyDialog.vue
@@ -194,7 +194,7 @@ export default {
       pickerOptions2: {
         disabledDate: (time) => {
           const _now = Date.now()
-          const seven = 10 * 24 * 60 * 60 * 1000
+          const seven = 30 * 24 * 60 * 60 * 1000
           const sevenDays = _now - seven
           return time.getTime() > _now || time.getTime() < sevenDays
         }
diff --git a/src/views/OutSourceOut/AddOutSourceOut.vue b/src/views/OutSourceOut/AddOutSourceOut.vue
index 3053985a..14af265b 100644
--- a/src/views/OutSourceOut/AddOutSourceOut.vue
+++ b/src/views/OutSourceOut/AddOutSourceOut.vue
@@ -188,7 +188,7 @@
       <!--操作-->
       <div class="buttons" style="position:fixed;bottom: 0;width: 100%;height: 40px; background: #fff;z-index: 99">
 
-        <el-button v-no-more-click type="primary" style="background:#3696fd;border-color:#3696fd;width: 98px" @click="handlesave()">{{ $t('Hmodule.baoc') }}</el-button>
+        <el-button :loading="saveloading" type="primary" style="background:#3696fd;border-color:#3696fd;width: 98px" @click="handlesave()">{{ $t('Hmodule.baoc') }}</el-button>
         <el-button type="danger" @click="handlecancel()">{{ $t('Hmodule.cancel') }}</el-button>
       </div>
       <el-dialog :visible.sync="receiptVisible2" title="库存快照" class="normal" width="600px" center>
@@ -249,10 +249,11 @@ export default {
       }
     }
     return {
+      saveloading: false,
       pickerOptions2: {
         disabledDate: (time) => {
           const _now = Date.now()
-          const seven = 10 * 24 * 60 * 60 * 1000
+          const seven = 30 * 24 * 60 * 60 * 1000
           const sevenDays = _now - seven
           return time.getTime() > _now || time.getTime() < sevenDays
         }
@@ -680,157 +681,165 @@ export default {
     },
     // 保存操作
     handlesave() {
-      const EnterDetail = this.deepClone(this.$refs.editable.getRecords())
-      // 保存时同样商品不能有同一个批次
-      // let i = 0
-      // EnterDetail.map(function(elem) {
-      //   return elem
-      // }).forEach(function(elem) {
-      //   EnterDetail.map(function(elem2) {
-      //     return elem2
-      //   }).forEach(function(elem2) {
-      //     if (elem2.productCode === elem.productCode && elem2.batch === elem.batch) {
-      //       i++
-      //     }
-      //   })
-      // })
-      // console.log(i)
-      // if (i > EnterDetail.length) {
-      //   this.$notify.error({
-      //     title: 'wrong',
-      //     message: '同样商品不能有同一个批次',
-      //     offset: 100
-      //   })
-      //   return false
-      // }
-      // 批次货位不能为空
-      let j = 1
-      EnterDetail.map(function(elem) {
-        return elem
-      }).forEach(function(elem) {
-        if (elem.batch === null || elem.batch === undefined || elem.batch === '' || elem.location === null || elem.location === undefined || elem.location === '') {
-          j = 2
-        }
-      })
-      console.log(j)
-      if (j === 2) {
-        this.$notify.error({
-          title: 'wrong',
-          message: this.$t('prompt.pchwbnwk'),
-          offset: 100
+      this.saveloading = true
+      setTimeout(() => {
+        const EnterDetail = this.deepClone(this.$refs.editable.getRecords())
+        // 保存时同样商品不能有同一个批次
+        // let i = 0
+        // EnterDetail.map(function(elem) {
+        //   return elem
+        // }).forEach(function(elem) {
+        //   EnterDetail.map(function(elem2) {
+        //     return elem2
+        //   }).forEach(function(elem2) {
+        //     if (elem2.productCode === elem.productCode && elem2.batch === elem.batch) {
+        //       i++
+        //     }
+        //   })
+        // })
+        // console.log(i)
+        // if (i > EnterDetail.length) {
+        //   this.$notify.error({
+        //     title: 'wrong',
+        //     message: '同样商品不能有同一个批次',
+        //     offset: 100
+        //   })
+        //   return false
+        // }
+        // 批次货位不能为空
+        let j = 1
+        EnterDetail.map(function(elem) {
+          return elem
+        }).forEach(function(elem) {
+          if (elem.batch === null || elem.batch === undefined || elem.batch === '' || elem.location === null || elem.location === undefined || elem.location === '') {
+            j = 2
+          }
         })
-        return false
-      }
-      console.log(this.personalForm)
-      console.log(EnterDetail)
-      if (EnterDetail.length === 0) {
-        this.$notify.error({
-          title: 'wrong',
-          message: this.$t('prompt.mxbbnwk'),
-          offset: 100
+        console.log(j)
+        if (j === 2) {
+          this.$notify.error({
+            title: 'wrong',
+            message: this.$t('prompt.pchwbnwk'),
+            offset: 100
+          })
+          this.saveloading = false
+          return false
+        }
+        console.log(this.personalForm)
+        console.log(EnterDetail)
+        if (EnterDetail.length === 0) {
+          this.$notify.error({
+            title: 'wrong',
+            message: this.$t('prompt.mxbbnwk'),
+            offset: 100
+          })
+          this.saveloading = false
+          return false
+        }
+        EnterDetail.map(function(elem) {
+          return elem
+        }).forEach(function(elem) {
+          elem.totalMoney = elem.outQuantity * elem.outPrice
+          if (elem.locationId === null || elem.locationId === '' || elem.locationId === undefined) {
+            delete elem.locationId
+          }
+          if (elem.productCode === null || elem.productCode === '' || elem.productCode === undefined) {
+            delete elem.productCode
+          }
+          if (elem.batch === null || elem.batch === '' || elem.batch === undefined || elem.batch === '不使用') {
+            delete elem.batch
+          }
+          if (elem.productName === null || elem.productName === '' || elem.productName === undefined) {
+            delete elem.productName
+          }
+          if (elem.color === null || elem.color === '' || elem.color === undefined) {
+            delete elem.color
+          }
+          if (elem.typeId === null || elem.typeId === '' || elem.typeId === undefined) {
+            delete elem.typeId
+          }
+          if (elem.unit === null || elem.unit === '' || elem.unit === undefined) {
+            delete elem.unit
+          }
+          if (elem.outQuantity === null || elem.outQuantity === '' || elem.outQuantity === undefined) {
+            delete elem.outQuantity
+          }
+          if (elem.enterQuantity === null || elem.enterQuantity === '' || elem.enterQuantity === undefined) {
+            delete elem.enterQuantity
+          }
+          if (elem.outPrice === null || elem.outPrice === '' || elem.outPrice === undefined) {
+            delete elem.outPrice
+          }
+          if (elem.totalMoney === null || elem.totalMoney === '' || elem.totalMoney === undefined) {
+            delete elem.totalMoney
+          }
+          if (elem.remarks === null || elem.remarks === '' || elem.remarks === undefined) {
+            delete elem.remarks
+          }
+          return elem
         })
-        return false
-      }
-      EnterDetail.map(function(elem) {
-        return elem
-      }).forEach(function(elem) {
-        elem.totalMoney = elem.outQuantity * elem.outPrice
-        if (elem.locationId === null || elem.locationId === '' || elem.locationId === undefined) {
-          delete elem.locationId
-        }
-        if (elem.productCode === null || elem.productCode === '' || elem.productCode === undefined) {
-          delete elem.productCode
-        }
-        if (elem.batch === null || elem.batch === '' || elem.batch === undefined || elem.batch === '不使用') {
-          delete elem.batch
-        }
-        if (elem.productName === null || elem.productName === '' || elem.productName === undefined) {
-          delete elem.productName
-        }
-        if (elem.color === null || elem.color === '' || elem.color === undefined) {
-          delete elem.color
-        }
-        if (elem.typeId === null || elem.typeId === '' || elem.typeId === undefined) {
-          delete elem.typeId
-        }
-        if (elem.unit === null || elem.unit === '' || elem.unit === undefined) {
-          delete elem.unit
-        }
-        if (elem.outQuantity === null || elem.outQuantity === '' || elem.outQuantity === undefined) {
-          delete elem.outQuantity
-        }
-        if (elem.enterQuantity === null || elem.enterQuantity === '' || elem.enterQuantity === undefined) {
-          delete elem.enterQuantity
-        }
-        if (elem.outPrice === null || elem.outPrice === '' || elem.outPrice === undefined) {
-          delete elem.outPrice
-        }
-        if (elem.totalMoney === null || elem.totalMoney === '' || elem.totalMoney === undefined) {
-          delete elem.totalMoney
-        }
-        if (elem.remarks === null || elem.remarks === '' || elem.remarks === undefined) {
-          delete elem.remarks
-        }
-        return elem
-      })
-      console.log('123', 123)
-      const parms = JSON.stringify(EnterDetail)
-      this.$refs.personalForm.validate((valid) => {
-        if (valid) {
-          console.log('223', 223)
-          this.$refs.editable.validate().then(valid => {
-            if (valid) {
-              console.log('223', 323)
-              console.log(this.personalForm, parms)
-              const Data = this.personalForm
-              for (const key in Data) {
-                if (Data[key] === '' || Data[key] === undefined || Data[key] === null) {
-                  delete Data[key]
-                }
+        console.log('123', 123)
+        const parms = JSON.stringify(EnterDetail)
+        this.$refs.personalForm.validate((valid) => {
+          if (valid) {
+            console.log('223', 223)
+            this.$refs.editable.validate().then(valid => {
+              if (valid) {
+                console.log('223', 323)
+                console.log(this.personalForm, parms)
+                const Data = this.personalForm
+                for (const key in Data) {
+                  if (Data[key] === '' || Data[key] === undefined || Data[key] === null) {
+                    delete Data[key]
+                  }
                 // if (key === 'judgeStat') {
                 //   delete Data[key]
                 // }
-              }
-              const parmss = JSON.stringify(Data)
-              addOutsourceOut(parmss, parms, this.personalForm).then(res => {
-                console.log(res)
-                if (res.data.ret === 200) {
-                  this.$notify({
-                    title: 'successful',
-                    message: 'save successful',
-                    type: 'success',
-                    offset: 100
-                  })
-                  this.restAllForm()
-                  this.$refs.editable.clear()
-                  this.$refs.personalForm.clearValidate()
-                  this.$refs.personalForm.resetFields()
-                } else {
-                  this.$notify.error({
-                    title: 'wrong',
-                    message: res.data.msg,
-                    offset: 100
-                  })
                 }
+                const parmss = JSON.stringify(Data)
+                addOutsourceOut(parmss, parms, this.personalForm).then(res => {
+                  console.log(res)
+                  if (res.data.ret === 200) {
+                    this.$notify({
+                      title: 'successful',
+                      message: 'save successful',
+                      type: 'success',
+                      offset: 100
+                    })
+                    this.restAllForm()
+                    this.$refs.editable.clear()
+                    this.$refs.personalForm.clearValidate()
+                    this.$refs.personalForm.resetFields()
+                  } else {
+                    this.$notify.error({
+                      title: 'wrong',
+                      message: res.data.msg,
+                      offset: 100
+                    })
+                  }
+                  this.saveloading = false
+                })
+              }
+            }).catch(valid => {
+              this.$notify.error({
+                title: 'wrong',
+                message: 'Information is incomplete1',
+                offset: 100
               })
-            }
-          }).catch(valid => {
+              this.saveloading = false
+              return false
+            })
+          } else {
             this.$notify.error({
               title: 'wrong',
-              message: 'Information is incomplete1',
+              message: 'Information is incomplete2',
               offset: 100
             })
+            this.saveloading = false
             return false
-          })
-        } else {
-          this.$notify.error({
-            title: 'wrong',
-            message: 'Information is incomplete2',
-            offset: 100
-          })
-          return false
-        }
-      })
+          }
+        })
+      }, 1000 * 0.5)
     },
     // 取消操作
     handlecancel() {
diff --git a/src/views/OutSourceOut/components/MyEdit.vue b/src/views/OutSourceOut/components/MyEdit.vue
index 4eac780b..0dab864d 100644
--- a/src/views/OutSourceOut/components/MyEdit.vue
+++ b/src/views/OutSourceOut/components/MyEdit.vue
@@ -221,7 +221,7 @@ export default {
       pickerOptions2: {
         disabledDate: (time) => {
           const _now = Date.now()
-          const seven = 10 * 24 * 60 * 60 * 1000
+          const seven = 30 * 24 * 60 * 60 * 1000
           const sevenDays = _now - seven
           return time.getTime() > _now || time.getTime() < sevenDays
         }
diff --git a/src/views/OutSourcing/AddOutSourcing.vue b/src/views/OutSourcing/AddOutSourcing.vue
index d0271889..744cfd75 100644
--- a/src/views/OutSourcing/AddOutSourcing.vue
+++ b/src/views/OutSourcing/AddOutSourcing.vue
@@ -183,7 +183,7 @@
       </el-card>
       <!--操作-->
       <div class="buttons" style="position:fixed;bottom: 0;width: 100%;height: 40px; background: #fff;z-index: 99">
-        <el-button v-no-more-click type="primary" style="background:#3696fd;border-color:#3696fd;width: 98px" @click="handlesave()">{{ $t('Hmodule.baoc') }}</el-button>
+        <el-button :loading="saveloading" type="primary" style="background:#3696fd;border-color:#3696fd;width: 98px" @click="handlesave()">{{ $t('Hmodule.baoc') }}</el-button>
         <el-button type="danger" @click="handlecancel()">{{ $t('Hmodule.cancel') }}</el-button>
       </div>
     </div>
@@ -211,6 +211,7 @@ export default {
       }
     }
     return {
+      saveloading: false,
       list3: [],
       // 合计
       heji: 0,
@@ -472,102 +473,110 @@ export default {
     },
     // 保存操作
     handlesave() {
-      // 加工后明细
-      const EnterDetail = this.$refs.editable.getRecords()
-      // 原材料明细
-      const EnterDetail2 = this.$refs.editable2.getRecords()
-      if (EnterDetail2.length === 0) {
-        this.$notify.error({
-          title: 'wrong',
-          message: this.$t('prompt.nonedetail'),
-          offset: 100
-        })
-        return false
-      }
-      if (EnterDetail.length === 0) {
-        this.$notify.error({
-          title: 'wrong',
-          message: this.$t('prompt.mxbbnwk'),
-          offset: 100
-        })
-        return false
-      }
-      EnterDetail.map(function(elem) {
-        return elem
-      }).forEach(function(elem) {
-        elem.reportCheckingQuantity = 0
-        elem.actualCheckingQuantity = 0
-        elem.qualifyQuantity = 0
-        elem.unqualifyQuantity = 0
-        if (elem.productCode === null || elem.productCode === '' || elem.productCode === undefined) {
-          delete elem.productCode
-        }
-        if (elem.productName === null || elem.productName === '' || elem.productName === undefined) {
-          delete elem.productName
-        }
-        if (elem.type === null || elem.type === '' || elem.type === undefined) {
-          delete elem.type
-        }
-        if (elem.unit === null || elem.unit === '' || elem.unit === undefined) {
-          delete elem.unit
-        }
-        if (elem.quantity === null || elem.quantity === '' || elem.quantity === undefined) {
-          delete elem.quantity
-        }
-        if (elem.money === null || elem.money === '' || elem.money === undefined) {
-          delete elem.money
-        }
-        if (elem.totalMoney === null || elem.totalMoney === '' || elem.totalMoney === undefined) {
-          delete elem.totalMoney
-        }
-        return elem
-      })
-      // 加工后明细
-      const parms2 = JSON.stringify(EnterDetail)
-      // 原材料明细
-      const parms3 = JSON.stringify(EnterDetail2)
-      const Data = this.personalForm
-      for (const key in Data) {
-        if (Data[key] === '' || Data[key] === undefined || Data[key] === null) {
-          delete Data[key]
-        }
-      }
-      const parms = JSON.stringify(Data)
-      this.$refs.personalForm.validate((valid) => {
-        if (valid) {
-          createoutFactory(parms, parms3, parms2, this.personalForm).then(res => {
-            console.log(res)
-            if (res.data.ret === 200) {
-              this.$notify({
-                title: 'successful',
-                message: 'save successful',
-                type: 'success',
-                offset: 100
-              })
-              this.restAllForm()
-              this.$refs.editable.clear()
-              this.$refs.editable2.clear()
-              this.$refs.personalForm.clearValidate()
-              this.$refs.personalForm.resetFields()
-              this.$refs.personalForm2.clearValidate()
-              this.$refs.personalForm2.resetFields()
-            } else {
-              this.$notify.error({
-                title: 'wrong',
-                message: res.data.msg,
-                offset: 100
-              })
-            }
-          })
-        } else {
+      this.saveloading = true
+
+      setTimeout(() => {
+        // 加工后明细
+        const EnterDetail = this.$refs.editable.getRecords()
+        // 原材料明细
+        const EnterDetail2 = this.$refs.editable2.getRecords()
+        if (EnterDetail2.length === 0) {
           this.$notify.error({
             title: 'wrong',
-            message: 'Information is incomplete',
+            message: this.$t('prompt.nonedetail'),
             offset: 100
           })
+          this.saveloading = false
           return false
         }
-      })
+        if (EnterDetail.length === 0) {
+          this.$notify.error({
+            title: 'wrong',
+            message: this.$t('prompt.mxbbnwk'),
+            offset: 100
+          })
+          this.saveloading = false
+          return false
+        }
+        EnterDetail.map(function(elem) {
+          return elem
+        }).forEach(function(elem) {
+          elem.reportCheckingQuantity = 0
+          elem.actualCheckingQuantity = 0
+          elem.qualifyQuantity = 0
+          elem.unqualifyQuantity = 0
+          if (elem.productCode === null || elem.productCode === '' || elem.productCode === undefined) {
+            delete elem.productCode
+          }
+          if (elem.productName === null || elem.productName === '' || elem.productName === undefined) {
+            delete elem.productName
+          }
+          if (elem.type === null || elem.type === '' || elem.type === undefined) {
+            delete elem.type
+          }
+          if (elem.unit === null || elem.unit === '' || elem.unit === undefined) {
+            delete elem.unit
+          }
+          if (elem.quantity === null || elem.quantity === '' || elem.quantity === undefined) {
+            delete elem.quantity
+          }
+          if (elem.money === null || elem.money === '' || elem.money === undefined) {
+            delete elem.money
+          }
+          if (elem.totalMoney === null || elem.totalMoney === '' || elem.totalMoney === undefined) {
+            delete elem.totalMoney
+          }
+          return elem
+        })
+        // 加工后明细
+        const parms2 = JSON.stringify(EnterDetail)
+        // 原材料明细
+        const parms3 = JSON.stringify(EnterDetail2)
+        const Data = this.personalForm
+        for (const key in Data) {
+          if (Data[key] === '' || Data[key] === undefined || Data[key] === null) {
+            delete Data[key]
+          }
+        }
+        const parms = JSON.stringify(Data)
+        this.$refs.personalForm.validate((valid) => {
+          if (valid) {
+            createoutFactory(parms, parms3, parms2, this.personalForm).then(res => {
+              console.log(res)
+              if (res.data.ret === 200) {
+                this.$notify({
+                  title: 'successful',
+                  message: 'save successful',
+                  type: 'success',
+                  offset: 100
+                })
+                this.restAllForm()
+                this.$refs.editable.clear()
+                this.$refs.editable2.clear()
+                this.$refs.personalForm.clearValidate()
+                this.$refs.personalForm.resetFields()
+                this.$refs.personalForm2.clearValidate()
+                this.$refs.personalForm2.resetFields()
+              } else {
+                this.$notify.error({
+                  title: 'wrong',
+                  message: res.data.msg,
+                  offset: 100
+                })
+              }
+              this.saveloading = false
+            })
+          } else {
+            this.$notify.error({
+              title: 'wrong',
+              message: 'Information is incomplete',
+              offset: 100
+            })
+            this.saveloading = false
+            return false
+          }
+        })
+      }, 1000 * 0.5)
     },
     // 取消操作
     handlecancel() {
diff --git a/src/views/PrepReceipt/AddPrepReceipt.vue b/src/views/PrepReceipt/AddPrepReceipt.vue
index 754f1cca..f819fddc 100644
--- a/src/views/PrepReceipt/AddPrepReceipt.vue
+++ b/src/views/PrepReceipt/AddPrepReceipt.vue
@@ -155,7 +155,7 @@ export default {
       pickerOptions2: {
         disabledDate: (time) => {
           const _now = Date.now()
-          const seven = 10 * 24 * 60 * 60 * 1000
+          const seven = 30 * 24 * 60 * 60 * 1000
           const sevenDays = _now - seven
           return time.getTime() > _now || time.getTime() < sevenDays
         }
diff --git a/src/views/Product/NewProduct.vue b/src/views/Product/NewProduct.vue
index ccfcbf32..711e9e95 100644
--- a/src/views/Product/NewProduct.vue
+++ b/src/views/Product/NewProduct.vue
@@ -89,8 +89,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item :label="$t('Product.color')" :rules="Iscategoryid === '08' || Iscategoryid === '04' || Iscategoryid === '03' || Iscategoryid === '' ? personalrules.colorId:[{ required: true, message: '请选择颜色', trigger: 'change' }]" prop="colorId" style="margin-left: 18px;width: 100%;margin-bottom: 0">
-                  <el-select ref="clear4" v-model="colorId" :disabled="Iscategoryid === '08' || Iscategoryid === '04' || Iscategoryid === '03' || Iscategoryid === ''" value-key="id" placeholder="请选择颜色" style="width: 200px" @change="color($event)" @focus="updatecate">
+                <el-form-item :label="$t('Product.color')" :rules=" Iscategoryid === '04' || Iscategoryid === '03' || Iscategoryid === '' ? personalrules.colorId:[{ required: true, message: '请选择颜色', trigger: 'change' }]" prop="colorId" style="margin-left: 18px;width: 100%;margin-bottom: 0">
+                  <el-select ref="clear4" v-model="colorId" :disabled=" Iscategoryid === '04' || Iscategoryid === '03' || Iscategoryid === ''" value-key="id" placeholder="请选择颜色" style="width: 200px" @change="color($event)" @focus="updatecate">
                     <el-option v-show="false" label="" value=""/>
                     <el-option
                       v-for="(item, index) in colors"
@@ -105,8 +105,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item :label="$t('Product.diameterId')" :rules="Iscategoryid === '04' || Iscategoryid === '01' || Iscategoryid === '02' || Iscategoryid === '' || Iscategoryid === '05' || Iscategoryid === '06' || Iscategoryid === '07'? personalrules.diameterId:[{ required: true, message: '请选择直径规格', trigger: 'change' }]" prop="diameterId" style="margin-left: 18px;width: 100%;margin-bottom: 0">
-                  <el-select ref="clear5" v-model="diameterId" :disabled=" Iscategoryid === '04' || Iscategoryid === '01' || Iscategoryid === '02' || Iscategoryid === '' || Iscategoryid === '05' || Iscategoryid === '06' || Iscategoryid === '07'" value-key="id" placeholder="请选择直径规格" style="width: 200px" @change="diameter($event)" @focus="updatecate">
+                <el-form-item :label="$t('Product.diameterId')" :rules="Iscategoryid === '08' || Iscategoryid === '04' || Iscategoryid === '01' || Iscategoryid === '02' || Iscategoryid === '' || Iscategoryid === '05' || Iscategoryid === '06' || Iscategoryid === '07'? personalrules.diameterId:[{ required: true, message: '请选择直径规格', trigger: 'change' }]" prop="diameterId" style="margin-left: 18px;width: 100%;margin-bottom: 0">
+                  <el-select ref="clear5" v-model="diameterId" :disabled="Iscategoryid === '08' || Iscategoryid === '04' || Iscategoryid === '01' || Iscategoryid === '02' || Iscategoryid === '' || Iscategoryid === '05' || Iscategoryid === '06' || Iscategoryid === '07'" value-key="id" placeholder="请选择直径规格" style="width: 200px" @change="diameter($event)" @focus="updatecate">
                     <el-option v-show="false" label="" value=""/>
                     <el-option
                       v-for="(item, index) in diameters"
diff --git a/src/views/Receipt/AddReceipt.vue b/src/views/Receipt/AddReceipt.vue
index ab9cf57d..7135d11b 100644
--- a/src/views/Receipt/AddReceipt.vue
+++ b/src/views/Receipt/AddReceipt.vue
@@ -268,7 +268,7 @@ export default {
       pickerOptions2: {
         disabledDate: (time) => {
           const _now = Date.now()
-          const seven = 10 * 24 * 60 * 60 * 1000
+          const seven = 30 * 24 * 60 * 60 * 1000
           const sevenDays = _now - seven
           return time.getTime() > _now || time.getTime() < sevenDays
         }
diff --git a/src/views/Recycling/AddRecycling.vue b/src/views/Recycling/AddRecycling.vue
index e6e4e677..3b7f1968 100644
--- a/src/views/Recycling/AddRecycling.vue
+++ b/src/views/Recycling/AddRecycling.vue
@@ -272,7 +272,7 @@ export default {
       pickerOptions2: {
         disabledDate: (time) => {
           const _now = Date.now()
-          const seven = 10 * 24 * 60 * 60 * 1000
+          const seven = 30 * 24 * 60 * 60 * 1000
           const sevenDays = _now - seven
           return time.getTime() > _now || time.getTime() < sevenDays
         }
diff --git a/src/views/ReturnExchange/AddReturnExchange.vue b/src/views/ReturnExchange/AddReturnExchange.vue
index 0f47abbe..736511d7 100644
--- a/src/views/ReturnExchange/AddReturnExchange.vue
+++ b/src/views/ReturnExchange/AddReturnExchange.vue
@@ -56,6 +56,16 @@
                   <el-input v-model="personalForm.diffMoney" disabled style="width: 200px" clearable/>
                 </el-form-item>
               </el-col>
+              <el-col :span="6">
+                <el-form-item :label="$t('update4.actialdiffermoney')" prop="shouldMoney" style="margin-left: 18px;width: 100%;margin-bottom: 0">
+                  <el-input-number v-model="personalForm.shouldMoney" :controls="false" :step="0.1" style="width: 200px"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item :label="$t('SaleOut.invoiceNumber')" prop="invoiceNumber" style="margin-left: 18px;width: 100%;margin-bottom: 0">
+                  <el-input v-model="personalForm.invoiceNumber" style="width: 200px" @blur="judgeinvoce"/>
+                </el-form-item>
+              </el-col>
               <el-col :span="6">
                 <el-form-item :label="$t('ReturnExchange.applyNumber')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
                   <el-input v-model="personalForm.applyNumber" style="width: 200px" disabled clearable/>
@@ -262,6 +272,8 @@
 </template>
 
 <script>
+import { createsaleOut, getCustomerOutCount, checkInvoiceExist } from '@/api/SaleOut'
+
 import '@/directive/noMoreClick/index.js'
 import { addReturnExchange } from '@/api/ReturnExchange'
 import { getdeptlist } from '@/api/EmployeeInformation'
@@ -319,7 +331,7 @@ export default {
       pickerOptions2: {
         disabledDate: (time) => {
           const _now = Date.now()
-          const seven = 10 * 24 * 60 * 60 * 1000
+          const seven = 30 * 24 * 60 * 60 * 1000
           const sevenDays = _now - seven
           return time.getTime() > _now || time.getTime() < sevenDays
         }
@@ -368,6 +380,9 @@ export default {
       },
       // 配送单规则数据
       personalrules: {
+        shouldMoney: [
+          { required: true, message: 'please input actialdiffermoney：', trigger: 'blur' }
+        ],
         title: [
           { required: true, message: 'please input title', trigger: 'blur' }
         ],
@@ -457,6 +472,25 @@ export default {
     _that = this
   },
   methods: {
+    judgeinvoce() {
+      console.log('this.$store.getters.countryId', this.$store.getters.countryId)
+      console.log('this.personalForm.invoiceNumber', this.personalForm.invoiceNumber)
+      if (!this.personalForm.invoiceNumber) {
+        return
+      }
+      checkInvoiceExist(this.personalForm.invoiceNumber, this.personalForm.repositoryId).then(res => {
+        if (res.data.ret === 200) {
+          if (res.data.data.content === true) {
+            this.$notify.error({
+              title: 'wrong',
+              message: this.$t('update4.fphcf'),
+              offset: 100
+            })
+            this.personalForm.invoiceNumber = null
+          }
+        }
+      })
+    },
     // 判断整车或者电池
     isEdit4(row) {
       console.log('222', row)
diff --git a/src/views/SaleOrder/AddSaleOrder.vue b/src/views/SaleOrder/AddSaleOrder.vue
index 5943ae06..705ebb12 100644
--- a/src/views/SaleOrder/AddSaleOrder.vue
+++ b/src/views/SaleOrder/AddSaleOrder.vue
@@ -576,7 +576,7 @@ export default {
       pickerOptions3: {
         disabledDate: (time) => {
           const _now = Date.now()
-          const seven = 10 * 24 * 60 * 60 * 1000
+          const seven = 30 * 24 * 60 * 60 * 1000
           const sevenDays = _now - seven
           return time.getTime() > _now || time.getTime() < sevenDays
         }
diff --git a/src/views/SaleOut/AddSaleOut.vue b/src/views/SaleOut/AddSaleOut.vue
index f62caf3b..11f70ccd 100644
--- a/src/views/SaleOut/AddSaleOut.vue
+++ b/src/views/SaleOut/AddSaleOut.vue
@@ -734,7 +734,7 @@ export default {
       pickerOptions2: {
         disabledDate: (time) => {
           const _now = Date.now()
-          const seven = 10 * 24 * 60 * 60 * 1000
+          const seven = 30 * 24 * 60 * 60 * 1000
           const sevenDays = _now - seven
           return time.getTime() > _now || time.getTime() < sevenDays
         }
@@ -2133,7 +2133,7 @@ export default {
                 })
               }
               if (row.taxprice !== 0 && row.quantity !== 0 && row.discountMoney !== 0 && row.includeTaxCostMoney !== 0) {
-                row.discountRate = (((isoverdiscount / row.includeTaxCostMoney)) * 100).toFixed(6)
+                row.discountRate = (((val / row.includeTaxCostMoney)) * 100).toFixed(6)
               } else {
                 row.discountMoney = 0
                 row.discountRate = 0
diff --git a/src/views/SaleOut/NewAccessoriesOut.vue b/src/views/SaleOut/NewAccessoriesOut.vue
index 3d89304b..98627a0e 100644
--- a/src/views/SaleOut/NewAccessoriesOut.vue
+++ b/src/views/SaleOut/NewAccessoriesOut.vue
@@ -229,7 +229,6 @@
                   :precision="6"
                   :controls="false"
                   :min="0"
-                  :disabled="personalForm.isAppService === 1"
                   v-model="scope.row.discountMoney"
                   @change="getdiscountMoney(scope.row, $event, scope)"
                   @input="notundefined(scope.row)"/>
@@ -653,7 +652,7 @@ export default {
       pickerOptions2: {
         disabledDate: (time) => {
           const _now = Date.now()
-          const seven = 10 * 24 * 60 * 60 * 1000
+          const seven = 30 * 24 * 60 * 60 * 1000
           const sevenDays = _now - seven
           return time.getTime() > _now || time.getTime() < sevenDays
         }
@@ -2169,9 +2168,12 @@ export default {
                   offset: 100
                 })
               }
-            }
-            if (row.taxprice !== 0 && row.quantity !== 0 && row.discountMoney !== 0) {
-              row.discountRate = (((row.discountMoney / row.includeTaxCostMoney)) * 100).toFixed(6)
+              if (row.taxprice !== 0 && row.quantity !== 0 && row.discountMoney !== 0 && row.includeTaxCostMoney !== 0) {
+                row.discountRate = (((isoverdiscount / row.includeTaxCostMoney)) * 100).toFixed(6)
+              } else {
+                row.discountMoney = 0
+                row.discountRate = 0
+              }
             }
           }
         })
@@ -2204,8 +2206,11 @@ export default {
                 })
               }
             }
-            if (row.taxprice !== 0 && row.quantity !== 0 && row.discountMoney !== 0) {
-              row.discountRate = (((row.discountMoney / row.includeTaxCostMoney)) * 100).toFixed(6)
+            if (row.taxprice !== 0 && row.quantity !== 0 && row.discountMoney !== 0 && row.includeTaxCostMoney !== 0) {
+              row.discountRate = (((val / row.includeTaxCostMoney)) * 100).toFixed(6)
+            } else {
+              row.discountMoney = 0
+              row.discountRate = 0
             }
           }
         })
diff --git a/src/views/SaleOut/NewBatteryOut.vue b/src/views/SaleOut/NewBatteryOut.vue
index a47a9c09..9168171f 100644
--- a/src/views/SaleOut/NewBatteryOut.vue
+++ b/src/views/SaleOut/NewBatteryOut.vue
@@ -37,6 +37,21 @@
                   <my-repository :repositorycontrol.sync="repositorycontrol" @repositoryname="repositoryname"/>
                 </el-form-item>
               </el-col>
+              <el-col v-show="ischina === 2" :span="6" style="height: 57px">
+                <el-form-item :label="$t('update4.isAppService')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
+                  <el-radio-group v-model="personalForm.isAppService" style="width: 200px" @change="changeAppDiscount">
+                    <el-radio :label="1" style="width: 100px">{{ $t('updates.yes') }}</el-radio>
+                    <el-radio :label="2">{{ $t('updates.no') }}</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col v-show="ischina === 2" :span="6" style="height: 57px">
+                <el-form-item :label="$t('update4.appDiscount')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
+                  <span style="margin-left: 20px;">
+                    {{ personalForm.appDiscount }}
+                  </span>
+                </el-form-item>
+              </el-col>
               <el-col :span="6">
                 <el-form-item :label="$t('SaleOut.pointSupport')" prop="pointSupport" style="margin-left: 18px;width: 100%;margin-bottom: 0">
                   <el-input v-model="personalForm.pointSupport" :disabled="personalForm.customerType === '1'" style="width: 200px"/>
@@ -89,7 +104,7 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item :label="$t('update4.customerPay')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
-                  <el-input-number v-model="personalForm.customerPay" :controls="false" :step="0.1" :min="0" style="width: 200px" @change="updatePrice()"/>
+                  <el-input-number v-model="personalForm.customerPay" :controls="false" :step="0.1" :min="0" style="width: 200px" @change="updatePrice()" @blur="updatePrice()"/>
                 </el-form-item>
               </el-col>
               <el-col :span="6" style="height: 57px">
@@ -155,6 +170,7 @@
                     style="width: 200px"/>
                 </el-form-item>
               </el-col>
+
             </el-row>
           </el-form>
         </div>
@@ -589,11 +605,12 @@ export default {
       pickerOptions2: {
         disabledDate: (time) => {
           const _now = Date.now()
-          const seven = 10 * 24 * 60 * 60 * 1000
+          const seven = 30 * 24 * 60 * 60 * 1000
           const sevenDays = _now - seven
           return time.getTime() > _now || time.getTime() < sevenDays
         }
       },
+      ischina: this.$store.getters.countryId,
       isbendi: null,
       projectmoney: 0,
       control3: false,
@@ -728,7 +745,9 @@ export default {
         couponMoney: 0,
         couponSupportOld: 0,
         isFree: 2,
-        useMonth: null
+        useMonth: null,
+        isAppService: 2,
+        appDiscount: 0
       },
       // 销售订单规则数据
       personalrules: {
@@ -905,6 +924,10 @@ export default {
     _that = this
   },
   methods: {
+    changeAppDiscount() {
+      this.updatePrice()
+      this.getReceivableMoney()
+    },
     uniqueArray3(array, key) {
       var result = [array[0]]
       for (var i = 1; i < array.length; i++) {
@@ -1479,27 +1502,76 @@ export default {
         console.log('filterfinally', filterfinally)
         console.log('this.projectmoney', this.projectmoney)
 
-        // this.diffpricelist
-        if (filterfinally.length !== 0) {
-          console.log('this.projectmoney', this.projectmoney)
+        switch (this.personalForm.isAppService) {
+          case 1:
 
-          let needmoney = (Number(filterfinally[0].diffMoney) * Number(allbattery[0].quantity) - Number(this.personalForm.pointSupport) - Number(this.personalForm.ridMoney) - Number(this.personalForm.ridBikeMoney) - Number(this.personalForm.advanceMoney) - Number(this.personalForm.couponSupportOld) - Number(this.personalForm.couponMoney)) + Number(this.personalForm.otherMoney) + Number(this.projectmoney)
-          const needmoney2 = (Number(filterfinally[0].diffMoney) * Number(allbattery[0].quantity) - Number(this.personalForm.pointSupport) - Number(this.personalForm.ridMoney) - Number(this.personalForm.ridBikeMoney) - Number(this.personalForm.advanceMoney) - Number(this.personalForm.couponSupportOld)) + Number(this.personalForm.otherMoney) + Number(this.projectmoney)
-          if (needmoney < 0) {
-            needmoney = 0
-          }
-          // this.$set(this.personalForm, 'receivableMoney', needmoney)
-          this.$set(this.personalForm, 'shouldMoney', needmoney)
+            if (filterfinally.length !== 0) {
+              console.log('this.projectmoney', this.projectmoney)
 
-          // 未减去优惠券额的金额
-          this.$set(this.personalForm, 'receivableMoney2', needmoney2)
-        } else {
-          // this.$set(this.personalForm, 'receivableMoney', 0)
-          this.$set(this.personalForm, 'shouldMoney', 0)
+              let testneedmoney = (Number(filterfinally[0].diffMoney) * Number(allbattery[0].quantity) - Number(this.personalForm.pointSupport) - Number(this.personalForm.ridMoney) - Number(this.personalForm.ridBikeMoney) - Number(this.personalForm.advanceMoney) - Number(this.personalForm.couponSupportOld) - Number(this.personalForm.couponMoney)) + Number(this.personalForm.otherMoney) + Number(this.projectmoney)
+              const testneedmoney2 = (Number(filterfinally[0].diffMoney) * Number(allbattery[0].quantity) - Number(this.personalForm.pointSupport) - Number(this.personalForm.ridMoney) - Number(this.personalForm.ridBikeMoney) - Number(this.personalForm.advanceMoney) - Number(this.personalForm.couponSupportOld)) + Number(this.personalForm.otherMoney) + Number(this.projectmoney)
+              if (testneedmoney < 0) {
+                testneedmoney = 0
+              }
 
-          // 未减去优惠券额的金额
-          this.$set(this.personalForm, 'receivableMoney2', 0)
+              const appdiscount = Math.ceil(Number(testneedmoney) / 500) * 10
+              const appdiscount2 = Math.ceil(Number(testneedmoney2) / 500) * 10
+
+              const needmoney = Number(testneedmoney) - Number(appdiscount)
+              const needmoney2 = Number(testneedmoney2) - Number(appdiscount)
+              this.$set(this.personalForm, 'appDiscount', appdiscount)
+              // this.$set(this.personalForm, 'receivableMoney', needmoney)
+              this.$set(this.personalForm, 'shouldMoney', needmoney)
+
+              // 未减去优惠券额的金额
+              this.$set(this.personalForm, 'receivableMoney2', needmoney2)
+            } else {
+              this.$set(this.personalForm, 'appDiscount', 0)
+              // this.$set(this.personalForm, 'receivableMoney', 0)
+              this.$set(this.personalForm, 'shouldMoney', 0)
+
+              // 未减去优惠券额的金额
+              this.$set(this.personalForm, 'receivableMoney2', 0)
+            }
+
+            break
+          case 2:
+            if (filterfinally.length !== 0) {
+              console.log('this.projectmoney', this.projectmoney)
+
+              let needmoney = (Number(filterfinally[0].diffMoney) * Number(allbattery[0].quantity) - Number(this.personalForm.pointSupport) - Number(this.personalForm.ridMoney) - Number(this.personalForm.ridBikeMoney) - Number(this.personalForm.advanceMoney) - Number(this.personalForm.couponSupportOld) - Number(this.personalForm.couponMoney)) + Number(this.personalForm.otherMoney) + Number(this.projectmoney)
+              const needmoney2 = (Number(filterfinally[0].diffMoney) * Number(allbattery[0].quantity) - Number(this.personalForm.pointSupport) - Number(this.personalForm.ridMoney) - Number(this.personalForm.ridBikeMoney) - Number(this.personalForm.advanceMoney) - Number(this.personalForm.couponSupportOld)) + Number(this.personalForm.otherMoney) + Number(this.projectmoney)
+              if (needmoney < 0) {
+                needmoney = 0
+              }
+              this.$set(this.personalForm, 'appDiscount', 0)
+              // this.$set(this.personalForm, 'receivableMoney', needmoney)
+              this.$set(this.personalForm, 'shouldMoney', needmoney)
+
+              // 未减去优惠券额的金额
+              this.$set(this.personalForm, 'receivableMoney2', needmoney2)
+            } else {
+              this.$set(this.personalForm, 'appDiscount', 0)
+              // this.$set(this.personalForm, 'receivableMoney', 0)
+              this.$set(this.personalForm, 'shouldMoney', 0)
+
+              // 未减去优惠券额的金额
+              this.$set(this.personalForm, 'receivableMoney2', 0)
+            }
+
+            break
+
+          default:
+            this.$set(this.personalForm, 'appDiscount', 0)
+            // this.$set(this.personalForm, 'receivableMoney', 0)
+            this.$set(this.personalForm, 'shouldMoney', 0)
+
+            // 未减去优惠券额的金额
+            this.$set(this.personalForm, 'receivableMoney2', 0)
+            break
         }
+
+        // this.diffpricelist
       }
     },
     isEdit5(row) {
@@ -2127,9 +2199,12 @@ export default {
                   offset: 100
                 })
               }
-            }
-            if (row.taxprice !== 0 && row.quantity !== 0 && row.discountMoney !== 0) {
-              row.discountRate = (((row.discountMoney / row.includeTaxCostMoney)) * 100).toFixed(6)
+              if (row.taxprice !== 0 && row.quantity !== 0 && row.discountMoney !== 0 && row.includeTaxCostMoney !== 0) {
+                row.discountRate = (((isoverdiscount / row.includeTaxCostMoney)) * 100).toFixed(6)
+              } else {
+                row.discountMoney = 0
+                row.discountRate = 0
+              }
             }
           }
         })
@@ -2164,8 +2239,11 @@ export default {
                 })
               }
             }
-            if (row.taxprice !== 0 && row.quantity !== 0 && row.discountMoney !== 0) {
-              row.discountRate = (((row.discountMoney / row.includeTaxCostMoney)) * 100).toFixed(6)
+            if (row.taxprice !== 0 && row.quantity !== 0 && row.discountMoney !== 0 && row.includeTaxCostMoney !== 0) {
+              row.discountRate = (((val / row.includeTaxCostMoney)) * 100).toFixed(6)
+            } else {
+              row.discountMoney = 0
+              row.discountRate = 0
             }
           }
         })
diff --git a/src/views/SaleOut/components/DetailList.vue b/src/views/SaleOut/components/DetailList.vue
index 50cd8df1..3978a36d 100644
--- a/src/views/SaleOut/components/DetailList.vue
+++ b/src/views/SaleOut/components/DetailList.vue
@@ -719,7 +719,7 @@ export default {
       if (row.discountRate === 1) {
         return 100
       } else {
-        return row.discountRate
+        return row.discountRate * 100
       }
     },
     // 计划金额
diff --git a/src/views/SaleOut/components/MyDialog.vue b/src/views/SaleOut/components/MyDialog.vue
index acf5229b..b5d2537d 100644
--- a/src/views/SaleOut/components/MyDialog.vue
+++ b/src/views/SaleOut/components/MyDialog.vue
@@ -779,7 +779,7 @@ export default {
       pickerOptions2: {
         disabledDate: (time) => {
           const _now = Date.now()
-          const seven = 10 * 24 * 60 * 60 * 1000
+          const seven = 30 * 24 * 60 * 60 * 1000
           const sevenDays = _now - seven
           return time.getTime() > _now || time.getTime() < sevenDays
         }
diff --git a/src/views/SaleOut/components/MyDialog2.vue b/src/views/SaleOut/components/MyDialog2.vue
index 528de7e9..f7003c82 100644
--- a/src/views/SaleOut/components/MyDialog2.vue
+++ b/src/views/SaleOut/components/MyDialog2.vue
@@ -773,7 +773,7 @@ export default {
       pickerOptions2: {
         disabledDate: (time) => {
           const _now = Date.now()
-          const seven = 10 * 24 * 60 * 60 * 1000
+          const seven = 30 * 24 * 60 * 60 * 1000
           const sevenDays = _now - seven
           return time.getTime() > _now || time.getTime() < sevenDays
         }
diff --git a/src/views/SaleOut/components/MyDialog3.vue b/src/views/SaleOut/components/MyDialog3.vue
index 854b2265..d363025f 100644
--- a/src/views/SaleOut/components/MyDialog3.vue
+++ b/src/views/SaleOut/components/MyDialog3.vue
@@ -727,7 +727,7 @@ export default {
       pickerOptions2: {
         disabledDate: (time) => {
           const _now = Date.now()
-          const seven = 10 * 24 * 60 * 60 * 1000
+          const seven = 30 * 24 * 60 * 60 * 1000
           const sevenDays = _now - seven
           return time.getTime() > _now || time.getTime() < sevenDays
         }
diff --git a/src/views/SaleReturn/AddSaleReturn.vue b/src/views/SaleReturn/AddSaleReturn.vue
index 15ca5ed7..145ca269 100644
--- a/src/views/SaleReturn/AddSaleReturn.vue
+++ b/src/views/SaleReturn/AddSaleReturn.vue
@@ -374,7 +374,7 @@ export default {
       pickerOptions2: {
         disabledDate: (time) => {
           const _now = Date.now()
-          const seven = 10 * 24 * 60 * 60 * 1000
+          const seven = 30 * 24 * 60 * 60 * 1000
           const sevenDays = _now - seven
           return time.getTime() > _now || time.getTime() < sevenDays
         }
diff --git a/src/views/StockArrival/AddStockArrival.vue b/src/views/StockArrival/AddStockArrival.vue
index 2a830a21..edd56078 100644
--- a/src/views/StockArrival/AddStockArrival.vue
+++ b/src/views/StockArrival/AddStockArrival.vue
@@ -39,7 +39,7 @@
                 <el-form-item :label="$t('StockArrival.sourceType')" prop="sourceType" style="margin-left: 18px;width: 100%;margin-bottom: 0;">
                   <el-select v-model="personalForm.sourceType" size="mini" style="margin-left: 18px;width: 200px" @change="chooseType">
                     <el-option value="1" label="采购订单" />
-                    <el-option value="2" label="无来源" />
+                    <!-- <el-option value="2" label="无来源" /> -->
                   </el-select>
                 </el-form-item>
               </el-col>
diff --git a/src/views/StockArrival/StockArrivalList.vue b/src/views/StockArrival/StockArrivalList.vue
index a5ceae11..d95894b7 100644
--- a/src/views/StockArrival/StockArrivalList.vue
+++ b/src/views/StockArrival/StockArrivalList.vue
@@ -178,9 +178,9 @@
             <el-button v-permission="['104-116-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>
             <el-button v-permission="['104-116-17']" v-show="isReview3(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fjd')" type="success" size="mini" icon="el-icon-back" circle @click="handleReview3(scope.row)"/>
             <el-button v-permission2="['104-116-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
-            <el-button v-permission="['104-116-45']" v-show="scope.row.judgeStat === 2" size="mini" type="primary" style="width: 107px" @click="handleMyReceipt1(scope.row)"><span style="margin-left: -15px;">生成采购入库单</span></el-button>
+            <!-- <el-button v-permission="['104-116-45']" v-show="scope.row.judgeStat === 2" size="mini" type="primary" style="width: 107px" @click="handleMyReceipt1(scope.row)"><span style="margin-left: -15px;">生成采购入库单</span></el-button>
             <el-button v-permission="['104-116-46']" v-show="scope.row.judgeStat === 2" size="mini" type="primary" style="width: 107px" @click="handleMyReceipt2(scope.row)"><span style="margin-left: -15px;">生成质检报告单</span></el-button>
-            <el-button v-permission="['104-116-47']" v-show="scope.row.judgeStat === 2" size="mini" type="primary" style="width: 107px" @click="handleMyReceipt3(scope.row)"><span style="margin-left: -15px;">生成采购退货单</span></el-button>
+            <el-button v-permission="['104-116-47']" v-show="scope.row.judgeStat === 2" size="mini" type="primary" style="width: 107px" @click="handleMyReceipt3(scope.row)"><span style="margin-left: -15px;">生成采购退货单</span></el-button> -->
             <el-button :title="$t('updates.jc')" size="mini" type="primary" icon="el-icon-sort" circle @click="handleReceipt(scope.row)"/>
           </template>
         </el-table-column>
diff --git a/src/views/StockArrival/components/MyDialog.vue b/src/views/StockArrival/components/MyDialog.vue
index e9e1ac16..db149bb2 100644
--- a/src/views/StockArrival/components/MyDialog.vue
+++ b/src/views/StockArrival/components/MyDialog.vue
@@ -16,7 +16,7 @@
                 <el-form-item :label="$t('StockArrival.sourceType')" prop="sourceType" style="margin-left: 18px;width: 100%;margin-bottom: 0;">
                   <el-select v-model="personalForm.sourceType" size="mini" style="margin-left: 18px;width: 200px" @change="chooseType">
                     <el-option value="1" label="采购订单" />
-                    <el-option value="2" label="无来源" />
+                    <!-- <el-option value="2" label="无来源" /> -->
                   </el-select>
                 </el-form-item>
               </el-col>
diff --git a/src/views/StockInquiry/AddStockInquiry.vue b/src/views/StockInquiry/AddStockInquiry.vue
index 61a7d9d2..b8f24dea 100644
--- a/src/views/StockInquiry/AddStockInquiry.vue
+++ b/src/views/StockInquiry/AddStockInquiry.vue
@@ -401,7 +401,7 @@ export default {
         inquiryTimes: 1,
         inquiryDate: null,
         sourceType: '3',
-        currency: '1',
+        currency: '3',
         exchangeRate: '1.0000'
       },
       // 采购申请单规则数据
diff --git a/src/views/StockInvoice/components/DetailList.vue b/src/views/StockInvoice/components/DetailList.vue
index f385d227..6ce4e3cf 100644
--- a/src/views/StockInvoice/components/DetailList.vue
+++ b/src/views/StockInvoice/components/DetailList.vue
@@ -351,7 +351,7 @@ export default {
     },
     // 计算税额
     getTaxMoney2(row) {
-      row.tax = Number(row.includeTaxMoney) - Number(row.money)
+      row.tax = (Number(row.includeTaxMoney) - Number(row.money)).toFixed(6)
 
       return row.tax
     },
diff --git a/src/views/StockInvoice/components/MyDialog.vue b/src/views/StockInvoice/components/MyDialog.vue
index 89be130c..41a67b1e 100644
--- a/src/views/StockInvoice/components/MyDialog.vue
+++ b/src/views/StockInvoice/components/MyDialog.vue
@@ -725,7 +725,7 @@ export default {
       // } else {
       //   row.tax = 0
       // }
-      row.tax = Number(row.includeTaxMoney) - Number(row.money)
+      row.tax = (Number(row.includeTaxMoney) - Number(row.money)).toFixed(6)
 
       return row.tax
     },
diff --git a/src/views/StockOrder/AddStockOrder.vue b/src/views/StockOrder/AddStockOrder.vue
index 4ae4e4c8..5de73f8d 100644
--- a/src/views/StockOrder/AddStockOrder.vue
+++ b/src/views/StockOrder/AddStockOrder.vue
@@ -508,7 +508,7 @@ export default {
         regionId: this.$store.getters.regionId,
         isVat: 1,
         sourceType: '5',
-        currency: '1',
+        currency: '3',
         orderDate: null,
         deptId: this.$store.getters.deptId,
         exchangeRate: '1.0000'
diff --git a/src/views/StockRetreat/AddStockRetreat.vue b/src/views/StockRetreat/AddStockRetreat.vue
index f41e65cb..447c861f 100644
--- a/src/views/StockRetreat/AddStockRetreat.vue
+++ b/src/views/StockRetreat/AddStockRetreat.vue
@@ -899,6 +899,7 @@ export default {
       this.personalForm.settleMode = val.settleMode
       this.personalForm.transportModeId = val.transportId
       this.personalForm.isVat = val.isVat
+      this.$refs.editable.clear()
     },
     // 收货人返回数据
     supplierName2(val) {
diff --git a/src/views/StockRetreat/components/MyDialog.vue b/src/views/StockRetreat/components/MyDialog.vue
index 3fb1fc9d..9eb8153d 100644
--- a/src/views/StockRetreat/components/MyDialog.vue
+++ b/src/views/StockRetreat/components/MyDialog.vue
@@ -710,6 +710,7 @@ export default {
       this.personalForm.payMode = val.payMode
       this.personalForm.deliveryModeId = val.deliveryMode
       this.personalForm.isVat = val.isVat
+      this.$refs.editable.clear()
     },
     // 采购员focus事件
     handlechooseStock() {
diff --git a/src/views/Stockenter/OtherEnterList.vue b/src/views/Stockenter/OtherEnterList.vue
index f3295d62..792189e8 100644
--- a/src/views/Stockenter/OtherEnterList.vue
+++ b/src/views/Stockenter/OtherEnterList.vue
@@ -163,7 +163,7 @@
 
 <script>
 import { getdeptlist } from '@/api/BasicSettings'
-import { otherenterlist, deleteotherenter, updateotherenter5 } from '@/api/Stockenter'
+import { otherenterlist, deleteotherenter, updateotherenter5, updateotherenter6, updateotherenter7 } from '@/api/Stockenter'
 import waves from '@/directive/waves' // Waves directive
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 import permission from '@/directive/permission/index.js' // 权限判断指令
@@ -299,7 +299,7 @@ export default {
       }).then(() => {
         this.reviewParms.judgeStat = 0
         const parms = JSON.stringify(this.reviewParms)
-        updateotherenter5(parms).then(res => {
+        updateotherenter7(this.reviewParms.id, this.reviewParms.judgeStat, this.reviewParms.endPersonId).then(res => {
           if (res.data.ret === 200) {
             if (res.data.data.result === false) {
               this.$message({
@@ -334,6 +334,7 @@ export default {
       this.reviewParms = {}
       this.reviewParms.id = row.id
       this.reviewParms.endPersonId = this.$store.getters.userId
+      console.log('parms')
       this.$confirm(this.$t('prompt.qfjd'), this.$t('prompt.fjd'), {
         distinguishCancelAndClose: true,
         confirmButtonText: this.$t('prompt.fjd'),
@@ -341,7 +342,8 @@ export default {
       }).then(() => {
         this.reviewParms.receiptStat = 2
         const parms = JSON.stringify(this.reviewParms)
-        updateotherenter5(parms).then(res => {
+
+        updateotherenter6(this.reviewParms.id, this.reviewParms.receiptStat, this.reviewParms.endPersonId).then(res => {
           if (res.data.ret === 200) {
             this.$message({
               type: 'success',
@@ -371,7 +373,7 @@ export default {
       }).then(() => {
         this.reviewParms.receiptStat = 3
         const parms = JSON.stringify(this.reviewParms)
-        updateotherenter5(parms).then(res => {
+        updateotherenter6(this.reviewParms.id, this.reviewParms.receiptStat, this.reviewParms.endPersonId).then(res => {
           if (res.data.ret === 200) {
             this.$message({
               type: 'success',
diff --git a/src/views/Stockenter/components/DetailList.vue b/src/views/Stockenter/components/DetailList.vue
index ceeec84a..ee0aa9e5 100644
--- a/src/views/Stockenter/components/DetailList.vue
+++ b/src/views/Stockenter/components/DetailList.vue
@@ -121,34 +121,15 @@
               </template>
             </el-editable-column>
             <el-editable-column v-if="jundgeprice()" :label="$t('updates.rkdj')" prop="enterPrice" align="center" />
-            <el-editable-column v-if="jundgeprice()" :label="$t('updates.rkje')" prop="enterMoney" align="center" >
-              <template slot-scope="scope">
-                <p>{{ getSize(scope.row.actualEnterQuantity, scope.row.enterPrice) }}</p>
-              </template>
-            </el-editable-column>
+            <el-editable-column v-if="jundgeprice()" :label="$t('updates.rkje')" prop="enterMoney" align="center" />
             <el-editable-column v-if="jundgeprice()" :label="$t('updates.slv')" prop="taxRate" align="center" />
             <el-editable-column v-if="jundgeprice()" :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" min-width="170px"/>
             <el-editable-column v-if="jundgeprice()" :label="$t('updates.sl')" prop="taxRate" align="center" min-width="170px"/>
 
-            <el-editable-column v-if="jundgeprice()" :label="$t('updates.hsje')" prop="includeTaxMoney" align="center" min-width="150px">
-              <template slot-scope="scope">
-                <p>{{ scope.row.includeTaxMoney }}</p>
-                <!-- <p>{{ getTaxMoney(scope.row) }}</p> -->
-              </template>
-            </el-editable-column>
-            <el-editable-column v-if="jundgeprice()" :label="$t('updates.se')" prop="taxMoney" align="center" min-width="150px">
-              <template slot-scope="scope">
-                <p>{{ scope.row.taxMoney }}</p>
-                <!-- <p>{{ getTaxMoney2(scope.row) }}</p> -->
-              </template>
-            </el-editable-column>
+            <el-editable-column v-if="jundgeprice()" :label="$t('updates.hsje')" prop="includeTaxMoney" align="center" min-width="150px" />
+            <el-editable-column v-if="jundgeprice()" :label="$t('updates.se')" prop="taxMoney" align="center" min-width="150px" />
             <el-editable-column v-if="jundgeprice()" :label="$t('updates.ckl')" prop="discountRate" align="center" min-width="170px"/>
-            <el-editable-column v-if="jundgeprice()" :label="$t('updates.cke')" prop="discountMoney" align="center" min-width="170px">
-              <template slot-scope="scope">
-                <p>{{ scope.row.discountMoney }}</p>
-                <!-- <p>{{ getdiscountMoney(scope.row) }}</p> -->
-              </template>
-            </el-editable-column>
+            <el-editable-column v-if="jundgeprice()" :label="$t('updates.cke')" prop="discountMoney" align="center" min-width="170px"/>
             <el-editable-column :label="$t('updates.dcbm')" prop="batteryCode" align="center" />
             <el-editable-column :label="$t('updates.bz')" prop="remarks" align="center" />
             <el-editable-column :label="$t('CarStatList.orderNumber')" prop="orderNumber" align="center" />
@@ -438,10 +419,10 @@ export default {
       }
       this.heji1 = num
       this.heji2 = num2
-      this.allTaxMoney = num3
-      this.allIncludeTaxMoney = num4
+      this.allTaxMoney = num4
+      this.allIncludeTaxMoney = num3
       this.allDiscountMoney = num5
-      this.allMoneyMoveDiscount = num4 - num5
+      this.allMoneyMoveDiscount = num3 - num5
       this.reviewList = []
       const review = this.personalForm.approvalUseVos
       for (const i in review) {
diff --git a/src/views/SupplierAdjust/AddSupplierAdjust.vue b/src/views/SupplierAdjust/AddSupplierAdjust.vue
index 7ee9b3f2..61efce74 100644
--- a/src/views/SupplierAdjust/AddSupplierAdjust.vue
+++ b/src/views/SupplierAdjust/AddSupplierAdjust.vue
@@ -428,6 +428,8 @@ export default {
 
       if (row.newTaxRate === 0) {
         row.newPrice = row.newIncludeTaxPrice
+      } else {
+        row.newPrice = row.newIncludeTaxPrice / (1 + row.newTaxRate / 100)
       }
       // if (row.taxPriceFlag  === 1) {
       //   row.newPrice = row.newIncludeTaxPrice / (1 + row.newTaxRate / 100)
diff --git a/src/views/SupplierAdjust/components/MyDialog.vue b/src/views/SupplierAdjust/components/MyDialog.vue
index 32518744..060dda00 100644
--- a/src/views/SupplierAdjust/components/MyDialog.vue
+++ b/src/views/SupplierAdjust/components/MyDialog.vue
@@ -67,10 +67,10 @@
           border
           size="small"
           style="width: 100%">
-          <el-editable-column type="selection" min-width="55" align="center"/>
-          <el-editable-column :label="$t('Hmodule.xh')" min-width="55" align="center" type="index"/>
-          <el-editable-column :label="$t('Hmodule.wpbh')" prop="productCode" align="center" min-width="150px"/>
-          <el-editable-column :label="$t('Hmodule.wpmc')" prop="productName" align="center" min-width="150px"/>
+          <el-editable-column type="selection" fixed="left" min-width="55" align="center"/>
+          <el-editable-column :label="$t('Hmodule.xh')" fixed="left" min-width="55" align="center" type="index"/>
+          <el-editable-column :label="$t('Hmodule.wpbh')" fixed="left" prop="productCode" align="center" min-width="150px"/>
+          <el-editable-column :label="$t('Hmodule.wpmc')" fixed="left" prop="productName" align="center" min-width="150px"/>
           <el-editable-column :label="$t('Hmodule.gg')" prop="type" align="center" min-width="150px"/>
           <el-editable-column :label="$t('updates.ys')" prop="color" align="center" min-width="150px"/>
           <el-editable-column :label="$t('Hmodule.dw')" prop="unit" align="center" min-width="150px"/>
@@ -410,6 +410,9 @@ export default {
       }
       if (row.newTaxRate === 0) {
         row.newPrice = row.newIncludeTaxPrice
+      } else {
+        row.newPrice = row.newIncludeTaxPrice / (1 + row.newTaxRate / 100)
+
       }
       // if (row.taxPriceFlag === 1) {
       //   row.newPrice = row.newIncludeTaxPrice / (1 + row.newTaxRate / 100)
diff --git a/src/views/Transfer/AddTransfer.vue b/src/views/Transfer/AddTransfer.vue
index 5596ee50..43577de0 100644
--- a/src/views/Transfer/AddTransfer.vue
+++ b/src/views/Transfer/AddTransfer.vue
@@ -133,6 +133,8 @@
             :data.sync="list2"
             :edit-config="{ showIcon: true, showStatus: true}"
             :edit-rules="validRules"
+            :summary-method="getSummaries"
+            show-summary
             class="click-table1"
             stripe
             border
@@ -190,7 +192,7 @@
                 </el-select>
               </template>
             </el-editable-column>
-            <el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0, precision: 6}, type: 'visible'}" :label="$t('Hmodule.je')" prop="money" align="center" min-width="150px"/>
+            <el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {precision: 6}, type: 'visible'}" :label="$t('Hmodule.je')" prop="money" align="center" min-width="150px"/>
           </el-editable>
         </div>
       </el-card>
@@ -279,7 +281,7 @@ export default {
       pickerOptions2: {
         disabledDate: (time) => {
           const _now = Date.now()
-          const seven = 10 * 24 * 60 * 60 * 1000
+          const seven = 30 * 24 * 60 * 60 * 1000
           const sevenDays = _now - seven
           return time.getTime() > _now || time.getTime() < sevenDays
         }
@@ -357,6 +359,37 @@ export default {
     _that = this
   },
   methods: {
+    // 总计
+    getSummaries(param) {
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = 'summery'
+          return
+        }
+        const values = data.map(item => Number(item[column.property]))
+        if (!values.every(value => isNaN(value))) {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return (Number(prev) + Number(curr)).toFixed(6)
+            } else {
+              return (Number(prev)).toFixed(6)
+            }
+          }, 0)
+          sums[index] += ''
+        } else {
+          sums[index] = ''
+        }
+      })
+      sums[1] = ''
+      sums[2] = ''
+      sums[3] = ''
+      sums[4] = ''
+      sums[5] = ''
+      return sums
+    },
     // 上传图片
     handlepicsuccess(response) {
       const picarr = []
diff --git a/src/views/Transfer/components/MyDialog.vue b/src/views/Transfer/components/MyDialog.vue
index 25e4bd13..873a25f9 100644
--- a/src/views/Transfer/components/MyDialog.vue
+++ b/src/views/Transfer/components/MyDialog.vue
@@ -149,7 +149,7 @@
               </el-select>
             </template>
           </el-editable-column>
-          <el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0, precision: 6}, type: 'visible'}" :label="$t('Hmodule.je')" prop="money" align="center" min-width="150px"/>
+          <el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {precision: 6}, type: 'visible'}" :label="$t('Hmodule.je')" prop="money" align="center" min-width="150px"/>
         </el-editable>
       </div>
     </el-card>
diff --git a/src/views/income/AddIncome.vue b/src/views/income/AddIncome.vue
index 07001549..42589787 100644
--- a/src/views/income/AddIncome.vue
+++ b/src/views/income/AddIncome.vue
@@ -185,7 +185,7 @@ export default {
       pickerOptions2: {
         disabledDate: (time) => {
           const _now = Date.now()
-          const seven = 10 * 24 * 60 * 60 * 1000
+          const seven = 30 * 24 * 60 * 60 * 1000
           const sevenDays = _now - seven
           return time.getTime() > _now || time.getTime() < sevenDays
         }