fix:优化

jshERP-web/src/mixins/JeecgListMixin.js

@@ -72,7 +72,7 @@ export const JeecgListMixin = {
   },
   created() {
     if (this.isDesktop()) {
-      this.cardStyle = 'height:' + (document.documentElement.clientHeight - 100) + 'px'
+      this.cardStyle = 'min-height:' + (document.documentElement.clientHeight - 100) + 'px'
     }
     if (!this.disableMixinCreated) {
       //console.log(' -- mixin created -- ')

jshERP-web/src/views/bill/OtherInList.vue

@@ -1,7 +1,7 @@
 <template>
   <a-row :gutter="24">
     <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
         <!-- 查询区域 -->
         <div class="table-page-search-wrapper">
           <!-- 搜索区域 -->

jshERP-web/src/views/bill/PurchaseInList.vue

@@ -1,7 +1,7 @@
 <template>
   <a-row :gutter="24">
     <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
         <!-- 查询区域 -->
         <div class="table-page-search-wrapper">
           <!-- 搜索区域 -->

jshERP-web/src/views/bill/PurchaseOrderList.vue

@@ -1,7 +1,7 @@
 <template>
   <a-row :gutter="24">
     <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
         <!-- 查询区域 -->
         <div class="table-page-search-wrapper">
           <!-- 搜索区域 -->

jshERP-web/src/views/bill/SaleOrderList.vue

@@ -2,7 +2,7 @@
 <template>
   <a-row :gutter="24">
     <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
         <!-- 查询区域 -->
         <div class="table-page-search-wrapper">
           <!-- 搜索区域 -->

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

@@ -2064,7 +2064,6 @@ export default {
         { title: '批次号', dataIndex: 'batchNumber', width: 90 },
         { title: '名称', dataIndex: 'name', width: 115 },
         // { title: '规格', dataIndex: 'standard', width: 90 },
-
         { title: '生产日期', dataIndex: 'productionDate', width: 100 },
         { title: '保质期', dataIndex: 'expiryNum', width: 60 },
         { title: '商品条码', dataIndex: 'barCode', width: 90 },
@@ -2082,20 +2081,15 @@ export default {
         { title: '序列号', dataIndex: 'snList', width: 300 },
         { title: '有效期', dataIndex: 'expirationDate', width: 90 },
         { title: '多属性', dataIndex: 'sku', width: 90 },
-        { title: '数量', dataIndex: 'operNumber', width: 90 },
+        { title: '入库数量', dataIndex: 'operNumber', width: 90 },
         { title: '已入库', dataIndex: 'finishNumber', width: 90 },
         { title: '单价', dataIndex: 'unitPrice', width: 90 },
         { title: '金额', dataIndex: 'allPrice', width: 90 },
         { title: '税率(%)', dataIndex: 'taxRate', width: 90 },
         { title: '税额', dataIndex: 'taxMoney', width: 90 },
         { title: '价税合计', dataIndex: 'taxLastMoney', width: 90 },
-
-        { title: '实际入库数量', dataIndex: 'actualQuantityInStorage', width: 115 },
-        { title: '入库差异', dataIndex: 'warehousingVariance', width: 90 },
-        { title: '入库差异原因', dataIndex: 'reasonOfDifference', width: 115 },
         { title: '入库人', dataIndex: 'warehousingUserName', width: 90 },
         { title: '入库时间', dataIndex: 'warehousingTime', width: 90 },
-
         { title: '重量', dataIndex: 'weight', width: 90 },
         { title: '备注', dataIndex: 'remark', width: 90 },
       ],
@@ -2128,13 +2122,8 @@ export default {
         { title: '税率(%)', dataIndex: 'taxRate', width: 90 },
         { title: '税额', dataIndex: 'taxMoney', width: 90 },
         { title: '价税合计', dataIndex: 'taxLastMoney', width: 90 },
-
-        { title: '实际入库数量', dataIndex: 'actualQuantityInStorage', width: 115 },
-        { title: '入库差异', dataIndex: 'warehousingVariance', width: 90 },
-        { title: '入库差异原因', dataIndex: 'reasonOfDifference', width: 115 },
         { title: '入库人', dataIndex: 'warehousingUserName', width: 90 },
         { title: '入库时间', dataIndex: 'warehousingTime', width: 90 },
-
         { title: '重量', dataIndex: 'weight', width: 90 },
         { title: '备注', dataIndex: 'remark', width: 90 },
       ],
@@ -2170,8 +2159,6 @@ export default {
         { title: '名称', dataIndex: 'name', width: 115 },
         // { title: '规格', dataIndex: 'standard', width: 90 },
 
-        { title: '生产日期', dataIndex: 'productionDate', width: 100 },
-        { title: '保质期', dataIndex: 'expiryNum', width: 60 },
         { title: '商品条码', dataIndex: 'barCode', width: 90 },
         { title: '仓库名称', dataIndex: 'depotName', width: 90 },
         { title: '仓库货架', dataIndex: 'position', width: 90 },
@@ -2188,17 +2175,13 @@ export default {
         { title: '序列号', dataIndex: 'snList', width: 300 },
         { title: '有效期', dataIndex: 'expirationDate', width: 90 },
         { title: '多属性', dataIndex: 'sku', width: 90 },
-        { title: '数量', dataIndex: 'operNumber', width: 90 },
+        { title: '出库数量', dataIndex: 'operNumber', width: 90 },
         { title: '已出库', dataIndex: 'finishNumber', width: 90 },
         { title: '单价', dataIndex: 'unitPrice', width: 90 },
         { title: '金额', dataIndex: 'allPrice', width: 90 },
         { title: '税率(%)', dataIndex: 'taxRate', width: 90 },
         { title: '税额', dataIndex: 'taxMoney', width: 90 },
         { title: '价税合计', dataIndex: 'taxLastMoney', width: 90 },
-
-        { title: '实际出库数量', dataIndex: 'actualQuantityInStorage', width: 115 },
-        { title: '出库差异', dataIndex: 'warehousingVariance', width: 90 },
-        { title: '出库差异原因', dataIndex: 'reasonOfDifference', width: 115 },
         { title: '出库人', dataIndex: 'warehousingUserName', width: 90 },
         { title: '出库时间', dataIndex: 'warehousingTime', width: 90 },
 
@@ -2210,8 +2193,6 @@ export default {
         { title: '名称', dataIndex: 'name', width: 115 },
         // { title: '规格', dataIndex: 'standard', width: 90 },
 
-        { title: '生产日期', dataIndex: 'productionDate', width: 100 },
-        { title: '保质期', dataIndex: 'expiryNum', width: 60 },
         { title: '商品条码', dataIndex: 'barCode', width: 90 },
         { title: '仓库名称', dataIndex: 'depotName', width: 90 },
         { title: '仓库货架', dataIndex: 'position', width: 90 },
@@ -2228,20 +2209,15 @@ export default {
         { title: '序列号', dataIndex: 'snList', width: 300 },
         { title: '有效期', dataIndex: 'expirationDate', width: 90 },
         { title: '多属性', dataIndex: 'sku', width: 90 },
-        { title: '数量', dataIndex: 'operNumber', width: 90 },
+        { title: '出库数量', dataIndex: 'operNumber', width: 90 },
         { title: '已出库', dataIndex: 'finishNumber', width: 90 },
         { title: '单价', dataIndex: 'unitPrice', width: 90 },
         { title: '金额', dataIndex: 'allPrice', width: 90 },
         { title: '税率(%)', dataIndex: 'taxRate', width: 90 },
         { title: '税额', dataIndex: 'taxMoney', width: 90 },
         { title: '价税合计', dataIndex: 'taxLastMoney', width: 90 },
-
-        { title: '实际出库数量', dataIndex: 'actualQuantityInStorage', width: 115 },
-        { title: '出库差异', dataIndex: 'warehousingVariance', width: 90 },
-        { title: '出库差异原因', dataIndex: 'reasonOfDifference', width: 115 },
         { title: '出库人', dataIndex: 'warehousingUserName', width: 90 },
         { title: '出库时间', dataIndex: 'warehousingTime', width: 90 },
-
         { title: '重量', dataIndex: 'weight', width: 90 },
         { title: '备注', dataIndex: 'remark', width: 90 },
       ],
@@ -2294,25 +2270,17 @@ export default {
         { title: '序列号', dataIndex: 'snList', width: 300 },
         { title: '有效期', dataIndex: 'expirationDate', width: 90 },
         { title: '多属性', dataIndex: 'sku', width: 90 },
-        { title: '数量', dataIndex: 'operNumber', width: 90 },
+        { title: '入库数量', dataIndex: 'operNumber', width: 90 },
         { title: '单价', dataIndex: 'unitPrice', width: 90 },
         { title: '金额', dataIndex: 'allPrice', width: 90 },
-
-        { title: '实际入库数量', dataIndex: 'actualQuantityInStorage', width: 115 },
-        { title: '入库差异', dataIndex: 'warehousingVariance', width: 90 },
-        { title: '入库差异原因', dataIndex: 'reasonOfDifference', width: 115 },
         { title: '入库人', dataIndex: 'warehousingUserName', width: 90 },
         { title: '入库时间', dataIndex: 'warehousingTime', width: 90 },
-
         { title: '重量', dataIndex: 'weight', width: 90 },
       ],
       otherOutColumns: [
         { title: '批次号', dataIndex: 'batchNumber', width: 90 },
         { title: '名称', dataIndex: 'name', width: 115 },
         // { title: '规格', dataIndex: 'standard', width: 90 },
-
-        { title: '生产日期', dataIndex: 'productionDate', width: 100 },
-        { title: '保质期', dataIndex: 'expiryNum', width: 60 },
         { title: '商品条码', dataIndex: 'barCode', width: 90 },
         { title: '仓库名称', dataIndex: 'depotName', width: 90 },
         { title: '仓库货架', dataIndex: 'position', width: 90 },
@@ -2329,16 +2297,11 @@ export default {
         { title: '序列号', dataIndex: 'snList', width: 300 },
         { title: '有效期', dataIndex: 'expirationDate', width: 90 },
         { title: '多属性', dataIndex: 'sku', width: 90 },
-        { title: '数量', dataIndex: 'operNumber', width: 90 },
+        { title: '出库数量', dataIndex: 'operNumber', width: 90 },
         { title: '单价', dataIndex: 'unitPrice', width: 90 },
         { title: '金额', dataIndex: 'allPrice', width: 90 },
-
-        { title: '实际出库数量', dataIndex: 'actualQuantityInStorage', width: 115 },
-        { title: '出库差异', dataIndex: 'warehousingVariance', width: 90 },
-        { title: '出库差异原因', dataIndex: 'reasonOfDifference', width: 115 },
         { title: '出库人', dataIndex: 'warehousingUserName', width: 90 },
         { title: '出库时间', dataIndex: 'warehousingTime', width: 90 },
-
         { title: '重量', dataIndex: 'weight', width: 90 },
         { title: '备注', dataIndex: 'remark', width: 90 },
       ],
@@ -2369,8 +2332,6 @@ export default {
         { title: '金额', dataIndex: 'allPrice', width: 90 },
 
         { title: '实际出库数量', dataIndex: 'actualQuantityInStorage', width: 115 },
-        { title: '出库差异', dataIndex: 'warehousingVariance', width: 90 },
-        { title: '出库差异原因', dataIndex: 'reasonOfDifference', width: 115 },
         { title: '出库人', dataIndex: 'warehousingUserName', width: 90 },
         { title: '出库时间', dataIndex: 'warehousingTime', width: 90 },
 

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

@@ -83,14 +83,30 @@ export default {
   methods: {
     add(prefixNo) {
       this.prefixNo = prefixNo
-      if (prefixNo === 'QGD') {
-        this.tmpUrl = '/doc/apply_item_template.xls'
-      } else if (prefixNo === 'CGDD' || prefixNo === 'XSDD') {
-        this.tmpUrl = '/doc/order_item_template.xls'
-      } else if (prefixNo === 'CGRK' || prefixNo === 'XSCK') {
-        this.tmpUrl = '/doc/buy_sale_item_template.xls'
-      } else if (prefixNo === 'QTRK' || prefixNo === 'QTCK') {
-        this.tmpUrl = '/doc/in_out_item_template.xls'
+      switch (prefixNo) {
+        case 'QGD':
+          this.tmpUrl = '/doc/apply_item_template.xls'
+          break;
+        case 'CGDD':
+          this.tmpUrl = '/doc/cgdd_template.xls'
+          break;
+        case 'CGRK':
+          this.tmpUrl = '/doc/cgrk_template.xls'
+          break;
+        case 'XSDD':
+          this.tmpUrl = '/doc/xsdd_template.xls'
+          break;
+        case 'XSCK':
+          this.tmpUrl = '/doc/xsck_template.xls'
+          break;
+        case 'QTRK':
+          this.tmpUrl = '/doc/qtrk_template.xls'
+          break;
+        case 'QTCK':
+          this.tmpUrl = '/doc/qtck_template.xls'
+          break;
+        default:
+          break;
       }
       this.form.resetFields()
       this.model = Object.assign({}, {})

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

@@ -553,7 +553,7 @@ export const BillModalMixin = {
     onValueChange(event) {
       let that = this
       const { type, row, column, value, target } = event
-      let param, snList, batchNumber, operNumber, unitPrice, allPrice, taxRate, taxMoney, taxLastMoney
+      let param, snList, batchNumber, operNumber, unitPrice, allPrice, taxRate, taxMoney, taxLastMoney,ratio
       switch (column.key) {
         // case 'depotId':
         //   console.log('row========', row)
@@ -580,7 +580,8 @@ export const BillModalMixin = {
               for(let i = 0; i < mList.length; i++){
                 const rawInfo = mList[i]
                 const mObj = that.parseInfoToObj(rawInfo)
-                mObj.allPrice = ((mObj.unitPrice - 0)* (mObj.operNumber))
+                const ratio = mObj.ratio || 1
+                mObj.allPrice = ((mObj.unitPrice - 0)* ratio* (mObj.operNumber))
                 mObj.taxRate = formTaxRate || 0
                 mObj.taxMoney = (mObj.taxRate * 0.01 * mObj.allPrice).toFixed(2) - 0
                 mObj.taxLastMoney = (mObj.allPrice + mObj.taxMoney)
@@ -613,7 +614,8 @@ export const BillModalMixin = {
             operNumber = snArr.length
             taxRate = row.taxRate - 0 //税率
             unitPrice = row.unitPrice - 0 //单价
-            allPrice = (unitPrice * operNumber).toFixed(2) - 0
+            ratio = (row.ratio||1) - 0 //换算率
+            allPrice = (unitPrice * ratio *operNumber).toFixed(2) - 0
             taxMoney = (taxRate * 0.01 * allPrice).toFixed(2) - 0
             taxLastMoney = (allPrice + taxMoney).toFixed(2) - 0
             target.setValues([
@@ -630,7 +632,8 @@ export const BillModalMixin = {
           operNumber = value - 0
           taxRate = row.taxRate - 0 //税率
           unitPrice = row.unitPrice - 0 //单价
-          allPrice = (unitPrice * operNumber).toFixed(2) - 0
+          ratio = (row.ratio||1) - 0 //换算率
+          allPrice = (unitPrice * ratio * operNumber).toFixed(2) - 0
           taxMoney = (taxRate * 0.01 * allPrice).toFixed(2) - 0
           taxLastMoney = (allPrice + taxMoney).toFixed(2) - 0
           target.setValues([
@@ -643,7 +646,8 @@ export const BillModalMixin = {
           operNumber = row.operNumber - 0 //数量
           unitPrice = value - 0 //单价
           taxRate = row.taxRate - 0 //税率
-          allPrice = (unitPrice * operNumber).toFixed(2) - 0
+          ratio = (row.ratio||1) - 0 //换算率
+          allPrice = (unitPrice * ratio * operNumber).toFixed(2) - 0
           taxMoney = (taxRate * 0.01 * allPrice).toFixed(2) - 0
           taxLastMoney = (allPrice + taxMoney).toFixed(2) - 0
           target.setValues([
@@ -652,19 +656,19 @@ export const BillModalMixin = {
           target.recalcAllStatisticsColumns()
           that.autoChangePrice(target)
           break
-        case 'allPrice':
-          operNumber = row.operNumber - 0 //数量
-          taxRate = row.taxRate - 0 //税率
-          allPrice = value - 0
-          unitPrice = (allPrice / operNumber).toFixed(2) - 0 //单价
-          taxMoney = (taxRate * 0.01 * allPrice).toFixed(2) - 0
-          taxLastMoney = (allPrice + taxMoney).toFixed(2) - 0
-          target.setValues([
-            { rowKey: row.id, values: { unitPrice: unitPrice, taxMoney: taxMoney, taxLastMoney: taxLastMoney } },
-          ])
-          target.recalcAllStatisticsColumns()
-          that.autoChangePrice(target)
-          break
+        // case 'allPrice':
+        //   operNumber = row.operNumber - 0 //数量
+        //   taxRate = row.taxRate - 0 //税率
+        //   allPrice = value - 0
+        //   unitPrice = (allPrice / operNumber).toFixed(2) - 0 //单价
+        //   taxMoney = (taxRate * 0.01 * allPrice).toFixed(2) - 0
+        //   taxLastMoney = (allPrice + taxMoney).toFixed(2) - 0
+        //   target.setValues([
+        //     { rowKey: row.id, values: { unitPrice: unitPrice, taxMoney: taxMoney, taxLastMoney: taxLastMoney } },
+        //   ])
+        //   target.recalcAllStatisticsColumns()
+        //   that.autoChangePrice(target)
+        //   break
         // case 'taxRate':
         //   operNumber = row.operNumber - 0 //数量
         //   allPrice = row.allPrice - 0
@@ -697,21 +701,21 @@ export const BillModalMixin = {
         //   target.recalcAllStatisticsColumns()
         //   that.autoChangePrice(target)
         //   break
-        case 'unit':
-          // row.actualQuantityInStorage=
-          if (row.unitId) {
-            let arr = row.unitList
-            if (!Array.isArray(arr)) {
-              arr = JSON.parse(arr)
-            }
-            // for (let i of arr) {
-            //   if (i.name === value) {
-            //     target.setValues([{ rowKey: row.id, values: { unitName: i.name } }])
-            //   }
-            // }
-          }
+        // case 'unit':
+        //   // row.actualQuantityInStorage=
+        //   if (row.unitId) {
+        //     let arr = row.unitList
+        //     if (!Array.isArray(arr)) {
+        //       arr = JSON.parse(arr)
+        //     }
+        //     // for (let i of arr) {
+        //     //   if (i.name === value) {
+        //     //     target.setValues([{ rowKey: row.id, values: { unitName: i.name } }])
+        //     //   }
+        //     // }
+        //   }
 
-          target.$forceUpdate()
+        //   target.$forceUpdate()
       }
     },
     //转为商品对象
@@ -727,7 +731,7 @@ export const BillModalMixin = {
         unit: mInfo.commodityUnit,
         sku: mInfo.sku,
         operNumber: 1,
-        unitPrice: mInfo.billPrice * (mInfo.ratio||1), //单价
+        unitPrice: mInfo.billPrice, //单价
         wholesaleDecimal:mInfo.defaultWholesaleDecimal, //销售价
         defaultWholesaleDecimal: mInfo.defaultWholesaleDecimal, //默认销售价 不展示
         defaultPurchaseDecimal: mInfo.defaultPurchaseDecimal, //默认采购价 不展示

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

@@ -366,7 +366,7 @@ export default {
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
           { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(([0-9][0-9]*)|([0]\.\d{0,4}|[0-9][0-9]*\.\d{0,4}))$/, message: '金额格式不正确!' }], },
-          { title: '金额', key: 'allPrice', width: '120px', type: FormTypes.inputNumber,readonly: true, statistics: true },
+          { title: '金额', key: 'allPrice', width: '120px', type: FormTypes.inputNumber,disabled: true, statistics: true },
           { title: '入库差异', key: 'warehousingVariance', width: '120px', type: FormTypes.hidden },
           { title: '入库差异原因', key: 'reasonOfDifference', width: '120px', type: FormTypes.hidden },
           {
@@ -382,6 +382,7 @@ export default {
           { 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 },
+          { title: '单位换算比例', key: 'ratio', width: '120px', type: FormTypes.hidden },
         ],
       },
       confirmLoading: false,

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

@@ -378,7 +378,7 @@ export default {
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
           { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(([0-9][0-9]*)|([0]\.\d{0,4}|[0-9][0-9]*\.\d{0,4}))$/, message: '金额格式不正确!' }], },
-          { title: '金额', key: 'allPrice', width: '120px', type: FormTypes.inputNumber, readonly: true, statistics: true },
+          { title: '金额', key: 'allPrice', width: '120px', type: FormTypes.inputNumber, disabled: true, statistics: true },
           // {
           //   title: '实际出库数量',
           //   key: 'actualQuantityInStorage',
@@ -401,6 +401,7 @@ export default {
           { 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 },
+          { title: '单位换算比例', key: 'ratio', width: '120px', type: FormTypes.hidden },
         ],
       },
       confirmLoading: false,

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

@@ -291,7 +291,7 @@
               data-title="优惠后金额"
               data-intro="针对单据明细中商品总金额进行优惠后的金额"
             >
-              <a-input placeholder="请输入优惠后金额" v-decorator.trim="['discountLastMoney']" :readOnly="true" />
+              <a-input placeholder="请输入优惠后金额" v-decorator.trim="['discountLastMoney']" :disabled="true" />
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :sm="24">
@@ -380,7 +380,7 @@
               <a-input
                 placeholder="请输入本次欠款"
                 v-decorator.trim="['debt', validatorRules.price]"
-                :readOnly="true"
+                :disabled="true"
               />
             </a-form-item>
           </a-col>
@@ -561,17 +561,17 @@ export default {
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
           { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(([0-9][0-9]*)|([0]\.\d{0,4}|[0-9][0-9]*\.\d{0,4}))$/, message: '金额格式不正确!' }], },
-          { title: '金额', key: 'allPrice', width: '120px', type: FormTypes.inputNumber, readonly: true, statistics: true },
+          { title: '金额', key: 'allPrice', width: '120px', type: FormTypes.inputNumber, disabled: true, statistics: true },
           { title: '税率', key: 'taxRate', width: '120px', type: FormTypes.hidden, placeholder: '%' },
           {
             title: '税额',
             key: 'taxMoney',
             width: '120px',
             type: FormTypes.inputNumber,
-            readonly: true,
+            disabled: true,
             statistics: true,
           },
-          { title: '价税合计', key: 'taxLastMoney', width: '120px', type: FormTypes.inputNumber,readonly: true, statistics: true },
+          { title: '价税合计', key: 'taxLastMoney', width: '120px', type: FormTypes.inputNumber,disabled: true, statistics: true },
 
           { title: '入库差异', key: 'warehousingVariance', width: '120px', type: FormTypes.hidden },
           { title: '入库差异原因', key: 'reasonOfDifference', width: '120px', type: FormTypes.hidden },
@@ -589,6 +589,7 @@ export default {
           { 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 },
+          { title: '单位换算比例', key: 'ratio', width: '120px', type: FormTypes.hidden },
         ],
       },
       confirmLoading: false,

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

@@ -285,7 +285,7 @@
               data-title="优惠后金额"
               data-intro="针对单据明细中商品总金额进行优惠后的金额"
             >
-              <a-input placeholder="请输入优惠后金额" v-decorator.trim="['discountLastMoney']" :readOnly="true" />
+              <a-input placeholder="请输入优惠后金额" v-decorator.trim="['discountLastMoney']" disabled />
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :sm="24"></a-col>
@@ -518,7 +518,7 @@ export default {
           { title: '原数量', key: 'preNumber', width: '120px', type: FormTypes.normal },
           { title: '已采购', key: 'finishNumber', width: '120px', type: FormTypes.normal },
           {
-            title: '数量',
+            title: '入库数量',
             key: 'operNumber',
             width: '120px',
             type: FormTypes.inputNumber,
@@ -526,21 +526,22 @@ export default {
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
           { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(([0-9][0-9]*)|([0]\.\d{0,4}|[0-9][0-9]*\.\d{0,4}))$/, message: '金额格式不正确!' }], },
-          { title: '金额', key: 'allPrice', width: '120px', type: FormTypes.inputNumber, readonly: true, statistics: true },
+          { title: '金额', key: 'allPrice', width: '120px', type: FormTypes.inputNumber, disabled: true, statistics: true, },
           { title: '税率', key: 'taxRate', width: '120px', type: FormTypes.hidden, placeholder: '%' },
           {
             title: '税额',
             key: 'taxMoney',
             width: '120px',
             type: FormTypes.inputNumber,
-            readonly: true,
+            disabled: true,
             statistics: true,
           },
-          { title: '价税合计', key: 'taxLastMoney', width: '120px', type: FormTypes.inputNumber,readonly: true, statistics: true },
+          { title: '价税合计', key: 'taxLastMoney', width: '120px', type: FormTypes.inputNumber,disabled: 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 },
+          { title: '单位换算比例', key: 'ratio', width: '120px', type: FormTypes.hidden },
         ],
       },
       confirmLoading: false,

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

@@ -258,7 +258,7 @@
               data-title="优惠后金额"
               data-intro="针对单据明细中商品总金额进行优惠后的金额"
             >
-              <a-input placeholder="请输入优惠后金额" v-decorator.trim="['discountLastMoney']" :readOnly="true" />
+              <a-input placeholder="请输入优惠后金额" v-decorator.trim="['discountLastMoney']" :disabled="true" />
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :sm="24"></a-col>
@@ -479,17 +479,17 @@ export default {
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
           { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(([0-9][0-9]*)|([0]\.\d{0,4}|[0-9][0-9]*\.\d{0,4}))$/, message: '金额格式不正确!' }], },
-          { title: '金额', key: 'allPrice', width: '120px', type: FormTypes.inputNumber, readonly: true, statistics: true },
+          { title: '金额', key: 'allPrice', width: '120px', type: FormTypes.inputNumber, disabled: true, statistics: true },
           { title: '税率', key: 'taxRate', width: '120px', type: FormTypes.hidden, placeholder: '%' },
           {
             title: '税额',
             key: 'taxMoney',
             width: '120px',
             type: FormTypes.inputNumber,
-            readonly: true,
+            disabled: true,
             statistics: true,
           },
-          { title: '价税合计', key: 'taxLastMoney', width: '120px', type: FormTypes.inputNumber, readonly: true, statistics: true },
+          { title: '价税合计', key: 'taxLastMoney', width: '120px', type: FormTypes.inputNumber, disabled: true, statistics: true },
 
           // {
           //   title: '实际出库数量',
@@ -513,6 +513,7 @@ export default {
           { 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 },
+          { title: '单位换算比例', key: 'ratio', width: '120px', type: FormTypes.hidden },
         ],
       },
       confirmLoading: false,

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

@@ -292,7 +292,7 @@
               data-title="优惠后金额"
               data-intro="针对单据明细中商品总金额进行优惠后的金额"
             >
-              <a-input placeholder="请输入优惠后金额" v-decorator.trim="['discountLastMoney']" :readOnly="true" />
+              <a-input placeholder="请输入优惠后金额" v-decorator.trim="['discountLastMoney']" disabled />
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :sm="24">
@@ -380,7 +380,7 @@
               <a-input
                 placeholder="请输入本次欠款"
                 v-decorator.trim="['debt', validatorRules.price]"
-                :readOnly="true"
+                disabled
               />
             </a-form-item>
           </a-col>
@@ -587,17 +587,17 @@ export default {
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
           { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(([0-9][0-9]*)|([0]\.\d{0,4}|[0-9][0-9]*\.\d{0,4}))$/, message: '金额格式不正确!' }], },
-          { title: '金额', key: 'allPrice', width: '120px', type: FormTypes.inputNumber,readonly: true, statistics: true },
+          { title: '金额', key: 'allPrice', width: '120px', type: FormTypes.inputNumber,disabled: true, statistics: true },
           { title: '税率', key: 'taxRate', width: '120px', type: FormTypes.hidden, placeholder: '%' },
           {
             title: '税额',
             key: 'taxMoney',
             width: '120px',
             type: FormTypes.inputNumber,
-            readonly: true,
+            disabled: true,
             statistics: true,
           },
-          { title: '价税合计', key: 'taxLastMoney', width: '120px', type: FormTypes.inputNumber, readonly: true, statistics: true },
+          { title: '价税合计', key: 'taxLastMoney', width: '120px', type: FormTypes.inputNumber, disabled: true, statistics: true },
 
           // {
           //   title: '实际出库数量',
@@ -622,6 +622,7 @@ export default {
           { 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 },
+          { title: '单位换算比例', key: 'ratio', width: '120px', type: FormTypes.hidden },
         ],
       },
       confirmLoading: false,

jshERP-web/src/views/system/VendorList.vue

@@ -83,6 +83,10 @@
             <template slot="invoiceType" slot-scope="text, record">
               {{ formateInVoiceType(record.invoiceType) }}
             </template>
+            <template slot="billingCycleDays" slot-scope="text, record">
+              <span v-if="record.billingCycleDays==1">先款后货</span>
+              <span v-if="record.billingCycleDays==2">先货后款</span>
+            </template>
           </a-table>
         </div>
         <!-- table区域-end -->
@@ -151,7 +155,7 @@ export default {
         { title: '联系人', dataIndex: 'contacts', width: 70, align: 'left' },
         { title: '手机号码', dataIndex: 'telephone', width: 100, align: 'left' },
         { title: '联系电话', dataIndex: 'phoneNum', width: 100, align: 'left' },
-        { title: '电子邮箱', dataIndex: 'email', width: 150, align: 'left' },
+        // { title: '电子邮箱', dataIndex: 'email', width: 150, align: 'left' },
         { title: '税率(%)', dataIndex: 'taxRate', width: 80, align: 'left' },
         { title: '是否支持售后', dataIndex: 'isAfterSales', width: 110, align: 'left',customRender: function (t, r, index) {
             switch (r.isAfterSales) {
@@ -172,7 +176,7 @@ export default {
           align: 'left',
           scopedSlots: { customRender: 'settlementMethod' },
         },
-        { title: '付款方式', dataIndex: 'billingCycleDays', width: 80, align: 'left' },
+        { title: '付款方式', dataIndex: 'billingCycleDays', width: 80, align: 'left',scopedSlots: { customRender: 'billingCycleDays' }, },
         { title: '采购对接人', dataIndex: 'procurementContact', width: 100, align: 'left' },
         { title: '到货天数', dataIndex: 'deliveryDays', width: 80, align: 'left' },
         {
@@ -216,7 +220,7 @@ export default {
     },
     handleImportXls() {
       let importExcelUrl = this.url.importExcelUrl
-      let templateUrl = '/doc/vendor_template.xls'
+      let templateUrl = '/doc/gys_template.xls'
       let templateName = '供应商Excel模板[下载]'
       this.$refs.modalImportForm.initModal(importExcelUrl, templateUrl, templateName)
       this.$refs.modalImportForm.title = '供应商导入'

jshERP-web/src/views/system/modules/VendorModal.vue

@@ -97,8 +97,8 @@
                   v-decorator.trim="['billingCycleDays']"
                   placeholder="请选择付款方式"
                 >
-                  <a-select-option value="先款后货">先款后货</a-select-option>
-                  <a-select-option value="先货后款">先货后款</a-select-option>
+                  <a-select-option :value="1">先款后货</a-select-option>
+                  <a-select-option :value="2">先货后款</a-select-option>
                 </a-select>
               </a-form-item>
             </a-col>