Jelajahi Sumber

fix:模版及生产日期等字段

maliang 12 jam lalu
induk
melakukan
4b2449bf51

TEMPAT SAMPAH
jshERP-web/public/doc/buy_sale_item_template.xls


TEMPAT SAMPAH
jshERP-web/public/doc/in_out_item_template.xls


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

@@ -236,7 +236,7 @@
     <vendor-modal ref="vendorModalForm" @ok="vendorModalFormOk"></vendor-modal>
     <vendor-modal ref="vendorModalForm" @ok="vendorModalFormOk"></vendor-modal>
     <depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
     <depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
     <batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
     <batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
-    <import-item-modal ref="importItemModalForm" @ok="importItemModalFormOk"></import-item-modal>
+    <import-item-modal ref="importItemModalForm" @ok="importItemModalFormOk" exportTitle="其它入库导入模版[下载]"></import-item-modal>
     <wait-bill-list ref="waitBillList" @ok="waitBillListOk"></wait-bill-list>
     <wait-bill-list ref="waitBillList" @ok="waitBillListOk"></wait-bill-list>
     <workflow-iframe ref="modalWorkflow" @ok="workflowModalFormOk"></workflow-iframe>
     <workflow-iframe ref="modalWorkflow" @ok="workflowModalFormOk"></workflow-iframe>
     <bill-print-iframe ref="modalPrint"></bill-print-iframe>
     <bill-print-iframe ref="modalPrint"></bill-print-iframe>
@@ -323,7 +323,7 @@ export default {
             title: '生产日期',
             title: '生产日期',
             key: 'productionDate',
             key: 'productionDate',
             width: '200px',
             width: '200px',
-            type: FormTypes.datetime,
+            type: FormTypes.date,
             validateRules: [{ required: true, message: '${title}不能为空' }],
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
           },
           { title: '保质期', key: 'expiryNum', width: '120px', type: FormTypes.normal },
           { title: '保质期', key: 'expiryNum', width: '120px', type: FormTypes.normal },
@@ -367,8 +367,8 @@ export default {
           },
           },
           { 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: '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,readonly: true, statistics: true },
-          { title: '入库差异', key: 'warehousingVariance', width: '120px', type: FormTypes.input },
-          { title: '入库差异原因', key: 'reasonOfDifference', width: '120px', type: FormTypes.input },
+          { title: '入库差异', key: 'warehousingVariance', width: '120px', type: FormTypes.hidden },
+          { title: '入库差异原因', key: 'reasonOfDifference', width: '120px', type: FormTypes.hidden },
           {
           {
             title: '入库人',
             title: '入库人',
             key: 'warehousingUser',
             key: 'warehousingUser',

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

@@ -242,7 +242,7 @@
     <customer-modal ref="customerModalForm" @ok="customerModalFormOk"></customer-modal>
     <customer-modal ref="customerModalForm" @ok="customerModalFormOk"></customer-modal>
     <depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
     <depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
     <batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
     <batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
-    <import-item-modal ref="importItemModalForm" @ok="importItemModalFormOk"></import-item-modal>
+    <import-item-modal ref="importItemModalForm" @ok="importItemModalFormOk" exportTitle="其它出库导入模版[下载]"></import-item-modal>
     <wait-bill-list ref="waitBillList" @ok="waitBillListOk"></wait-bill-list>
     <wait-bill-list ref="waitBillList" @ok="waitBillListOk"></wait-bill-list>
     <workflow-iframe ref="modalWorkflow" @ok="workflowModalFormOk"></workflow-iframe>
     <workflow-iframe ref="modalWorkflow" @ok="workflowModalFormOk"></workflow-iframe>
     <bill-print-iframe ref="modalPrint"></bill-print-iframe>
     <bill-print-iframe ref="modalPrint"></bill-print-iframe>
@@ -386,8 +386,8 @@ export default {
           //   type: FormTypes.inputNumber,
           //   type: FormTypes.inputNumber,
           //   validateRules: [{ required: true, message: '实际入库数量不能为空' }],
           //   validateRules: [{ required: true, message: '实际入库数量不能为空' }],
           // },
           // },
-          { title: '出库差异', key: 'warehousingVariance', width: '120px', type: FormTypes.inputNumber },
-          { title: '出库差异原因', key: 'reasonOfDifference', width: '120px', type: FormTypes.input },
+          { title: '出库差异', key: 'warehousingVariance', width: '120px', type: FormTypes.hidden },
+          { title: '出库差异原因', key: 'reasonOfDifference', width: '120px', type: FormTypes.hidden },
           {
           {
             title: '出库人',
             title: '出库人',
             key: 'warehousingUser',
             key: 'warehousingUser',

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

@@ -518,7 +518,7 @@ export default {
             title: '生产日期',
             title: '生产日期',
             key: 'productionDate',
             key: 'productionDate',
             width: '200px',
             width: '200px',
-            type: FormTypes.datetime,
+            type: FormTypes.date,
             validateRules: [{ required: true, message: '${title}不能为空' }],
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
           },
           { title: '保质期', key: 'expiryNum', width: '120px', type: FormTypes.normal },
           { title: '保质期', key: 'expiryNum', width: '120px', type: FormTypes.normal },
@@ -573,8 +573,8 @@ export default {
           },
           },
           { title: '价税合计', key: 'taxLastMoney', width: '120px', type: FormTypes.inputNumber,readonly: true, statistics: true },
           { title: '价税合计', key: 'taxLastMoney', width: '120px', type: FormTypes.inputNumber,readonly: true, statistics: true },
 
 
-          { title: '入库差异', key: 'warehousingVariance', width: '120px', type: FormTypes.inputNumber },
-          { title: '入库差异原因', key: 'reasonOfDifference', width: '120px', type: FormTypes.input },
+          { title: '入库差异', key: 'warehousingVariance', width: '120px', type: FormTypes.hidden },
+          { title: '入库差异原因', key: 'reasonOfDifference', width: '120px', type: FormTypes.hidden },
           {
           {
             title: '入库人',
             title: '入库人',
             key: 'warehousingUser',
             key: 'warehousingUser',

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

@@ -485,7 +485,7 @@ export default {
             title: '生产日期',
             title: '生产日期',
             key: 'productionDate',
             key: 'productionDate',
             width: '200px',
             width: '200px',
-            type: FormTypes.datetime,
+            type: FormTypes.date,
             validateRules: [{ required: true, message: '${title}不能为空' }],
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
           },
           { title: '保质期', key: 'expiryNum', width: '120px', type: FormTypes.normal },
           { title: '保质期', key: 'expiryNum', width: '120px', type: FormTypes.normal },

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

@@ -606,8 +606,8 @@ export default {
           //   type: FormTypes.inputNumber,
           //   type: FormTypes.inputNumber,
           //   validateRules: [{ required: true, message: '实际入库数量不能为空' }],
           //   validateRules: [{ required: true, message: '实际入库数量不能为空' }],
           // },
           // },
-          { title: '出库差异', key: 'warehousingVariance', width: '120px', type: FormTypes.inputNumber },
-          { title: '出库差异原因', key: 'reasonOfDifference', width: '120px', type: FormTypes.input },
+          { title: '出库差异', key: 'warehousingVariance', width: '120px', type: FormTypes.hidden },
+          { title: '出库差异原因', key: 'reasonOfDifference', width: '120px', type: FormTypes.hidden },
           {
           {
             title: '出库人',
             title: '出库人',
             key: 'warehousingUser',
             key: 'warehousingUser',