出入库提测

jshERP-web/package.json

@@ -36,6 +36,7 @@
     "vue-ls": "^3.2.0",
     "vue-photo-preview": "^1.1.3",
     "vue-print-nb-jeecg": "^1.0.9",
+    "vue-qr": "^4.0.9",
     "vue-router": "^3.0.1",
     "vue-splitpane": "^1.0.4",
     "vuedraggable": "^2.20.0",
@@ -114,4 +115,3 @@
     "not ie <= 10"
   ]
 }
-

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

@@ -434,7 +434,11 @@
                 {{ model.changeAmount }}
               </a-form-item>
             </a-col>
-            <a-col :span="6"></a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="二维码">
+                <vue-qr :text="model.number" :size="200" />
+              </a-form-item>
+            </a-col>
             <a-col :span="6"></a-col>
           </a-row>
         </section>
@@ -788,7 +792,11 @@
                 {{ model.changeAmount }}
               </a-form-item>
             </a-col>
-            <a-col :span="6"></a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="二维码">
+                <vue-qr :text="model.number" :size="200" />
+              </a-form-item>
+            </a-col>
             <a-col :span="6"></a-col>
           </a-row>
         </section>
@@ -1474,7 +1482,8 @@ import FinancialDetail from '../../financial/dialog/FinancialDetail'
 import JUpload from '@/components/jeecg/JUpload'
 import Vue from 'vue'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-
+// import QrcodeVue from 'qrcode.vue'
+import VueQr from 'vue-qr'
 export default {
   name: 'BillDetail',
   mixins: [JeecgListMixin],
@@ -1482,6 +1491,8 @@ export default {
     BillPrintIframe,
     FinancialDetail,
     JUpload,
+    // QrcodeVue,
+    VueQr,
   },
   data() {
     return {

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

@@ -212,7 +212,7 @@ export default {
           { title: '商品条码', key: 'barCode', width: '6%', type: FormTypes.normal },
           { title: '仓库名', key: 'depotName', width: '6%', type: FormTypes.normal },
           { title: '仓库货架', key: 'position', width: '6%', type: FormTypes.normal },
-          { title: '包装规格', key: 'unitName', width: '6%', type: FormTypes.input },
+          { title: '包装规格', key: 'unitName', width: '6%', type: FormTypes.normal },
 
           { title: '型号', key: 'model', width: '9%', type: FormTypes.normal },
           { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },

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

@@ -285,7 +285,7 @@ export default {
           { title: '商品条码', key: 'barCode', width: '9%', type: FormTypes.normal },
           { title: '仓库名', key: 'depotId', width: '9%', type: FormTypes.normal },
           { title: '仓库货架', key: 'position', width: '9%', type: FormTypes.normal },
-          { title: '包装规格', key: 'unitName', width: '9%', type: FormTypes.input },
+          { title: '包装规格', key: 'unitName', width: '9%', type: FormTypes.normal },
 
           { title: '型号', key: 'model', width: '9%', type: FormTypes.normal },
           { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },

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

@@ -284,7 +284,7 @@ export default {
           { title: '商品条码', key: 'barCode', width: '6%', type: FormTypes.normal },
           { title: '仓库名', key: 'depotName', width: '6%', type: FormTypes.normal },
           { title: '仓库货架', key: 'position', width: '6%', type: FormTypes.normal },
-          { title: '包装规格', key: 'unitName', width: '6%', type: FormTypes.input },
+          { title: '包装规格', key: 'unitName', width: '6%', type: FormTypes.normal },
 
           { title: '型号', key: 'model', width: '9%', type: FormTypes.normal },
           { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },

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

@@ -464,7 +464,7 @@ export default {
           { title: '商品条码', key: 'barCode', width: '6%', type: FormTypes.normal },
           { title: '仓库名', key: 'depotId', width: '6%', type: FormTypes.select, disabled: true },
           { title: '仓库货架', key: 'position', width: '6%', type: FormTypes.normal },
-          { title: '包装规格', key: 'unitName', width: '6%', type: FormTypes.input },
+          { title: '包装规格', key: 'unitName', width: '6%', type: FormTypes.normal },
 
           { title: '型号', key: 'model', width: '9%', type: FormTypes.normal },
           { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },

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

@@ -349,6 +349,7 @@ import { getMpListShort, changeListFmtMinus, handleIntroJs } from '@/utils/util'
 import JUpload from '@/components/jeecg/JUpload'
 import JDate from '@/components/jeecg/JDate'
 import Vue from 'vue'
+// import QrcodeVue from 'qrcode.vue'
 export default {
   name: 'PurchaseOrderModal',
   mixins: [JEditableTableMixin, BillModalMixin],
@@ -363,6 +364,7 @@ export default {
     BillPrintIframe,
     JUpload,
     JDate,
+    // QrcodeVue,
     VNodes: {
       functional: true,
       render: (h, ctx) => ctx.props.vnodes,

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

@@ -390,7 +390,7 @@ export default {
           { title: '商品条码', key: 'barCode', width: '6%', type: FormTypes.normal },
           { title: '仓库名', key: 'depotName', width: '6%', type: FormTypes.normal },
           { title: '仓库货架', key: 'position', width: '6%', type: FormTypes.normal },
-          { title: '包装规格', key: 'unitName', width: '6%', type: FormTypes.input },
+          { title: '包装规格', key: 'unitName', width: '6%', type: FormTypes.normal },
 
           { title: '型号', key: 'model', width: '9%', type: FormTypes.normal },
           { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },

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

@@ -459,16 +459,6 @@ export default {
         loading: false,
         dataSource: [],
         columns: [
-          // {
-          //   title: '仓库名称',
-          //   key: 'depotId',
-          //   width: '8%',
-          //   type: FormTypes.select,
-          //   placeholder: '请选择${title}',
-          //   options: [],
-          //   allowSearch: true,
-          //   validateRules: [{ required: true, message: '${title}不能为空' }],
-          // },
           {
             title: '批次号',
             key: 'batchNumber',
@@ -486,7 +476,7 @@ export default {
           { title: '商品条码', key: 'barCode', width: '6%', type: FormTypes.normal },
           { title: '仓库名', key: 'depotName', width: '6%', type: FormTypes.normal },
           { title: '仓库货架', key: 'position', width: '6%', type: FormTypes.normal },
-          { title: '包装规格', key: 'unitName', width: '6%', type: FormTypes.input },
+          { title: '包装规格', key: 'unitName', width: '6%', type: FormTypes.normal },
 
           { title: '型号', key: 'model', width: '9%', type: FormTypes.normal },
           { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },

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

@@ -24,7 +24,7 @@
             <a-input placeholder="请输入名称" v-decorator="['name', validatorRules.name]" />
           </a-form-item>
           <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="编号">
-            <a-input placeholder="请输入编号" v-decorator="['serialNo', validatorRules.serialNo]" />
+            <a-input disabled placeholder="请输入编号" v-decorator="['serialNo', validatorRules.serialNo]" />
           </a-form-item>
           <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级目录">
             <a-tree-select
@@ -87,7 +87,7 @@ export default {
         name: {
           rules: [{ required: true, message: '请输入名称!' }, { validator: this.validateName }],
         },
-        serialNo: { rules: [{ required: true, message: '请输入编号!' }] },
+        // serialNo: { rules: [{ required: true, message: '请输入编号!' }] },
       },
       url: {
         add: '/materialCategory/add',