Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-mini-web

src/config/index.js

@@ -405,6 +405,7 @@ export default {
     ordStatus: '订单状态',
     intoStatus: '入库状态',
     outStatus: '出库状态',
+    transferStatus:'调整类型',
   },
 
   /**

src/locale/lang/zh-CN.js

@@ -512,7 +512,7 @@ export const columns = {
   transferStaff:'调整员工',
   transferOrg:'调整部门',
   transferNo:'调整单号',
-  transferStatusName:'调整状态',
+  transferStatusName:'调整类型',
   amtNotHandle:'未核销金额',
   sumUseReceiptResidue:'预收抵扣',
   sumAmtReceivableHandle: '本次核销总额',
@@ -854,6 +854,8 @@ export const messages = {
   W_132: '普通商品输入的{param1}不能大于{param2}，请重新输入',
   W_133: '外协商品{param}不允许为0',
   W_134: '外协商品输入的{param1}不能大于{param2}，请重新输入',
+  W_135: '目标库区不能和源库区一致',
+  W_136: '目标色号不能和源色号一致',
 
   E_001: '系统出现异常，请联系管理员。',
   Q_001: '当前页面的数据有过更改，请确认需要保存吗？',

src/view/ivt/ivt-transfer/form.vue

@@ -455,6 +455,13 @@ export default {
         this.$Message.warning(this.$t('W_012'))
         return false;
       }
+
+      // 调整数量不能为空
+      if (this.$refs.goodsTable.tableData.some(s => !s.transferQty)) {
+        this.$Message.warning(this.$t('W_042', {'param': this.$t('transferQty')}))
+        return false;
+      }
+
       for (let it of itemTable){
         //冻结量不能为空或零
         if (it.transferQty > 0 && (!it.transferQty || it.transferQty === '' || it.transferQty===0)){
@@ -463,6 +470,12 @@ export default {
         }else if ( it.usableQty<it.transferQty){
           this.$Message.warning(this.$t('W_008', {'param1': this.$t('transferQty')},{'param2':this.$t('usableQty')}))
           return false;
+        }else if(it.oWhId == it.whId){
+          this.$Message.warning(this.$t('W_007', {'param':this.$t('W_135')}))
+          return false;
+        }else if(it.oNonStdCode === it.nonStdCode){
+          this.$Message.warning(this.$t('W_007', {' param':this.$t('W_136')}))
+          return false;
         }
       }
       return  true;

src/view/ivt/ivt-transfer/index.vue

@@ -69,7 +69,7 @@
           <!-- 调整明细-->
           <div v-show="visGoodsDetailFlag">
             <DkTable :id="'table-'+$options.name" ref="detail-select" :data="goodsDetailData" showFooter
-                     :height="this.tableHeight * (1-split)-62" primaryKey="itemId" name="table">
+                     :height="this.tableHeight * (1-split)-62" primaryKey="itemId" name="table"  v-show="whFlag">
               <!-- 商品型号-->
               <DkTableColumn field="skuModel"/>
               <!-- 商品名称-->
@@ -84,10 +84,32 @@
               <DkTableColumn field="oWhName" />
               <!-- 目标仓库-->
               <DkTableColumn field="whName" />
+              <DkTableColumn field="flgValid" type="switch"/>
+              <DkTableColumn field="remarks"/>
+            </DkTable>
+
+            <DkTable :id="'table-'+$options.name" ref="detail-select" :data="goodsDetailData" showFooter
+                     :height="this.tableHeight * (1-split)-62" primaryKey="itemId" name="table" v-show="!whFlag">
+              <!-- 商品型号-->
+              <DkTableColumn field="skuModel"/>
+              <!-- 商品名称-->
+              <DkTableColumn field="skuName"/>
+              <!-- 唯一编码-->
+              <DkTableColumn field="skuCode"/>
+              <!-- 品牌-->
+              <DkTableColumn field="shortName"/>
+              <!-- 调整数量-->
+              <DkTableColumn field="transferQty" dataType="number"/>
+              <!-- 箱-->
+              <DkTableColumn field="box" dataType="number" :digits="0"/>
+              <!-- 片-->
+              <DkTableColumn field="piece" dataType="number" :digits="0"/>
+              <!-- 包装数量-->
+              <DkTableColumn field="boxPiece" />
               <!--源批号-->
-              <DkTableColumn field="oNonStdCode" />
+              <DkTableColumn field="oNonStdCode"/>
               <!--目标批号-->
-              <DkTableColumn field="nonStdCode" />
+              <DkTableColumn field="nonStdCode"/>
               <DkTableColumn field="flgValid" type="switch"/>
               <DkTableColumn field="remarks"/>
             </DkTable>
@@ -123,6 +145,7 @@ export default {
   data() {
     let self = this
     return {
+      whFlag:false,
       detailModel: 'goodsDetailData',
       detailOptions: [{label: self.$t('transferGoodsDetail'), name: 'transferGoodsDetail'}, //货物明细
         {label: self.$t('filesDetail'), name: 'filesDetail'}, //附件明细
@@ -138,10 +161,10 @@ export default {
             itemCode: 'transferNo',
           },
           {
-            itemCode: 'transferStatusList',
+            itemCode: 'transferTypeList',
             itemName: self.$t('transferStatusName'),
             valueFormat: {
-              code: 'transferStatusList',
+              code: 'transferTypeList',
               data: [],
               valueKey: 'id',
               labelKey: 'kindName',
@@ -213,7 +236,7 @@ export default {
       // 读取系统字典
       let dataKindList =this.$store.state.user.dataKindList
       let data = dataKindList.filter(it=>it.kindType == this.$config.kindType.transferStatus)
-      let list = this.searchContent.filter(it =>  it.valueFormat && it.valueFormat.code == 'transferStatusList')
+      let list = this.searchContent.filter(it =>  it.valueFormat && it.valueFormat.code == 'transferTypeList')
       if (list.length > 0) {
         list[0].valueFormat.data = data
       }
@@ -284,6 +307,13 @@ export default {
           transferId:row.transferId,
         }
       }
+
+      if(row && row['transferType'] === this.$config.transferType.whTransfer){
+        this.whFlag = true
+      }else{
+        this.whFlag = false
+      }
+
       // 查询调整明细
       this.excute(this.$service.transferItemService, this.$service.transferItemService.selectByCond, params).then(res => {
         if (res.code === this.$config.SUCCESS_CODE) {