菲律宾 17日修改

src/api/Collection.js

@@ -48,6 +48,9 @@ export function installmentlist(query) {
   if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) {
     params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value
   }
+  if (query.address !== '' && query.address !== null && query.address !== undefined) {
+    params.append('address', query.address) // 你要传给后台的参数值 key/value
+  }
   params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value
   params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value
   return request({

src/api/InstallmentList.js

@@ -45,6 +45,9 @@ export function installmentlist(query) {
   if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) {
     params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value
   }
+  if (query.address !== '' && query.address !== null && query.address !== undefined) {
+    params.append('address', query.address) // 你要传给后台的参数值 key/value
+  }
   params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value
   params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value
   return request({

src/api/OverdueList.js

@@ -48,6 +48,9 @@ export function installmentlist(query) {
   if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) {
     params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value
   }
+  if (query.address !== '' && query.address !== null && query.address !== undefined) {
+    params.append('address', query.address) // 你要传给后台的参数值 key/value
+  }
   params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value
   params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value
   return request({

src/api/SaleContract.js

@@ -27,6 +27,9 @@ export function searchsaleContract(query) {
   if (query.number !== '' && query.number !== null && query.number !== undefined) {
     params.append('number', query.number) // 你要传给后台的参数值 key/value
   }
+  if (query.customerType !== '' && query.customerType !== null && query.customerType !== undefined) {
+    params.append('customerType', query.customerType) // 你要传给后台的参数值 key/value
+  }
   if (query.customerName !== '' && query.customerName !== null && query.customerName !== undefined) {
     params.append('customerName', query.customerName) // 你要传给后台的参数值 key/value
   }

src/api/SaleOut.js

@@ -64,6 +64,15 @@ export function searchsaleOut(query) {
   if (query.customerName !== '' && query.customerName !== null && query.customerName !== undefined) {
     params.append('customerName', query.customerName) // 你要传给后台的参数值 key/value
   }
+  if (query.carCode !== '' && query.carCode !== null && query.carCode !== undefined) {
+    params.append('carCode', query.carCode) // 你要传给后台的参数值 key/value
+  }
+  if (query.motorCode !== '' && query.motorCode !== null && query.motorCode !== undefined) {
+    params.append('motorCode', query.motorCode) // 你要传给后台的参数值 key/value
+  }
+  if (query.batteryCode !== '' && query.batteryCode !== null && query.batteryCode !== undefined) {
+    params.append('batteryCode', query.batteryCode) // 你要传给后台的参数值 key/value
+  }
   if (query.customerId !== '' && query.customerId !== null && query.customerId !== undefined) {
     params.append('customerId', query.customerId) // 你要传给后台的参数值 key/value
   }

src/lang/zh.js

@@ -3766,7 +3766,8 @@ export default {
   },
   updates2: {
     dbdxq: '调拨单详情',
-    customerName: '零售客户姓名'
+    customerName: '零售客户姓名',
+    xsj: '销售价'
   },
   otherlanguage: {
     newvoucher: '凭证',

src/views/Advancemanage/AddAdvanceOrder.vue

@@ -364,7 +364,7 @@ export default {
         row.taxprice = (row.salePrice * (1 + row.taxRate / 100)).toFixed(2)
       }
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }
@@ -377,7 +377,7 @@ export default {
     // 通过折扣计算折扣额
     getdiscountRate(row) {
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }

src/views/Coupon/AddCoupon.vue

@@ -666,7 +666,7 @@ export default {
     // 通过折扣计算折扣额
     getdiscountRate(row) {
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (1 - row.discountRate / 100)).toFixed(2)
       }

src/views/Coupon/components/MyDialog.vue

@@ -505,7 +505,7 @@ export default {
     // 通过折扣计算折扣额
     getdiscountRate(row) {
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (1 - row.discountRate / 100)).toFixed(2)
       }

src/views/InstallmentList/index.vue

@@ -18,6 +18,11 @@
               <el-input v-model="getemplist.applyNumber" :placeholder="$t('InstallmentList.applyNumber')" clearable @keyup.enter.native="handleFilter"/>
             </el-form-item>
           </el-col>
+          <el-col :span="5">
+            <el-form-item :label="$t('StockInvoice.address')" label-width="100px">
+              <el-input v-model="getemplist.address" clearable @keyup.enter.native="handleFilter"/>
+            </el-form-item>
+          </el-col>
           <!--更多搜索条件-->
           <!-- <el-col :span="3">
             <el-popover
@@ -190,7 +195,7 @@
               <el-button v-permission2="['200-203-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
               <el-button v-show="isReview(scope.row)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
               <el-button v-permission2="['200-203-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
-              <el-button v-permission="['200-203-59']" v-show="scope.row.stat !== 2" type="primary" @click="handleMyReceipt1(scope.row)"><span>改期</span></el-button>
+              <el-button v-permission="['200-203-59']" v-show="scope.row.stat !== 2&&scope.row.stat !== 3" type="primary" @click="handleMyReceipt1(scope.row)"><span>改期</span></el-button>
             </template>
           </el-table-column>
         </el-table>

src/views/InventoryCount/AddInventoryCount.vue

@@ -73,25 +73,29 @@
           <el-editable-column type="index" width="55" align="center"/>
           <el-editable-column :edit-render="{type: 'default'}" :label="$t('Hmodule.hw')" prop="locationCode" align="center" width="200px">
             <template slot-scope="scope">
-              <el-select v-model="scope.row.locationCode" :value="scope.row.locationCode" :placeholder="$t('Hmodule.xzhw')" filterable clearable style="width: 100%;" @visible-change="updatebatch($event,scope)">
+              <p>{{ getLocationData(scope.row) }}</p>
-                <el-option
-                  v-for="(item, index) in locationlist"
-                  :key="index"
-                  :value="item.locationCode"
-                  :label="item.locationCode"/>
-              </el-select>
             </template>
           </el-editable-column>
           <!--<el-editable-column :edit-render="{name: 'ElSelect', options: batchlist, type: 'visible'}" prop="batch" align="center" :label="$t('Hmodule.pc')" width="150px"/>-->
-          <el-editable-column :edit-render="{type: 'default'}" :label="$t('Hmodule.pc')" prop="batch" align="center" width="200px">
+          <!--          <el-editable-column :edit-render="{type: 'default'}" :label="$t('Hmodule.pc')" prop="batch" align="center" width="200px">-->
-            <template slot-scope="scope">
+          <!--            <template slot-scope="scope">-->
-              <el-select v-model="scope.row.batch" :value="scope.row.batch" :placeholder="$t('Hmodule.xcpc')" filterable clearable style="width: 100%;" @visible-change="updatebatch2($event,scope)">
+          <!--              <el-select v-model="scope.row.batch" :value="scope.row.batch" :placeholder="$t('Hmodule.xcpc')" filterable clearable style="width: 100%;" @visible-change="updatebatch2($event,scope)">-->
+          <!--                <el-option-->
+          <!--                  v-for="(item, index) in batchlist"-->
+          <!--                  :key="index"-->
+          <!--                  :value="item"-->
+          <!--                  :label="item"/>-->
+          <!--              </el-select>-->
+          <el-editable-column :edit-render="{name: 'ElInput', type: 'visible'}" :label="$t('Hmodule.pc')" prop="batch" align="center" min-width="150" >
+            <template slot="edit" slot-scope="scope">
+              <el-select v-if="scope.row.batch !== '不使用'" v-model="scope.row.batch" :value="scope.row.batch" :placeholder="$t('Hmodule.xcpc')" filterable clearable style="width: 100%;" @visible-change="updatebatch2($event,scope)">
                 <el-option
                   v-for="(item, index) in batchlist"
                   :key="index"
                   :value="item"
                   :label="item"/>
               </el-select>
+              <span v-else>{{ scope.row.batch }}</span>
             </template>
           </el-editable-column>
           <el-editable-column :label="$t('Hmodule.wpbh')" prop="productCode" align="center" width="150px"/>
@@ -350,6 +354,42 @@ export default {
     _that = this
   },
   methods: {
+    getLocationData(row) {
+      // 默认批次
+      if (row.batch === null || row.batch === '' || row.batch === undefined) {
+        const parms3 = row.productCode
+        batchlist(this.personalForm.countRepositoryId, parms3).then(res => {
+          console.log(res)
+          if (res.data.data.content.length > 0) {
+            row.batch = res.data.data.content[0]
+          }
+        })
+      } else {
+        const parms3 = row.productCode
+        batchlist(this.personalForm.countRepositoryId, parms3).then(res => {
+          if (res.data.data.content.length === 0) {
+            if (row.batch !== '不使用') {
+              row.batch = null
+            }
+          }
+        })
+      }
+      // 默认货位
+      getlocation(this.personalForm.countRepositoryId, row).then(res => {
+        if (res.data.ret === 200) {
+          console.log('res', res)
+          if (res.data.data.content.length !== 0) {
+            row.locationCode = res.data.data.content[0].locationCode
+            row.locationId = res.data.data.content[0].id
+            console.log('row.locationCode', row.locationCode)
+          } else {
+            row.locationCode = null
+            row.locationId = null
+          }
+        }
+      })
+      return row.locationCode
+    },
     checkStock(row) {
       console.log('this.moreaction.length', this.moreaction.length)
       if (this.moreaction.length > 1 || this.moreaction.length === 0) {
@@ -621,6 +661,7 @@ export default {
       this.countRepositoryId = val.repositoryName
       this.personalForm.countRepositoryId = val.id
       this.locationlistparms.repositoryId = val.id
+      this.$refs.editable.clear()
       // locationlist(this.locationlistparms).then(res => {
       //   if (res.data.ret === 200) {
       //     this.locationlist = res.data.data.content.list.map(function(item) {
@@ -663,6 +704,8 @@ export default {
         // }
         this.$refs.editable.insert(val[i])
       }
+      // 货位批次默认
+      // 2撒打算
       // console.log(val)
       // const row = this.$refs.editable.insert(val)
     }

src/views/InventoryCount/components/MyDialog.vue

@@ -75,27 +75,32 @@
           @selection-change="handleSelectionChange">
           <el-editable-column type="selection" width="55" align="center"/>
           <el-editable-column type="index" width="55" align="center"/>
-          <el-editable-column :edit-render="{type: 'default'}" :label="$t('Hmodule.hw')" prop="locationId" align="center" width="200px">
+          <el-editable-column :edit-render="{type: 'default'}" :label="$t('Hmodule.hw')" prop="locationCode" align="center" width="200px">
             <template slot-scope="scope">
-              <el-select v-model="scope.row.locationId" :value="scope.row.locationId" :placeholder="$t('Hmodule.xzhw')" filterable clearable style="width: 100%;" @visible-change="updatebatch($event,scope)">
+              <p>{{ getLocationData(scope.row) }}</p>
-                <el-option
-                  v-for="(item, index) in locationlist"
-                  :key="index"
-                  :value="item.id"
-                  :label="item.locationCode"/>
-              </el-select>
             </template>
           </el-editable-column>
           <!--<el-editable-column :edit-render="{name: 'ElSelect', options: batchlist, type: 'visible'}" prop="batch" align="center" :label="$t('Hmodule.pc')" width="150px"/>-->
-          <el-editable-column :edit-render="{type: 'default'}" :label="$t('Hmodule.pc')" prop="batch" align="center" width="200px">
+          <!--<el-editable-column :edit-render="{name: 'ElSelect', options: batchlist, type: 'visible'}" prop="batch" align="center" :label="$t('Hmodule.pc')" width="150px"/>-->
-            <template slot-scope="scope">
+          <!--          <el-editable-column :edit-render="{type: 'default'}" :label="$t('Hmodule.pc')" prop="batch" align="center" width="200px">-->
-              <el-select v-model="scope.row.batch" :value="scope.row.batch" :placeholder="$t('Hmodule.xcpc')" filterable clearable style="width: 100%;" @visible-change="updatebatch2($event,scope)" @change="changequantity(scope)">
+          <!--            <template slot-scope="scope">-->
+          <!--              <el-select v-model="scope.row.batch" :value="scope.row.batch" :placeholder="$t('Hmodule.xcpc')" filterable clearable style="width: 100%;" @visible-change="updatebatch2($event,scope)">-->
+          <!--                <el-option-->
+          <!--                  v-for="(item, index) in batchlist"-->
+          <!--                  :key="index"-->
+          <!--                  :value="item"-->
+          <!--                  :label="item"/>-->
+          <!--              </el-select>-->
+          <el-editable-column :edit-render="{name: 'ElInput', type: 'visible'}" :label="$t('Hmodule.pc')" prop="batch" align="center" min-width="150" >
+            <template slot="edit" slot-scope="scope">
+              <el-select v-if="scope.row.batch !== '不使用'" v-model="scope.row.batch" :value="scope.row.batch" :placeholder="$t('Hmodule.xcpc')" filterable clearable style="width: 100%;" @visible-change="updatebatch2($event,scope)">
                 <el-option
                   v-for="(item, index) in batchlist"
                   :key="index"
                   :value="item"
                   :label="item"/>
               </el-select>
+              <span v-else>{{ scope.row.batch }}</span>
             </template>
           </el-editable-column>
           <el-editable-column :label="$t('Hmodule.wpbh')" prop="productCode" align="center" width="150px"/>
@@ -300,6 +305,42 @@ export default {
     _that = this
   },
   methods: {
+    getLocationData(row) {
+      // 默认批次
+      if (row.batch === null || row.batch === '' || row.batch === undefined) {
+        const parms3 = row.productCode
+        batchlist(this.personalForm.countRepositoryId, parms3).then(res => {
+          console.log(res)
+          if (res.data.data.content.length > 0) {
+            row.batch = res.data.data.content[0]
+          }
+        })
+      } else {
+        const parms3 = row.productCode
+        batchlist(this.personalForm.countRepositoryId, parms3).then(res => {
+          if (res.data.data.content.length === 0) {
+            if (row.batch !== '不使用') {
+              row.batch = null
+            }
+          }
+        })
+      }
+      // 默认货位
+      getlocation(this.personalForm.countRepositoryId, row).then(res => {
+        if (res.data.ret === 200) {
+          console.log('res', res)
+          if (res.data.data.content.length !== 0) {
+            row.locationCode = res.data.data.content[0].locationCode
+            row.locationId = res.data.data.content[0].id
+            console.log('row.locationCode', row.locationCode)
+          } else {
+            row.locationCode = null
+            row.locationId = null
+          }
+        }
+      })
+      return row.locationCode
+    },
     handleSelectionChange(val) {
       console.log(val)
       this.moreaction = val
@@ -459,16 +500,17 @@ export default {
       this.countRepositoryId = val.repositoryName
       this.personalForm.countRepositoryId = val.id
       this.locationlistparms.repositoryId = val.id
-      locationlist(this.locationlistparms).then(res => {
+      this.$refs.editable.clear()
-        if (res.data.ret === 200) {
+      // locationlist(this.locationlistparms).then(res => {
-          this.locationlist = res.data.data.content.list.map(function(item) {
+      //   if (res.data.ret === 200) {
-            return {
+      //     this.locationlist = res.data.data.content.list.map(function(item) {
-              'value': item.id,
+      //       return {
-              'label': item.locationName
+      //         'value': item.id,
-            }
+      //         'label': item.locationName
-          })
+      //       }
-        }
+      //     })
-      })
+      //   }
+      // })
     },
     // 盘点单事件
     // 新增盘点单明细

src/views/OverdueList/index.vue

@@ -36,6 +36,7 @@
                 <el-option :label="$t('updates.shtg')" value="2"/>
                 <el-option :label="$t('updates.shptg')" value="3"/>
               </el-select>
+              <el-input v-model="getemplist.address" placeholder="地址" style="width: 40%;float: left;margin-left: 20px;margin-top: 20px" clearable @keyup.enter.native="handleFilter"/>
               <!--<el-date-picker-->
               <!--v-model="date"-->
               <!--type="daterange"-->

src/views/Product/NewProduct.vue

@@ -24,8 +24,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item :label="$t('Product.typeid')" :rules="Iscategoryid === 3 || Iscategoryid === '' ? personalrules.typeid:[{ required: true, message: '请选择车辆型号', trigger: 'change' }]" prop="typeid" style="width: 100%;">
+                <el-form-item :label="$t('Product.typeid')" :rules="Iscategoryid === '03' || Iscategoryid === '' ? personalrules.typeid:[{ required: true, message: '请选择车辆型号', trigger: 'change' }]" prop="typeid" style="width: 100%;">
-                  <el-select ref="clear" v-model="typeid" :disabled="Iscategoryid === 3 || Iscategoryid === ''" value-key="id" style="margin-left: 18px;width: 200px" placeholder="请选择车辆型号" clearable @change="type($event)" @focus="updatecate">
+                  <el-select ref="clear" v-model="typeid" :disabled="Iscategoryid === '03' || Iscategoryid === ''" value-key="id" style="margin-left: 18px;width: 200px" placeholder="请选择车辆型号" clearable @change="type($event)" @focus="updatecate">
                     <el-option v-show="false" label="" value=""/>
                     <el-option
                       v-for="(item, index) in types"
@@ -40,8 +40,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item :label="$t('Product.disposeId')" :rules="Iscategoryid === 3 || Iscategoryid === '' || Iscategoryid === 2 ? personalrules.disposeId:[{ required: true, message: '请选择配置', trigger: 'change' }]" prop="disposeId" style="width: 100%;">
+                <el-form-item :label="$t('Product.disposeId')" :rules="Iscategoryid === '03' || Iscategoryid === '' || Iscategoryid === '02' || Iscategoryid === '05' ? personalrules.disposeId:[{ required: true, message: '请选择配置', trigger: 'change' }]" prop="disposeId" style="width: 100%;">
-                  <el-select ref="clear2" v-model="disposeId" :disabled="Iscategoryid === 3 || Iscategoryid === '' || Iscategoryid === 2" value-key="id" placeholder="请选择配置" style="margin-left: 18px;width: 200px" @change="dispose($event)" @focus="updatecate">
+                  <el-select ref="clear2" v-model="disposeId" :disabled="Iscategoryid === '03' || Iscategoryid === '' || Iscategoryid === '02' || Iscategoryid === '05'" value-key="id" placeholder="请选择配置" style="margin-left: 18px;width: 200px" @change="dispose($event)" @focus="updatecate">
                     <el-option v-show="false" label="" value=""/>
                     <el-option
                       v-for="(item, index) in disposes"
@@ -56,8 +56,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item :label="$t('Product.versionId')" :rules="Iscategoryid === 3 || Iscategoryid === '' ? personalrules.versionId:[{ required: true, message: '请选择版本', trigger: 'change' }]" prop="versionId" style="width: 100%;">
+                <el-form-item :label="$t('Product.versionId')" :rules="Iscategoryid === '03' || Iscategoryid === '' ? personalrules.versionId:[{ required: true, message: '请选择版本', trigger: 'change' }]" prop="versionId" style="width: 100%;">
-                  <el-select ref="clear3" v-model="versionId" :disabled="Iscategoryid === 3 || Iscategoryid === ''" value-key="id" placeholder="请选择版本" style="margin-left: 18px;width: 200px" @change="version($event)" @focus="updatecate">
+                  <el-select ref="clear3" v-model="versionId" :disabled="Iscategoryid === '03' || Iscategoryid === ''" value-key="id" placeholder="请选择版本" style="margin-left: 18px;width: 200px" @change="version($event)" @focus="updatecate">
                     <el-option v-show="false" label="" value=""/>
                     <el-option
                       v-for="(item, index) in versions"
@@ -72,8 +72,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item :label="$t('Product.color')" :rules="Iscategoryid === 3 || Iscategoryid === '' ? personalrules.colorId:[{ required: true, message: '请选择颜色', trigger: 'change' }]" prop="colorId" style="width: 100%;">
+                <el-form-item :label="$t('Product.color')" :rules="Iscategoryid === '03' || Iscategoryid === '' ? personalrules.colorId:[{ required: true, message: '请选择颜色', trigger: 'change' }]" prop="colorId" style="width: 100%;">
-                  <el-select ref="clear4" v-model="colorId" :disabled="Iscategoryid === 3 || Iscategoryid === ''" value-key="id" placeholder="请选择颜色" style="margin-left: 18px;width: 200px" @change="color($event)" @focus="updatecate">
+                  <el-select ref="clear4" v-model="colorId" :disabled="Iscategoryid === '03' || Iscategoryid === ''" value-key="id" placeholder="请选择颜色" style="margin-left: 18px;width: 200px" @change="color($event)" @focus="updatecate">
                     <el-option v-show="false" label="" value=""/>
                     <el-option
                       v-for="(item, index) in colors"
@@ -88,8 +88,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item :label="$t('Product.diameterId')" :rules="Iscategoryid === 1 || Iscategoryid === 2 || Iscategoryid === '' ? personalrules.diameterId:[{ required: true, message: '请选择直径规格', trigger: 'change' }]" prop="diameterId" style="width: 100%;">
+                <el-form-item :label="$t('Product.diameterId')" :rules="Iscategoryid === '01' || Iscategoryid === '02' || Iscategoryid === '' || Iscategoryid === '05' ? personalrules.diameterId:[{ required: true, message: '请选择直径规格', trigger: 'change' }]" prop="diameterId" style="width: 100%;">
-                  <el-select ref="clear5" v-model="diameterId" :disabled="Iscategoryid === 1 || Iscategoryid === 2 || Iscategoryid === ''" value-key="id" placeholder="请选择直径规格" style="margin-left: 18px;width: 200px" @change="diameter($event)" @focus="updatecate">
+                  <el-select ref="clear5" v-model="diameterId" :disabled="Iscategoryid === '01' || Iscategoryid === '02' || Iscategoryid === '' || Iscategoryid === '05'" value-key="id" placeholder="请选择直径规格" style="margin-left: 18px;width: 200px" @change="diameter($event)" @focus="updatecate">
                     <el-option v-show="false" label="" value=""/>
                     <el-option
                       v-for="(item, index) in diameters"
@@ -136,8 +136,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item :label="$t('Product.lengthLevelId')" :rules="Iscategoryid === 1 || Iscategoryid === 2 || Iscategoryid === '' ? personalrules.lengthLevelId:[{ required: true, message: '请选择长度等级', trigger: 'change' }]" prop="lengthLevelId" style="width: 100%;">
+                <el-form-item :label="$t('Product.lengthLevelId')" :rules="Iscategoryid === '01' || Iscategoryid === '02' || Iscategoryid === '' || Iscategoryid === '05' ? personalrules.lengthLevelId:[{ required: true, message: '请选择长度等级', trigger: 'change' }]" prop="lengthLevelId" style="width: 100%;">
-                  <el-select ref="clear8" v-model="lengthLevelId" :disabled="Iscategoryid === 1 || Iscategoryid === 2 || personalForm.categoryid === ''" value-key="id" placeholder="请选择长度等级" style="margin-left: 18px;width: 200px" @change="length($event)" @focus="updatecate">
+                  <el-select ref="clear8" v-model="lengthLevelId" :disabled="Iscategoryid === '01' || Iscategoryid === '02' || Iscategoryid === '05' || personalForm.categoryid === ''" value-key="id" placeholder="请选择长度等级" style="margin-left: 18px;width: 200px" @change="length($event)" @focus="updatecate">
                     <el-option v-show="false" label="" value=""/>
                     <el-option
                       v-for="(item, index) in lengthLevels"
@@ -152,8 +152,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item :label="$t('Product.faceId')" :rules="Iscategoryid === 1 || Iscategoryid === 2 || Iscategoryid === '' ? personalrules.faceId:[{ required: true, message: '请选择表面处理', trigger: 'change' }]" prop="faceId" style="width: 100%;">
+                <el-form-item :label="$t('Product.faceId')" :rules="Iscategoryid === '01' || Iscategoryid === '02' || Iscategoryid === '05' || Iscategoryid === '' ? personalrules.faceId:[{ required: true, message: '请选择表面处理', trigger: 'change' }]" prop="faceId" style="width: 100%;">
-                  <el-select ref="clear9" v-model="faceId" :disabled="Iscategoryid === 1 || Iscategoryid === 2 || Iscategoryid === ''" value-key="id" placeholder="请选择表面处理" style="margin-left: 18px;width: 200px" @change="face($event)" @focus="updatecate">
+                  <el-select ref="clear9" v-model="faceId" :disabled="Iscategoryid === '01' || Iscategoryid === '02' || Iscategoryid === '05' || Iscategoryid === ''" value-key="id" placeholder="请选择表面处理" style="margin-left: 18px;width: 200px" @change="face($event)" @focus="updatecate">
                     <el-option v-show="false" label="" value=""/>
                     <el-option
                       v-for="(item, index) in faces"
@@ -168,8 +168,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item :label="$t('Product.performanceLevelId')" :rules="Iscategoryid === 1 || Iscategoryid === 2 || Iscategoryid === '' ? personalrules.performanceLevelId:[{ required: true, message: '请选择性能等级', trigger: 'change' }]" prop="performanceLevelId" style="width: 100%;">
+                <el-form-item :label="$t('Product.performanceLevelId')" :rules="Iscategoryid === '01' || Iscategoryid === '02' || Iscategoryid === '05' || Iscategoryid === '' ? personalrules.performanceLevelId:[{ required: true, message: '请选择性能等级', trigger: 'change' }]" prop="performanceLevelId" style="width: 100%;">
-                  <el-select ref="clear10" v-model="performanceLevelId" :disabled="Iscategoryid === 1 || Iscategoryid === 2 || Iscategoryid === ''" value-key="id" placeholder="请选择性能等级" style="margin-left: 18px;width: 200px" @change="performanceLevel($event)" @focus="updatecate">
+                  <el-select ref="clear10" v-model="performanceLevelId" :disabled="Iscategoryid === '01' || Iscategoryid === '02' || Iscategoryid === '05' || Iscategoryid === ''" value-key="id" placeholder="请选择性能等级" style="margin-left: 18px;width: 200px" @change="performanceLevel($event)" @focus="updatecate">
                     <el-option v-show="false" label="" value=""/>
                     <el-option
                       v-for="(item, index) in performanceLevels"
@@ -1155,6 +1155,8 @@ export default {
     },
     finder(val) {
       const Id = this.recursion(val)
+      console.log('IdIdIdIdId', Id)
+      console.log('valvalvalval', val)
       if (Id.code === '01') {
         console.log(val)
         this.personalForm.categoryCode = '01' + val.data.code
@@ -1176,9 +1178,22 @@ export default {
           this.personalForm.categoryCode = '03' + val.parent.data.code + val.data.code
           this.personalForm.categoryid = val.data.id
         }
+      } else if (Id.code === '05') {
+        if (val.level === 2) {
+          this.personalForm.categoryCode = '05' + val.data.code + '00' + '00'
+          this.personalForm.categoryid = val.data.id
+        } else if (val.level === 3) {
+          console.log(val)
+          this.personalForm.categoryCode = '05' + val.parent.data.code + val.data.code + '00'
+          this.personalForm.categoryid = val.data.id
+        } else if (val.level === 4) {
+          this.personalForm.categoryCode = '05' + val.parent.parent.data.code + val.parent.data.code + val.data.code
+          this.personalForm.categoryid = val.data.id
+        }
       }
       console.log(this.personalForm.categoryCode)
-      this.Iscategoryid = Id.id
+      this.Iscategoryid = Id.code
+      console.log('thisIscategoryid2222222222222222', this.Iscategoryid)
     },
     // 递归函数
     recursion(val) {

src/views/ReturnExchange/AddReturnExchange.vue

@@ -8,7 +8,7 @@
           <el-form ref="personalForm" :model="personalForm" :rules="personalrules" :inline="true" status-icon class="demo-ruleForm" label-width="130px">
             <el-row>
               <el-col :span="6">
-                <el-form-item :label="$t('ReturnExchange.title')" prop="title" style="width: 100%;">
+                <el-form-item :label="$t('ReturnExchange.title')" style="width: 100%;">
                   <el-input v-model="personalForm.title" style="margin-left: 18px;width: 200px" clearable/>
                 </el-form-item>
               </el-col>
@@ -42,7 +42,7 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item :label="$t('ReturnExchange.customerPhone')" prop="customerPhone" style="width: 100%;">
-                  <el-input v-model="personalForm.customerPhone" style="margin-left: 18px;width: 200px" clearable/>
+                  <el-input v-model="personalForm.customerPhone" disabled style="margin-left: 18px;width: 200px" clearable/>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -318,7 +318,7 @@ export default {
           { required: true, message: '请输差异金额', trigger: 'blur' }
         ],
         repositoryId: [
-          { required: true, validator: validatePass4, trigger: 'blur' }
+          { required: true, validator: validatePass4, trigger: 'change' }
         ]
       },
       // 订单明细数据
@@ -371,6 +371,7 @@ export default {
       this.control = true
     },
     productdetail(val) {
+      console.log('12312312', val)
       const nowlistdata = this.$refs.editable2.getRecords()
       for (let i = 0; i < val.length; i++) {
         for (let j = 0; j < nowlistdata.length; j++) {
@@ -385,6 +386,21 @@ export default {
         }
         this.$refs.editable2.insert(val[i])
       }
+      const nowlistdata1 = this.$refs.editable.getRecords()
+      const nowlistdata2 = this.$refs.editable2.getRecords()
+      let money1 = 0
+      let money2 = 0
+      console.log('nowlistdata1', nowlistdata1)
+      for (let i = 0; i < nowlistdata1.length; i++) {
+        money1 = money1 + (nowlistdata1[i].includeTaxCostMoney - nowlistdata1[i].discountMoney)
+        console.log('includeTaxCostMoney', nowlistdata1[i].includeTaxCostMoney)
+      }
+      for (let i = 0; i < nowlistdata2.length; i++) {
+        money2 = money2 + ((nowlistdata2[i].taxPrice * nowlistdata2[i].quantity) - nowlistdata2[i].discountMoney)
+      }
+      console.log('money1', money1)
+      console.log('money2', money2)
+      this.personalForm.diffMoney = (money1 - money2).toFixed(2)
     },
     chooserep() {
       this.repositorycontrol = true

src/views/ReturnExchange/components/MyDetail.vue

@@ -296,7 +296,7 @@ export default {
           taxRate: '0.00',
           taxMoney: '0.00',
           money: '0.00',
-          discount: '100.00',
+          discount: '0.00',
           discountMoney: '0.00'
         }
       })

src/views/ReturnExchange/components/MyDialog.vue

@@ -7,7 +7,7 @@
         <el-form ref="personalForm" :model="personalForm" :rules="personalrules" :inline="true" status-icon class="demo-ruleForm" label-width="130px">
           <el-row>
             <el-col :span="12">
-              <el-form-item :label="$t('ReturnExchange.title')" prop="title" style="width: 100%;">
+              <el-form-item :label="$t('ReturnExchange.title')" style="width: 100%;">
                 <el-input v-model="personalForm.title" style="margin-left: 18px;width: 200px" clearable/>
               </el-form-item>
             </el-col>
@@ -41,7 +41,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item :label="$t('ReturnExchange.customerPhone')" prop="customerPhone" style="width: 100%;">
-                <el-input v-model="personalForm.customerPhone" style="margin-left: 18px;width: 200px" clearable/>
+                <el-input v-model="personalForm.customerPhone" disabled style="margin-left: 18px;width: 200px" clearable/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -391,6 +391,21 @@ export default {
         }
         this.$refs.editable2.insert(val[i])
       }
+      const nowlistdata1 = this.$refs.editable.getRecords()
+      const nowlistdata2 = this.$refs.editable2.getRecords()
+      let money1 = 0
+      let money2 = 0
+      console.log('nowlistdata1', nowlistdata1)
+      for (let i = 0; i < nowlistdata1.length; i++) {
+        money1 = money1 + (nowlistdata1[i].includeTaxCostMoney - nowlistdata1[i].discountMoney)
+        console.log('includeTaxCostMoney', nowlistdata1[i].includeTaxCostMoney)
+      }
+      for (let i = 0; i < nowlistdata2.length; i++) {
+        money2 = money2 + ((nowlistdata2[i].taxPrice * nowlistdata2[i].quantity) - nowlistdata2[i].discountMoney)
+      }
+      console.log('money1', money1)
+      console.log('money2', money2)
+      this.personalForm.diffMoney = (money1 - money2).toFixed(2)
     },
     chooserep() {
       this.repositorycontrol = true

src/views/ReturnExchange/components/MySaleout.vue

@@ -10,7 +10,7 @@
           </el-col>
           <el-col :span="3" style="margin-left: 5px">
             <el-form-item>
-              <el-input v-model="getemplist.applyNumber" placeholder="出库单编号" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
+              <el-input v-model="getemplist.number" placeholder="出库单编号" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
             </el-form-item>
           </el-col>
           <el-col :span="3" style="margin-left: 20px">

src/views/SaleContract/AddSaleContract.vue

@@ -709,7 +709,7 @@ export default {
     // 数量变化其他参数
     queryStock(row) {
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }

src/views/SaleContract/SaleContractList.vue

@@ -46,6 +46,7 @@
                 <el-option :label="$t('updates.shtg')" value="2"/>
                 <el-option :label="$t('updates.shptg')" value="3"/>
               </el-select>
+              <el-input v-model="getemplist.customerName" :placeholder="$t('updates2.customerName')" style="width: 40%;float: left;margin-left: 20px;margin-top: 20px" clearable @keyup.enter.native="handleFilter"/>
               <!--<el-date-picker-->
               <!--v-model="date"-->
               <!--type="daterange"-->
@@ -389,6 +390,11 @@ export default {
     // 搜索
     handleFilter() {
       this.getemplist.pageNum = 1
+      if (this.getemplist.customerName !== null && this.getemplist.customerName !== undefined && this.getemplist.customerName !== '') {
+        this.getemplist.customerType = 2
+      } else {
+        this.getemplist.customerType = null
+      }
       searchsaleContract(this.getemplist).then(res => {
         if (res.data.ret === 200) {
           this.list = res.data.data.content.list

src/views/SaleContract/components/MyDialog.vue

@@ -610,7 +610,7 @@ export default {
     // 数量变化其他参数
     queryStock(row) {
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }

src/views/SaleOrder/AddSaleOrder.vue

@@ -625,7 +625,7 @@ export default {
     // 数量变化其他参数
     queryStock(row) {
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }
@@ -825,7 +825,7 @@ export default {
     // 通过折扣计算折扣额
     getdiscountRate(row) {
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }

src/views/SaleOrder/components/MyDialog.vue

@@ -556,7 +556,7 @@ export default {
     // 数量变化其他参数
     queryStock(row) {
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }
@@ -699,7 +699,7 @@ export default {
     // 通过折扣计算折扣额
     getdiscountRate(row) {
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }

src/views/SaleOut/AddSaleOut.vue

@@ -1075,7 +1075,7 @@ export default {
       }
 
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }
@@ -1487,7 +1487,7 @@ export default {
     // 计算含税金额
     getincludeTaxMoney(row) {
       row.includeTaxMoney = (row.taxprice * row.quantity).toFixed(2)
-      row.discountMoney = (row.taxprice * row.quantity * (1 - row.discountRate / 100)).toFixed(2)
+      row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       return row.includeTaxMoney
     },
     // 通过税率计算含税价
@@ -1497,7 +1497,7 @@ export default {
         row.discountMoney = row.includeTaxCostMoney * row.discountRate
       }
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }
@@ -1510,7 +1510,7 @@ export default {
     // 通过折扣计算折扣额
     getdiscountRate(row) {
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }

src/views/SaleOut/AddSaleOut2.vue

@@ -769,7 +769,7 @@ export default {
         }
       })
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }
@@ -1105,7 +1105,7 @@ export default {
         row.taxprice = (row.salePrice * (1 + row.taxRate / 100)).toFixed(2)
       }
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }
@@ -1118,7 +1118,7 @@ export default {
     // 通过折扣计算折扣额
     getdiscountRate(row) {
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }

src/views/SaleOut/SaleOutList.vue

@@ -40,6 +40,9 @@
                 <el-option :label="$t('updates.shptg')" value="3"/>
               </el-select>
               <el-input v-model="getemplist.customerName" :placeholder="$t('updates2.customerName')" style="width: 40%;float: right;margin-right: 20px;margin-top: 20px" clearable @keyup.enter.native="handleFilter"/>
+              <el-input v-model="getemplist.carCode" :placeholder="$t('updates.cjbm')" style="width: 40%;float: left;margin-left: 20px;margin-top: 20px" clearable @keyup.enter.native="handleFilter"/>
+              <el-input v-model="getemplist.motorCode" :placeholder="$t('updates.djbm')" style="width: 40%;float: right;margin-right: 20px;margin-top: 20px" clearable @keyup.enter.native="handleFilter"/>
+              <el-input v-model="getemplist.batteryCode" :placeholder="$t('updates.dcbm')" style="width: 40%;float: left;margin-left: 20px;margin-top: 20px" clearable @keyup.enter.native="handleFilter"/>
               <!--<el-date-picker-->
               <!--v-model="date"-->
               <!--type="daterange"-->

src/views/SaleOut/components/MyDialog.vue

@@ -949,7 +949,7 @@ export default {
       }
 
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }
@@ -1205,7 +1205,7 @@ export default {
     // 计算含税金额
     getincludeTaxMoney(row) {
       row.includeTaxMoney = (row.taxprice * row.quantity).toFixed(2)
-      row.discountMoney = (row.taxprice * row.quantity * (1 - row.discountRate / 100)).toFixed(2)
+      row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       return row.includeTaxMoney
     },
     // 通过税率计算含税价
@@ -1214,7 +1214,7 @@ export default {
         row.taxprice = (row.salePrice * (1 + row.taxRate / 100)).toFixed(2)
       }
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }
@@ -1227,7 +1227,7 @@ export default {
     // 通过折扣计算折扣额
     getdiscountRate(row) {
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }