Merge branch 'master' of http://121.40.253.172:3000/pengyue/jsh_erp into dev_huangjunjie

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

@@ -344,7 +344,7 @@ export default {
             statistics: true,
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
-          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.inputNumber },
+          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.inputNumber,validateRules: [{ required: true, message: '${title}不能为空' }], },
           { title: '金额', key: 'allPrice', width: '120px', type: FormTypes.inputNumber, statistics: true },
           // {
           //   title: '实际入库数量',

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

@@ -333,7 +333,7 @@ export default {
             statistics: true,
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
-          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.inputNumber },
+          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.inputNumber,validateRules: [{ required: true, message: '${title}不能为空' }], },
           { title: '金额', key: 'allPrice', width: '120px', type: FormTypes.inputNumber, statistics: true },
           {
             title: '实际出库数量',

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

@@ -524,7 +524,7 @@ export default {
             statistics: true,
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
-          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.inputNumber },
+          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.inputNumber,validateRules: [{ required: true, message: '${title}不能为空' }], },
           { title: '金额', key: 'allPrice', width: '120px', type: FormTypes.inputNumber, statistics: true },
           { title: '税率', key: 'taxRate', width: '120px', type: FormTypes.inputNumber, placeholder: '%' },
           {

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

@@ -479,7 +479,7 @@ export default {
             statistics: true,
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
-          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.inputNumber },
+          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.inputNumber,validateRules: [{ required: true, message: '${title}不能为空' }], },
           { title: '金额', key: 'allPrice', width: '120px', type: FormTypes.inputNumber, statistics: true },
 
           // {

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

@@ -435,7 +435,7 @@ export default {
             statistics: true,
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
-          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.inputNumber },
+          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.inputNumber,validateRules: [{ required: true, message: '${title}不能为空' }], },
           { title: '金额', key: 'allPrice', width: '120px', type: FormTypes.inputNumber, statistics: true },
           { title: '税率', key: 'taxRate', width: '120px', type: FormTypes.inputNumber, placeholder: '%' },
           {

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

@@ -536,7 +536,7 @@ export default {
             statistics: true,
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
-          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.inputNumber },
+          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.inputNumber,validateRules: [{ required: true, message: '${title}不能为空' }], },
           { title: '金额', key: 'allPrice', width: '120px', type: FormTypes.inputNumber, statistics: true },
           { title: '税率', key: 'taxRate', width: '120px', type: FormTypes.inputNumber, placeholder: '%' },
           {

jshERP-web/src/views/stock/components/stockModal.vue

@@ -178,7 +178,7 @@ export default {
       })
     },
     onChangeGoods() {
-      this.$refs.selectModal.queryParam.depotId = this.form.depotId
+      // this.$refs.selectModal.queryParam.depotId = this.form.depotId
       this.$refs.selectModal.showModal()
     },
     getList(id) {