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

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

@@ -514,9 +514,10 @@ export const BillModalMixin = {
       })
     },
     //默认采购价、销售价与当前采购价、销售价不一致
-    getDefaultWholesaleDecimal(index,key,value){
-      if(this.materialTable.dataSource[index]&&this.materialTable.dataSource[index][key]){
-        return this.materialTable.dataSource[index][key] != value
+    getDefaultWholesaleDecimal(index,key,value,allValues){
+      const obj = allValues.inputValues[index]
+      if(obj&&obj[key]){
+        return obj[key] != value
       }
       return false
     },

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

@@ -154,17 +154,17 @@
             >
             </a-select>
           </template>
-          <template #wholesaleDecimal="{ handleChange, value, index }">
+          <template #wholesaleDecimal="{ handleChange, value, index,allValues }">
             <a-input :value="value" @change="($event) => onChangePrice($event,handleChange)">
               <a-tooltip slot="suffix" title="修改后和默认价格不一致">
-                <a-icon type="info-circle" style="color: #f5222d" v-show="getDefaultWholesaleDecimal(index,'defaultWholesaleDecimal',value)" />
+                <a-icon type="info-circle" style="color: #f5222d" v-show="getDefaultWholesaleDecimal(index,'defaultWholesaleDecimal',value,allValues)" />
               </a-tooltip>
             </a-input>
           </template>
-          <template #unitPrice="{ handleChange, value, index }">
+          <template #unitPrice="{ handleChange, value, index,allValues }">
             <a-input :value="value" @change="($event) => onChangePrice($event,handleChange)">
               <a-tooltip slot="suffix" title="修改后和默认价格不一致">
-                <a-icon type="info-circle" style="color: #f5222d" v-show="getDefaultWholesaleDecimal(index,'defaultPurchaseDecimal',value)" />
+                <a-icon type="info-circle" style="color: #f5222d" v-show="getDefaultWholesaleDecimal(index,'defaultPurchaseDecimal',value,allValues)" />
               </a-tooltip>
             </a-input>
           </template>
@@ -380,6 +380,8 @@ export default {
           { title: '入库时间', key: 'warehousingTime', width: '200px', type: FormTypes.date },
           { title: '备注', key: 'remark', width: '200px', type: FormTypes.input },
           { title: '关联id', key: 'linkId', width: '120px', type: FormTypes.hidden },
+          { title: '默认销售价', key: 'defaultWholesaleDecimal', width: '120px', type: FormTypes.hidden },
+          { title: '默认采购价', key: 'defaultPurchaseDecimal', width: '120px', type: FormTypes.hidden },
         ],
       },
       confirmLoading: false,

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

@@ -154,17 +154,17 @@
             >
             </a-select>
           </template>
-          <template #wholesaleDecimal="{ handleChange, value, index }">
+          <template #wholesaleDecimal="{ handleChange, value, index,allValues }">
             <a-input :value="value" @change="($event) => onChangePrice($event,handleChange)">
               <a-tooltip slot="suffix" title="修改后和默认价格不一致">
-                <a-icon type="info-circle" style="color: #f5222d" v-show="getDefaultWholesaleDecimal(index,'defaultWholesaleDecimal',value)" />
+                <a-icon type="info-circle" style="color: #f5222d" v-show="getDefaultWholesaleDecimal(index,'defaultWholesaleDecimal',value,allValues)" />
               </a-tooltip>
             </a-input>
           </template>
-          <template #unitPrice="{ handleChange, value, index }">
+          <template #unitPrice="{ handleChange, value, index,allValues }">
             <a-input :value="value" @change="($event) => onChangePrice($event,handleChange)">
               <a-tooltip slot="suffix" title="修改后和默认价格不一致">
-                <a-icon type="info-circle" style="color: #f5222d" v-show="getDefaultWholesaleDecimal(index,'defaultPurchaseDecimal',value)" />
+                <a-icon type="info-circle" style="color: #f5222d" v-show="getDefaultWholesaleDecimal(index,'defaultPurchaseDecimal',value,allValues)" />
               </a-tooltip>
             </a-input>
           </template>
@@ -399,6 +399,8 @@ export default {
           { title: '出库时间', key: 'warehousingTime', width: '200px', type: FormTypes.date },
           { title: '备注', key: 'remark', width: '120px', type: FormTypes.input },
           { title: '关联id', key: 'linkId', width: '120px', type: FormTypes.hidden },
+          { title: '默认销售价', key: 'defaultWholesaleDecimal', width: '120px', type: FormTypes.hidden },
+          { title: '默认采购价', key: 'defaultPurchaseDecimal', width: '120px', type: FormTypes.hidden },
         ],
       },
       confirmLoading: false,

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

@@ -225,17 +225,17 @@
             >
             </a-select>
           </template>
-          <template #wholesaleDecimal="{ handleChange, value, index }">
+          <template #wholesaleDecimal="{ handleChange, value, index,allValues }">
             <a-input :value="value" @change="($event) => onChangePrice($event,handleChange)">
               <a-tooltip slot="suffix" title="修改后和默认价格不一致">
-                <a-icon type="info-circle" style="color: #f5222d" v-show="getDefaultWholesaleDecimal(index,'defaultWholesaleDecimal',value)" />
+                <a-icon type="info-circle" style="color: #f5222d" v-show="getDefaultWholesaleDecimal(index,'defaultWholesaleDecimal',value,allValues)" />
               </a-tooltip>
             </a-input>
           </template>
-          <template #unitPrice="{ handleChange, value, index }">
+          <template #unitPrice="{ handleChange, value, index,allValues }">
             <a-input :value="value" @change="($event) => onChangePrice($event,handleChange)">
               <a-tooltip slot="suffix" title="修改后和默认价格不一致">
