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

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

@@ -206,14 +206,14 @@ export default {
         { dataIndex: 'batchNumber', title: '批次号' },
         { dataIndex: 'name', title: '名称', scopedSlots: { customRender: 'customName' } },
         { dataIndex: 'categoryName', title: '类别' },
-        { dataIndex: 'standard', title: '规格' },
+        // { dataIndex: 'standard', title: '规格' },
         { dataIndex: 'model', title: '型号' },
         { dataIndex: 'color', title: '颜色' },
         { dataIndex: 'brand', title: '品牌' },
         { 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/mixins/newTableMixin.js

@@ -77,6 +77,8 @@ export const newTableMixin = {
           return '已完成'
         case 4:
           return '已取消'
+        case 5:
+          return '已更新'
         default:
           return ''
       }

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: [],
@@ -1611,7 +1626,7 @@ export default {
       purchaseOrderColumns: [
         { title: '批次号', dataIndex: 'batchNumber', width: 90 },
         { title: '名称', dataIndex: 'name', width: 115 },
-        { title: '规格', dataIndex: 'standard', width: 90 },
+        // { title: '规格', dataIndex: 'standard', width: 90 },
 
         { title: '生产日期', dataIndex: 'productionDate', width: 100 },
         { title: '保质期', dataIndex: 'expiryNum', width: 60 },
@@ -1650,7 +1665,7 @@ export default {
       purchaseInColumns: [
         { title: '批次号', dataIndex: 'batchNumber', width: 90 },
         { title: '名称', dataIndex: 'name', width: 115 },
-        { title: '规格', dataIndex: 'standard', width: 90 },
+        // { title: '规格', dataIndex: 'standard', width: 90 },
 
         { title: '生产日期', dataIndex: 'productionDate', width: 100 },
         { title: '保质期', dataIndex: 'expiryNum', width: 60 },
@@ -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 },
@@ -1716,7 +1731,7 @@ export default {
       saleOrderColumns: [
         { title: '批次号', dataIndex: 'batchNumber', width: 90 },
         { title: '名称', dataIndex: 'name', width: 115 },
-        { title: '规格', dataIndex: 'standard', width: 90 },
+        // { title: '规格', dataIndex: 'standard', width: 90 },
 
         { title: '生产日期', dataIndex: 'productionDate', width: 100 },
         { title: '保质期', dataIndex: 'expiryNum', width: 60 },
@@ -1725,7 +1740,7 @@ export default {
         { title: '仓库货架', dataIndex: 'position', width: 90 },
         { title: '包装规格', dataIndex: 'unitName', width: 90 },
 
-        { title: '规格', dataIndex: 'standard', width: 60 },
+        // { title: '规格', dataIndex: 'standard', width: 60 },
         { title: '型号', dataIndex: 'model', width: 60 },
         { title: '颜色', dataIndex: 'color', width: 60 },
         { title: '品牌', dataIndex: 'brand', width: 90 },
@@ -1756,7 +1771,7 @@ export default {
       saleOutColumns: [
         { title: '批次号', dataIndex: 'batchNumber', width: 90 },
         { title: '名称', dataIndex: 'name', width: 115 },
-        { title: '规格', dataIndex: 'standard', width: 90 },
+        // { title: '规格', dataIndex: 'standard', width: 90 },
 
         { title: '生产日期', dataIndex: 'productionDate', width: 100 },
         { title: '保质期', dataIndex: 'expiryNum', width: 60 },
@@ -1765,7 +1780,7 @@ export default {
         { title: '仓库货架', dataIndex: 'position', width: 90 },
         { title: '包装规格', dataIndex: 'unitName', width: 90 },
 
-        { title: '规格', dataIndex: 'standard', width: 60 },
+        // { title: '规格', dataIndex: 'standard', width: 60 },
         { title: '型号', dataIndex: 'model', width: 60 },
         { title: '颜色', dataIndex: 'color', width: 60 },
         { title: '品牌', dataIndex: 'brand', width: 90 },
@@ -1823,7 +1838,7 @@ export default {
       otherInColumns: [
         { title: '批次号', dataIndex: 'batchNumber', width: 90 },
         { title: '名称', dataIndex: 'name', width: 115 },
-        { title: '规格', dataIndex: 'standard', width: 90 },
+        // { title: '规格', dataIndex: 'standard', width: 90 },
 
         { title: '生产日期', dataIndex: 'productionDate', width: 100 },
         { title: '保质期', dataIndex: 'expiryNum', width: 60 },
@@ -1857,7 +1872,7 @@ export default {
       otherOutColumns: [
         { title: '批次号', dataIndex: 'batchNumber', width: 90 },
         { title: '名称', dataIndex: 'name', width: 115 },
-        { title: '规格', dataIndex: 'standard', width: 90 },
+        // { title: '规格', dataIndex: 'standard', width: 90 },
 
         { title: '生产日期', dataIndex: 'productionDate', width: 100 },
         { title: '保质期', dataIndex: 'expiryNum', width: 60 },
@@ -1866,7 +1881,7 @@ export default {
         { title: '仓库货架', dataIndex: 'position', width: 90 },
         { title: '包装规格', dataIndex: 'unitName', width: 90 },
 
-        { title: '规格', dataIndex: 'standard', width: 60 },
+        // { title: '规格', dataIndex: 'standard', width: 60 },
         { title: '型号', dataIndex: 'model', width: 60 },
         { title: '颜色', dataIndex: 'color', width: 60 },
         { title: '品牌', dataIndex: 'brand', width: 90 },
@@ -1893,7 +1908,7 @@ export default {
       allocationOutColumns: [
         { title: '批次号', dataIndex: 'batchNumber', width: 90 },
         { title: '名称', dataIndex: 'name', width: 115 },
-        { title: '规格', dataIndex: 'standard', width: 90 },
+        // { title: '规格', dataIndex: 'standard', width: 90 },
 
         { title: '生产日期', dataIndex: 'productionDate', width: 100 },
         { title: '保质期', dataIndex: 'expiryNum', width: 60 },
@@ -1902,7 +1917,7 @@ export default {
         { title: '仓库货架', dataIndex: 'position', width: 90 },
         { title: '包装规格', dataIndex: 'unitName', width: 90 },
 
-        { title: '规格', dataIndex: 'standard', width: 60 },
+        // { title: '规格', dataIndex: 'standard', width: 60 },
         { title: '型号', dataIndex: 'model', width: 60 },
         { title: '颜色', dataIndex: 'color', width: 60 },
         { title: '品牌', dataIndex: 'brand', 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)
@@ -2353,7 +2369,8 @@ export default {
           ds.operNumber,
           ds.unitPrice,
           ds.allPrice,
-          ds.remark
+          ds.remark,
+          ds.dept
         )
         list.push(item)
       }
@@ -2380,7 +2397,8 @@ export default {
           ds.preNumber,
           ds.finishNumber,
           ds.operNumber,
-          ds.remark
+          ds.remark,
+          ds.dept
         )
         list.push(item)
       }
@@ -2423,7 +2441,8 @@ export default {
           ds.taxRate,
           ds.taxMoney,
           ds.taxLastMoney,
-          ds.remark
+          ds.remark,
+          ds.dept
         )
         list.push(item)
       }
@@ -2467,7 +2486,8 @@ export default {
           ds.taxMoney,
           ds.taxLastMoney,
           ds.weight,
-          ds.remark
+          ds.remark,
+          ds.dept
         )
         list.push(item)
       }
@@ -2517,7 +2537,8 @@ export default {
           ds.operNumber,
           ds.unitPrice,
           ds.allPrice,
-          ds.remark
+          ds.remark,
+          ds.dept
         )
         list.push(item)
       }
@@ -2548,7 +2569,8 @@ export default {
           ds.operNumber,
           ds.unitPrice,
           ds.allPrice,
-          ds.remark
+          ds.remark,
+          ds.dept
         )
         list.push(item)
       }

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

@@ -80,6 +80,11 @@ export const BillModalMixin = {
     this.width = realScreenWidth < 1500 ? '1200px' : '1550px'
     this.minWidth = realScreenWidth < 1500 ? 1150 : 1500
   },
+  watch:{
+    $route(to, from) {
+      this.visible = false
+    }
+  },
   mounted() {
     document.getElementById(this.prefixNo).addEventListener('keydown', this.handleOkKey)
     this.getCreatorSpinnerList()
@@ -504,6 +509,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 +548,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/OtherInModal.vue

@@ -292,7 +292,7 @@ export default {
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
           { title: '名称', key: 'name', width: '9%', type: FormTypes.normal },
-          { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
+          // { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
 
           { title: '生产日期', key: 'productionDate', width: '9%', type: FormTypes.normal },
           { title: '保质期', key: 'expiryNum', width: '6%', type: FormTypes.normal },

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

@@ -293,7 +293,7 @@ export default {
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
           { title: '名称', key: 'name', width: '9%', type: FormTypes.normal },
-          { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
+          // { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
 
           { title: '生产日期', key: 'productionDate', width: '9%', type: FormTypes.normal, disabled: true },
           { title: '保质期', key: 'expiryNum', width: '6%', type: FormTypes.normal },

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',

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

@@ -396,7 +396,7 @@ export default {
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
           { title: '名称', key: 'name', width: '9%', type: FormTypes.normal },
-          { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
+          // { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
 
           { title: '生产日期', key: 'productionDate', width: '6%', type: FormTypes.normal },
           { title: '保质期', key: 'expiryNum', width: '6%', type: FormTypes.normal },

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

@@ -497,7 +497,7 @@ export default {
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
           { title: '名称', key: 'name', width: '9%', type: FormTypes.normal },
-          { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
+          // { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
 
           { title: '生产日期', key: 'productionDate', width: '9%', type: FormTypes.normal, disabled: true },
           { title: '保质期', key: 'expiryNum', width: '6%', type: FormTypes.normal },