Merge branch 'dev_ml' of http://121.40.253.172:3000/pengyue/jsh_erp into test

jshERP-web/src/mixins/JEditableTableMixin.js

@@ -77,6 +77,9 @@ export const JEditableTableMixin = {
       this.eachAllTable((item) => {
         item.initialize()
       })
+      if(this.materialTable && this.materialTable.dataSource) {
+        this.materialTable.dataSource = []
+      }
       this.$emit('close')
     },
 

jshERP-web/src/views/bill/dialog/LinkBillList.vue

@@ -153,7 +153,7 @@ export default {
       discountMoney: '',
       deposit: '',
       remark: '',
-      defaultDepotId: '',
+      depotId: '',
       queryParam: {
         number: '',
         materialParam: '',
@@ -304,12 +304,12 @@ export default {
     },
     handleOk() {
       if (this.selectType === 'list') {
-        this.getDepotByCurrentUser()
         this.getSelectBillRows()
         this.selectType = 'detail'
         this.title = '请选择单据明细'
         if (this.selectBillRows && this.selectBillRows.length > 0) {
           let record = this.selectBillRows[0]
+          console.log('this.selectBillRows======', this.selectBillRows)
           this.linkNumber = record.number
           this.organId = record.organId
           this.accountId = record.accountId
@@ -317,6 +317,7 @@ export default {
           this.discountMoney = record.discountMoney
           this.deposit = record.changeAmount - record.finishDeposit
           this.remark = record.remark
+          this.depotId = record.depotId
           this.initListColumns()
           this.loadDetailData(1)
         }
@@ -331,7 +332,7 @@ export default {
             this.discountMoney,
             this.deposit,
             this.remark,
-            this.defaultDepotId,
+            this.depotId,
             this.accountId,
             this.salesMan
           )
@@ -439,22 +440,6 @@ export default {
         }
       }
     },
-    //加载默认仓库id
-    getDepotByCurrentUser() {
-      getAction('/depot/findDepotByCurrentUser').then((res) => {
-        if (res.code === 200) {
-          if (res.data.length === 1) {
-            this.defaultDepotId = res.data[0].id + ''
-          } else {
-            for (let i = 0; i < res.data.length; i++) {
-              if (res.data[i].isDefault) {
-                this.defaultDepotId = res.data[i].id + ''
-              }
-            }
-          }
-        }
-      })
-    },
     rowAction(record, index) {
       return {
         on: {

jshERP-web/src/views/bill/mixins/BillModalMixin.js

@@ -581,7 +581,7 @@ export const BillModalMixin = {
                 const mObj = that.parseInfoToObj(rawInfo)
                 mObj.allPrice = ((mObj.unitPrice - 0)* (mObj.operNumber))
                 mObj.taxRate = formTaxRate || 0
-                mObj.taxMoney = (mObj.taxRate * 0.01 * mObj.allPrice)
+                mObj.taxMoney = (mObj.taxRate * 0.01 * mObj.allPrice).toFixed(2) - 0
                 mObj.taxLastMoney = (mObj.allPrice + mObj.taxMoney)
                 mObj.depotId = formDepotId
                 mObj.position = ''

jshERP-web/src/views/bill/modules/OtherInModal.vue

@@ -446,7 +446,8 @@ export default {
               'otherMoney',
               'accountId',
               'changeAmount',
-              'depotId'
+              'depotId',
+              'taxRate'
             )
           )
         })

jshERP-web/src/views/bill/modules/OtherOutModal.vue

@@ -465,7 +465,8 @@ export default {
               'otherMoney',
               'accountId',
               'changeAmount',
-              'depotId'
+              'depotId',
+              'taxRate'
             )
           )
         })

jshERP-web/src/views/bill/modules/PurchaseInModal.vue

@@ -687,7 +687,8 @@ export default {
               'deposit',
               'changeAmount',
               'debt',
-              'depotId'
+              'depotId',
+              'taxRate'
             )
           )
         })
@@ -797,6 +798,7 @@ export default {
           this.depositStatus = true
           changeAmount = (discountLastMoney - deposit).toFixed(2) - 0
         }
+        console.log('depotId===',depotId)
         this.form.setFieldsValue({
           organId: organId,
           linkNumber: linkNumber,

jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue

@@ -612,7 +612,8 @@ export default {
               'discountLastMoney',
               'accountId',
               'changeAmount',
-              'depotId'
+              'depotId',
+              'taxRate',
             )
           )
         })

jshERP-web/src/views/bill/modules/SaleOrderModal.vue

@@ -465,7 +465,7 @@ export default {
           },
           // { title: '单位id', key: 'unitId', width: '120px', type: FormTypes.hidden },
           // { title: '单位列表', key: 'unitList', width: '120px', type: FormTypes.hidden },
-          { title: '序列号', key: 'snList', width: '120px', type: FormTypes.popupJsh, kind: 'sn', multi: true },
+          // { title: '序列号', key: 'snList', width: '120px', type: FormTypes.popupJsh, kind: 'sn', multi: true },
           // { title: '有效期', key: 'expirationDate', width: '7%', type: FormTypes.input, readonly: true },
           // { title: '多属性', key: 'sku', width: '120px', type: FormTypes.normal },
           // { title: '原数量', key: 'preNumber', width: '4%', type: FormTypes.normal },
@@ -576,7 +576,8 @@ export default {
               'receiverName',
               'receiverPhone',
               'receiverAddress',
-              'depotId'
+              'depotId',
+              'taxRate'
             )
           )
         })

jshERP-web/src/views/bill/modules/SaleOutModal.vue

@@ -725,7 +725,8 @@ export default {
               'receiverName',
               'receiverPhone',
               'receiverAddress',
-              'depotId'
+              'depotId',
+              'taxRate'
             )
           )
         })

jshERP-web/src/views/material/MaterialList.vue

@@ -95,7 +95,7 @@
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="预警提示" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-select v-model="queryParam.reminder" option-label-prop="title" placeholder="请选择商品提醒">
+                    <a-select v-model="queryParam.reminder" option-label-prop="title" placeholder="请选择预警提示">
                       <a-select-option key="临期" value="临期" title="临期">临期</a-select-option>
                       <a-select-option key="无动销" value="无动销" title="无动销">无动销</a-select-option>
                       <a-select-option key="库存危险" value="库存危险" title="库存危险">库存危险</a-select-option>

jshERP-web/src/views/system/modules/CustomerModal.vue

@@ -32,8 +32,6 @@
                 <a-input placeholder="请输入联系人" v-decorator.trim="['contacts']" />
               </a-form-item>
             </a-col>
-          </a-row>
-          <a-row class="form-row" :gutter="24">
             <a-col :span="24 / 2">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="手机号码">
                 <a-input placeholder="请输入手机号码" v-decorator.trim="['telephone', validatorRules.telephone]" />
@@ -131,7 +129,10 @@ export default {
       form: this.$form.createForm(this),
       validatorRules: {
         telephone: {
-          rules: [{ required: true, message: '请输入手机号!' }],
+          rules: [
+            { required: true, message: '请输入手机号!' },
+            { pattern: /^(?:\+?86)?1[3-9]\d{9}$/, message: '手机号格式不正确!' },
+          ],
         },
         supplier: {
           rules: [
@@ -238,4 +239,9 @@ export default {
   },
 }
 </script>
-<style scoped></style>
+<style scoped>
+.form-row{
+  display: flex;
+  flex-wrap: wrap;
+}
+</style>