-                <a-icon type="info-circle" style="color: #f5222d" v-show="getDefaultWholesaleDecimal(index,'defaultPurchaseDecimal',value)" />
+                <a-icon type="info-circle" style="color: #f5222d" v-show="getDefaultWholesaleDecimal(index,'defaultPurchaseDecimal',value,allValues)" />
               </a-tooltip>
             </a-input>
           </template>
@@ -587,6 +587,8 @@ export default {
 
           { title: '备注', key: 'remark', width: '200px', type: FormTypes.input },
           { title: '关联id', key: 'linkId', width: '120px', type: FormTypes.hidden },
+          { title: '默认销售价', key: 'defaultWholesaleDecimal', width: '120px', type: FormTypes.hidden },
+          { title: '默认采购价', key: 'defaultPurchaseDecimal', width: '120px', type: FormTypes.hidden },
         ],
       },
       confirmLoading: false,

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

@@ -202,17 +202,17 @@
             >
             </a-select>
           </template>
-          <template #wholesaleDecimal="{ handleChange, value, index}">
+          <template #wholesaleDecimal="{ handleChange, value, index, allValues}">
             <a-input :value="value" @change="($event) => onChangePrice($event,handleChange)">
               <a-tooltip slot="suffix" title="修改后和默认价格不一致">
-                <a-icon type="info-circle" style="color: #f5222d" v-if="getDefaultWholesaleDecimal(index,'defaultWholesaleDecimal',value)" />
+                <a-icon type="info-circle" style="color: #f5222d" v-if="getDefaultWholesaleDecimal(index,'defaultWholesaleDecimal',value,allValues)" />
               </a-tooltip>
             </a-input>
           </template>
-          <template #unitPrice="{ handleChange, value, index}">
+          <template #unitPrice="{ handleChange, value, index, allValues}">
             <a-input :value="value" @change="($event) => onChangePrice($event,handleChange)">
               <a-tooltip slot="suffix" title="修改后和默认价格不一致">
-                <a-icon type="info-circle" style="color: #f5222d" v-if="getDefaultWholesaleDecimal(index,'defaultPurchaseDecimal',value)" />
+                <a-icon type="info-circle" style="color: #f5222d" v-if="getDefaultWholesaleDecimal(index,'defaultPurchaseDecimal',value,allValues)" />
               </a-tooltip>
             </a-input>
           </template>
@@ -539,6 +539,8 @@ export default {
           { title: '价税合计', key: 'taxLastMoney', width: '120px', type: FormTypes.inputNumber,readonly: true, statistics: true },
           { title: '备注', key: 'remark', width: '200px', type: FormTypes.input },
           { title: '关联id', key: 'linkId', width: '120px', type: FormTypes.hidden },
+          { title: '默认销售价', key: 'defaultWholesaleDecimal', width: '120px', type: FormTypes.hidden },
+          { title: '默认采购价', key: 'defaultPurchaseDecimal', width: '120px', type: FormTypes.hidden },
         ],
       },
       confirmLoading: false,

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

@@ -182,10 +182,10 @@
             >
             </a-select>
           </template>
-          <template #unitPrice="{ handleChange, value, index }">
+          <template #unitPrice="{ handleChange, value, index,allValues }">
             <a-input :value="value" @change="($event) => onChangePrice($event,handleChange)">
               <a-tooltip slot="suffix" title="修改后和默认价格不一致">
-                <a-icon type="info-circle" style="color: #f5222d" v-show="getDefaultWholesaleDecimal(index,'defaultWholesaleDecimal',value)" />
+                <a-icon type="info-circle" style="color: #f5222d" v-show="getDefaultWholesaleDecimal(index,'defaultWholesaleDecimal',value, allValues)" />
               </a-tooltip>
             </a-input>
           </template>
@@ -511,6 +511,8 @@ export default {
 
           { title: '备注', key: 'remark', width: '200px', type: FormTypes.input },
           { title: '关联id', key: 'linkId', width: '120px', type: FormTypes.hidden },
+          { title: '默认销售价', key: 'defaultWholesaleDecimal', width: '120px', type: FormTypes.hidden },
+          { title: '默认采购价', key: 'defaultPurchaseDecimal', width: '120px', type: FormTypes.hidden },
         ],
       },
       confirmLoading: false,

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

@@ -233,10 +233,10 @@
               </a-tooltip>
             </a-input>
           </template> -->
-          <template #unitPrice="{ handleChange, value, index }">
+          <template #unitPrice="{ handleChange, value, index,allValues }">
             <a-input :value="value" @change="($event) => onChangePrice($event,handleChange)">
               <a-tooltip slot="suffix" title="修改后和默认价格不一致">
-                <a-icon type="info-circle" style="color: #f5222d" v-show="getDefaultWholesaleDecimal(index,'defaultWholesaleDecimal',value)" />
+                <a-icon type="info-circle" style="color: #f5222d" v-show="getDefaultWholesaleDecimal(index,'defaultWholesaleDecimal',value,allValues)" />
               </a-tooltip>
             </a-input>
           </template>
@@ -620,6 +620,8 @@ export default {
 
           { title: '备注', key: 'remark', width: '200px', type: FormTypes.input },
           { title: '关联id', key: 'linkId', width: '120px', type: FormTypes.hidden },
+          { title: '默认销售价', key: 'defaultWholesaleDecimal', width: '120px', type: FormTypes.hidden },
+          { title: '默认采购价', key: 'defaultPurchaseDecimal', width: '120px', type: FormTypes.hidden },
         ],
       },
       confirmLoading: false,