fix:bug

jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue

@@ -213,7 +213,7 @@ export default {
         { dataIndex: 'supplierName', title: '供应商' },
         { dataIndex: 'unit', title: '单位' },
         { dataIndex: 'sku', title: '多属性' },
-        { dataIndex: 'stock', title: '库存' },
+        { dataIndex: 'inventory', title: '库存' },
         { dataIndex: 'productionDate', title: '生产日期' },
         { dataIndex: 'expiryNum', title: '保质期' },
         { dataIndex: 'barCode', title: '商品条码' },

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

@@ -1471,6 +1471,20 @@
           <a-col :span="14"></a-col>
         </a-row>
       </template>
+      <template v-if="fileList && fileList.length > 0">
+        <a-row class="form-row" :gutter="24">
+          <a-col :span="10">
+            <a-form-item
+              :labelCol="{ xs: { span: 24 }, sm: { span: 3 } }"
+              :wrapperCol="{ xs: { span: 24 }, sm: { span: 21 } }"
+              label="凭证图片"
+            >
+              <j-upload v-model="voucherPictureList" bizPath="bill" :disabled="true" :buttonVisible="false"></j-upload>
+            </a-form-item>
+          </a-col>
+          <a-col :span="14"></a-col>
+        </a-row>
+      </template>
     </a-form>
     <bill-print-iframe ref="modalDetail"></bill-print-iframe>
     <financial-detail ref="financialDetailModal"></financial-detail>
@@ -1515,6 +1529,7 @@ export default {
       billType: '',
       billPrintFlag: false,
       fileList: [],
+      voucherPictureList: [],
       purchaseBySaleFlag: false,
       linkNumberList: [],
       financialBillNoList: [],
@@ -1664,7 +1679,7 @@ export default {
         { title: '品牌', dataIndex: 'brand', width: 90 },
         { title: '制造商', dataIndex: 'mfrs', width: 90 },
         { title: '扩展信息', dataIndex: 'materialOther', width: 90 },
-        { title: '库存', dataIndex: 'stock', width: 90 },
+        { title: '库存', dataIndex: 'inventory', width: 90 },
         { title: '单位', dataIndex: 'unit', width: 90 },
         { title: '序列号', dataIndex: 'snList', width: 300 },
         { title: '有效期', dataIndex: 'expirationDate', width: 90 },
@@ -1680,7 +1695,7 @@ export default {
         { title: '实际入库数量', dataIndex: 'actualQuantityInStorage', width: 115 },
         { title: '入库差异', dataIndex: 'warehousingVariance', width: 90 },
         { title: '入库差异原因', dataIndex: 'reasonOfDifference', width: 115 },
-        { title: '入库人', dataIndex: 'warehousingUser', width: 90 },
+        { title: '入库人', dataIndex: 'warehousingUserName', width: 90 },
         { title: '入库时间', dataIndex: 'warehousingTime', width: 90 },
 
         { title: '重量', dataIndex: 'weight', width: 90 },
@@ -2194,6 +2209,7 @@ export default {
           this.prefixNo = prefixNo
           //附件下载
           this.fileList = item.fileName
+          this.voucherPictureList = item.voucherPicture?item.voucherPicture.split(','):[] //凭证图片
           this.visible = true
           this.modalStyle = 'top:20px;height: 95%;'
           this.model = Object.assign({}, item)

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

@@ -504,6 +504,7 @@ export const BillModalMixin = {
                     let mObj = this.parseInfoToObj(mInfo)
                     mObj.depotId = mInfo.depotId
                     mObj.stock = mInfo.stock
+                    mObj.inventory = mInfo.inventory
                     mArr.push(mObj)
                   }
                   let allPriceTotal = 0
@@ -542,6 +543,7 @@ export const BillModalMixin = {
                     this.changeColumnShow(mInfo)
                     let mInfoEx = this.parseInfoToObj(mInfo)
                     mInfoEx.stock = res.data.stock
+                    mInfoEx.inventory = mInfo.inventory
                     let mObj = {
                       rowKey: row.id,
                       values: mInfoEx,

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

@@ -486,7 +486,7 @@ export default {
           { title: '品牌', key: 'brand', width: '9%', type: FormTypes.normal },
           { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
           { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
-          { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
+          { title: '库存', key: 'inventory', width: '5%', type: FormTypes.normal },
           {
             title: '单位',
             key: 'unit',

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

@@ -444,7 +444,7 @@ export default {
           { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
           { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
           { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
-          { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
+          { title: '库存', key: 'inventory', width: '5%', type: FormTypes.normal },
           {
             title: '单位',
             key: 'unit',