Merge branch 'xq' of http://121.40.253.172:3000/pengyue/jsh_erp into master_huangjunjie

jshERP-web/src/components/jeecg/JEditableTable.vue

@@ -481,7 +481,7 @@
 
                     <!-- update-begin-author:jsh date:20210308 for：popupJsh -->
                     <template v-else-if="col.type === formTypes.popupJsh">
-                      <div style="width: 190px" :key="i">
+                      <div style="width: 260px" :key="i">
                         <a-tooltip
                           :id="id"
                           placement="top"

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

@@ -217,7 +217,7 @@ export default {
         { dataIndex: 'productionDate', title: '生产日期' },
         { dataIndex: 'expiryNum', title: '保质期' },
         { dataIndex: 'barCode', title: '商品条码' },
-        { dataIndex: 'depotId', title: '仓库名称' },
+        { dataIndex: 'depotName', title: '仓库名称' },
         { dataIndex: 'position', title: '仓库货架' },
 
         // { dataIndex: 'expand', title: '扩展信息' },

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

@@ -175,6 +175,7 @@
               <a-tag v-if="status == '1'" color="green">已审核</a-tag>
               <a-tag v-if="status == '2'" color="cyan">完成销售</a-tag>
               <a-tag v-if="status == '3'" color="blue">部分销售</a-tag>
+              <a-tag v-if="status == '4'" color="blue">进行中</a-tag>
               <a-tag v-if="status == '9'" color="orange">审核中</a-tag>
             </template>
             <template slot="customRenderPurchaseStatus" slot-scope="purchaseStatus">

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

@@ -378,6 +378,8 @@ export const BillModalMixin = {
       this.initRetail(1)
     },
     batchSetDepotModalFormOk(depotId) {
+      console.log('22222222222222222211')
+
       this.getAllTable()
         .then((tables) => {
           return getListData(this.form, tables)
@@ -529,7 +531,7 @@ export const BillModalMixin = {
                 })
               } else {
                 //单个条码
-                let depotIdSelected = this.prefixNo !== 'CGDD' && this.prefixNo !== 'XSDD' ? row.depotId : ''
+                let depotIdSelected = row.depotId || ''
                 findStockByDepotAndBarCode({ depotId: depotIdSelected, barCode: row.batchNumber }).then((res) => {
                   if (res && res.code === 200) {
                     let mArr = []
@@ -545,7 +547,6 @@ export const BillModalMixin = {
                       values: mInfoEx,
                     }
                     mArr.push(mObj)
-
                     target.setValues(mArr)
                     target.recalcAllStatisticsColumns()
                     that.autoChangePrice(target)
@@ -742,6 +743,7 @@ export const BillModalMixin = {
         warehousingTime: mInfo.warehousingTime,
         unitId: mInfo.unitId,
         unitList: mInfo.unitList,
+        depotId: mInfo.depotId,
       }
     },
     //使得型号、颜色、扩展信息、sku等为隐藏

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

@@ -320,7 +320,6 @@ export default {
           { title: '单位id', key: 'unitId', width: '4%', type: FormTypes.hidden },
           { title: '单位列表', key: 'unitList', width: '5%', type: FormTypes.hidden },
           { title: '序列号', key: 'snList', width: '12%', type: FormTypes.popupJsh, kind: 'sn', multi: true },
-          { title: '批号', key: 'batchNumber', width: '7%', type: FormTypes.popupJsh, kind: 'batch', multi: false },
           { title: '有效期', key: 'expirationDate', width: '7%', type: FormTypes.input, readonly: true },
           { title: '多属性', key: 'sku', width: '9%', type: FormTypes.normal },
           { title: '原数量', key: 'preNumber', width: '4%', type: FormTypes.normal },

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

@@ -435,7 +435,7 @@ export default {
           { title: '生产日期', key: 'productionDate', width: '9%', type: FormTypes.normal },
           { title: '保质期', key: 'expiryNum', width: '6%', type: FormTypes.normal },
           { title: '商品条码', key: 'barCode', width: '6%', type: FormTypes.normal },
-          { title: '仓库名', key: 'depotName', width: '6%', type: FormTypes.normal },
+          { title: '仓库名', key: 'depotId', width: '9%', type: FormTypes.select, disabled: true },
           { title: '仓库货架', key: 'position', width: '6%', type: FormTypes.normal },
           { title: '包装规格', key: 'unitName', width: '6%', type: FormTypes.normal },
 
@@ -593,6 +593,7 @@ export default {
       this.initAccount(0)
       this.initPlatform()
       this.initQuickBtn()
+      this.initDepot()
     },
     /** 整理成formData */
     classifyIntoFormData(allValues) {
@@ -602,7 +603,7 @@ export default {
       billMain.type = '其它'
       billMain.subType = '采购订单'
       for (let item of detailArr) {
-        item.depotId = '' //订单不需要仓库
+        // item.depotId = '' //订单不需要仓库
         totalPrice += item.allPrice - 0
       }
       billMain.totalPrice = 0 - totalPrice
@@ -627,6 +628,7 @@ export default {
         billMain.id = this.model.id
       }
       billMain.status = this.billStatus
+
       return {
         info: JSON.stringify(billMain),
         rows: JSON.stringify(detailArr),

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

@@ -401,7 +401,7 @@ export default {
           { title: '生产日期', key: 'productionDate', width: '6%', type: FormTypes.normal },
           { title: '保质期', key: 'expiryNum', width: '6%', type: FormTypes.normal },
           { title: '商品条码', key: 'barCode', width: '6%', type: FormTypes.normal },
-          { title: '仓库名', key: 'depotName', width: '6%', type: FormTypes.normal },
+          { title: '仓库名', key: 'depotId', width: '9%', type: FormTypes.select, disabled: true },
           { title: '仓库货架', key: 'position', width: '6%', type: FormTypes.normal },
           { title: '包装规格', key: 'unitName', width: '6%', type: FormTypes.normal },
 
@@ -554,6 +554,7 @@ export default {
       this.initAccount(0)
       this.initPlatform()
       this.initQuickBtn()
+      this.initDepot()
     },
     //提交单据时整理成formData
     classifyIntoFormData(allValues) {
@@ -563,7 +564,7 @@ export default {
       billMain.type = '其它'
       billMain.subType = '销售订单'
       for (let item of detailArr) {
-        item.depotId = '' //订单不需要仓库
+        // item.depotId = '' //订单不需要仓库
         totalPrice += item.allPrice - 0
       }
       billMain.totalPrice = totalPrice