Merge branch 'dev' of https://gitee.com/jishenghua/JSH_ERP into dev

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

@@ -131,9 +131,13 @@
       loadData(arg) {
         if(this.rows) {
           if(JSON.parse(this.rows).depotId && JSON.parse(this.rows).barCode ){
-            let depotItemId = JSON.parse(this.rows).id
+            let isEdit = JSON.parse(this.rows).isEdit
-            if(depotItemId.length<=19) {
+            if(isEdit) {
-              this.queryParam.depotItemId = depotItemId-0
+              //只有在保存之后的编辑页面下才获取明细id
+              let depotItemId = JSON.parse(this.rows).id
+              if (depotItemId.length <= 19) {
+                this.queryParam.depotItemId = depotItemId-0
+              }
             }
             this.queryParam.depotId = JSON.parse(this.rows).depotId-0
             this.queryParam.barCode = JSON.parse(this.rows).barCode
@@ -176,9 +180,13 @@
           if(this.rows) {
             this.queryParam.name=''
             if(JSON.parse(this.rows).depotId && JSON.parse(this.rows).barCode ){
-              let depotItemId = JSON.parse(this.rows).id
+              let isEdit = JSON.parse(this.rows).isEdit
-              if(depotItemId.length<=19) {
+              if(isEdit) {
-                this.queryParam.depotItemId = depotItemId-0
+                //只有在保存之后的编辑页面下才获取明细id
+                let depotItemId = JSON.parse(this.rows).id
+                if(depotItemId.length<=19) {
+                  this.queryParam.depotItemId = depotItemId-0
+                }
               }
               this.queryParam.depotId = JSON.parse(this.rows).depotId-0
               this.queryParam.barCode = JSON.parse(this.rows).barCode

jshERP-web/src/components/layouts/UserLayout.vue

@@ -12,7 +12,7 @@
                 <a-col>
                   <a href="/">
                     <span class="title">{{systemTitle}}</span>
-                    <small class="desc">V3.3</small>
+                    <small class="desc">V3.5</small>
                   </a>
                 </a-col>
               </a-row>

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

@@ -143,6 +143,7 @@ export const BillModalMixin = {
           tab.dataSource = res.data.rows
           for(let i=0; i<tab.dataSource.length; i++){
             let info = tab.dataSource[i]
+            info.isEdit = this.model.id?1:0
             this.changeColumnShow(info)
           }
           typeof success === 'function' ? success(res) : ''
@@ -534,9 +535,12 @@ export const BillModalMixin = {
         case "batchNumber":
           batchNumber = value
           let depotItemId = ''
-          let rowId = row.id
+          if(this.model.id) {
-          if(rowId.length<=19) {
+            //只有在保存之后的编辑页面下才获取明细id
-            depotItemId = rowId-0
+            let rowId = row.id
+            if(rowId.length<=19) {
+              depotItemId = rowId-0
+            }
           }
           getBatchNumberList({name:'', depotItemId: depotItemId, depotId: row.depotId, barCode: row.barCode, batchNumber: batchNumber}).then((res) => {
             if (res && res.code === 200) {

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

@@ -266,6 +266,7 @@
             { title: '价税合计', key: 'taxLastMoney', width: '7%', type: FormTypes.inputNumber, statistics: true },
             { title: '备注', key: 'remark', width: '6%', type: FormTypes.input },
             { title: '关联id', key: 'linkId', width: '5%', type: FormTypes.hidden },
+            { title: '是否再次编辑', key: 'isEdit', width: '5%', type: FormTypes.hidden },
           ]
         },
         confirmLoading: false,

jshERP-web/src/views/dashboard/IndexChart.vue

@@ -133,7 +133,7 @@
               </div>
               <a-button type="link" v-if="showWeixinSpan()">管伊佳ERP微信小程序</a-button>
             </a-popover>
-            &copy; 2015-2030 {{systemTitle}} V3.3
+            &copy; 2015-2030 {{systemTitle}} V3.5
           </div>
           <a-tag v-if="tenant.type==0" color="blue">试用到期：{{tenant.expireTime}}</a-tag>
           <a-tag v-if="tenant.type==0" color="blue">试用用户：{{tenant.userCurrentNum}}/{{tenant.userNumLimit}}</a-tag>