fix:bug

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

@@ -514,11 +514,11 @@ export const BillModalMixin = {
       })
     },
     //默认采购价、销售价与当前采购价、销售价不一致
-    getDefaultWholesaleDecimal(index,key){
+    getDefaultWholesaleDecimal(index,key,value){
       if(this.materialTable.dataSource[index]&&this.materialTable.dataSource[index][key]){
-        return this.materialTable.dataSource[index][key]
+        return this.materialTable.dataSource[index][key] != value
       }
-      return undefined
+      return false
     },
     onChangePrice(e,callback){
       const { value } = e.target;

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

@@ -157,14 +157,14 @@
           <template #wholesaleDecimal="{ handleChange, value, index }">
             <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)" />
               </a-tooltip>
             </a-input>
           </template>
           <template #unitPrice="{ handleChange, value, index }">
             <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)" />
               </a-tooltip>
             </a-input>
           </template>

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

@@ -157,14 +157,14 @@
           <template #wholesaleDecimal="{ handleChange, value, index }">
             <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)" />
               </a-tooltip>
             </a-input>
           </template>
           <template #unitPrice="{ handleChange, value, index }">
             <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)" />
               </a-tooltip>
             </a-input>
           </template>

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

@@ -228,14 +228,14 @@
           <template #wholesaleDecimal="{ handleChange, value, index }">
             <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)" />
               </a-tooltip>
             </a-input>
           </template>
           <template #unitPrice="{ handleChange, value, index }">
             <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)" />
               </a-tooltip>
             </a-input>
           </template>

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

@@ -205,14 +205,14 @@
           <template #wholesaleDecimal="{ handleChange, value, index}">
             <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)" />
               </a-tooltip>
             </a-input>
           </template>
           <template #unitPrice="{ handleChange, value, index}">
             <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)" />
               </a-tooltip>
             </a-input>
           </template>

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

@@ -185,7 +185,7 @@
           <template #unitPrice="{ handleChange, value, index }">
             <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)" />
               </a-tooltip>
             </a-input>
           </template>

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

@@ -236,7 +236,7 @@
           <template #unitPrice="{ handleChange, value, index }">
             <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)" />
               </a-tooltip>
             </a-input>
           </template>

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

@@ -275,14 +275,10 @@ export default {
         model: '',
         color: '',
         brand: '',
-        // mfrs: '',
         materialOther: '',
         weight: '',
-        // expiryNum: '',
         enabled: undefined,
         enableSerialNumber: undefined,
-        // enableBatchNumber: undefined,
-        // position: '',
         reminder: undefined,
         remark: '',
         mpList: getMpListShort(Vue.ls.get('materialPropertyList')), //扩展属性
@@ -356,6 +352,8 @@ export default {
           width: 80,
           scopedSlots: { customRender: 'customRenderInitialStock' },
         },
+        { title: '默认采购价', dataIndex: 'defaultPurchaseDecimal', width: 100 },
+        { title: '默认销售价', dataIndex: 'defaultWholesaleDecimal', width: 100 },
         { title: '库存', dataIndex: 'stock', width: 80, scopedSlots: { customRender: 'customRenderStock' } },
         { title: '预警提示', dataIndex: 'reminder', width: 100, scopedSlots: { customRender: 'reminder' }},
         { title: '备注', dataIndex: 'remark', width: 80 },

jshERP-web/src/views/material/modules/MaterialModal.vue

@@ -583,6 +583,14 @@ export default {
             type: FormTypes.normal,
           },
           {
+            title: '期初库存',
+            key: 'number',
+            width: '15%',
+            type: FormTypes.inputNumber,
+            defaultValue: '',
+            placeholder: '请输入${title}',
+          },
+          {
             title: '库存总数量',
             key: 'currentStock',
             width: '15%',
@@ -809,7 +817,10 @@ export default {
       tab.loading = true
       getAction(url, params)
         .then((res) => {
-          tab.dataSource = res.data || []
+          tab.dataSource = (res.data || []).map(item => {
+            item.number = item.initStock
+            return item
+          })
           console.log('====================', res.data)
         })
         .finally(() => {