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

src/view/ivt/out-handle/index.vue

@@ -42,7 +42,7 @@
                    ref="table-select"
                    :data="tableData"
                    primaryKey="outId"
-                   v-if="this.tableModel === 'waitIn'"
+                   v-if="this.tableModel === 'waitOut'"
                    @pageChange="pageSizeChange"
                    :page-total="pageInfo.total"
                    :current-page="pageInfo.currentPage"
@@ -86,7 +86,7 @@
             <!-- 收货地址-->
             <DkTableColumn field="cusFrom" :title="$t('takeOverAddress')"></DkTableColumn>
             <!--制单人-->
-            <DkTableColumn field="makeStaffName" :filter="false"></DkTableColumn>
+            <DkTableColumn field="makeStaffName" />
             <!-- 有效标识-->
             <DkTableColumn field="flgValid" type="switch"/>
             <!--出库办理人-->
@@ -99,7 +99,7 @@
                    ref="table-select"
                    :data="tableData"
                    primaryKey="outId"
-                   v-if="this.tableModel === 'ingIn'"
+                   v-if="this.tableModel === 'ingOut'"
                    @pageChange="pageSizeChange"
                    :page-total="pageInfo.total"
                    :current-page="pageInfo.currentPage"
@@ -224,10 +224,10 @@ export default {
     let self = this
     return {
       // 总单模式切换值
-      tableModel: 'waitIn',
+      tableModel: 'waitOut',
       tabsOptions: [
-        {label: self.$t('waitIn'), name: 'waitIn'}, //待出库
-        {label: self.$t('ingIn'), name: 'ingIn'},   //已出库
+        {label: self.$t('waitOut'), name: 'waitOut'}, //待出库
+        {label: self.$t('ingOut'), name: 'ingOut'},   //已出库
       ],
       //明细模式切换值
       detailModel: 'goodsDetail',
@@ -394,14 +394,14 @@ export default {
      */
     getData(params) {
       //待出库
-      if (this.tableModel == 'waitIn') {
+      if (this.tableModel == 'waitOut') {
         //参数设置
         params = this.searchParams
         params.intoStatus = this.$config.intoStatus.ruKuZhong
         params.outStatus = this.$config.outStatus.chuKuZhong
       }
       //已出库
-      else if (this.tableModel == 'ingIn') {
+      else if (this.tableModel == 'ingOut') {
         //参数设置
         params = this.searchParams
         params.intoStatus = this.$config.intoStatus.yiRuKu
@@ -440,11 +440,11 @@ export default {
      */
     clickTab(params) {
       //待出库
-      if (params && params == 'waitIn') {
+      if (params && params == 'waitOut') {
         this.tableModel = params
       }
       //已出库
-      else if (params && params == 'ingIn') {
+      else if (params && params == 'ingOut') {
         this.tableModel = params
       }
       //获取总单数据
@@ -487,15 +487,15 @@ export default {
      */
     outBack(row) {
       //出库中不允许撤回
-      if (this.tableModel == 'waitIn') {
+      if (this.tableModel == 'waitOut') {
         this.$Message.error(this.$t('W_007', {'param': this.$t('W_115')}))
       }
       //已出库并且是自动  不允许撤回
-      else if (this.tableModel == 'ingIn' && row[0].flgHandleSetting) {
+      else if (this.tableModel == 'ingOut' && row[0].flgHandleSetting) {
         this.$Message.error(this.$t('W_007', {'param': this.$t('W_114')}))
       }
       //已出库 并且是手动  允许撤回
-      else if (this.tableModel == 'ingIn' && !row[0].flgHandleSetting) {
+      else if (this.tableModel == 'ingOut' && !row[0].flgHandleSetting) {
         if (this.$refs['table-select'].batchKeys.length === 1) {
           let params = {
             outId: this.$refs['table-select'].batchKeys[0],
@@ -549,7 +549,7 @@ export default {
      */
     invalid(row) {
       //已出库并且是手动  ---不让作废
-      if (this.tableModel == 'ingIn' && !row[0].flgHandleSetting) {
+      if (this.tableModel == 'ingOut' && !row[0].flgHandleSetting) {
         this.$Message.error(this.$t('W_007', {'param': this.$t('W_113')}))
       }
       else {
@@ -613,7 +613,7 @@ export default {
           return false;
         }
         //已出库不允许进行出库办理
-        if (this.tableModel == 'ingIn') {
+        if (this.tableModel == 'ingOut') {
           this.$Message.warning(this.$t('W_007', {'param': this.$t('W_116')}));
           return false;
         }
@@ -626,7 +626,7 @@ export default {
           return false;
         }
         //出库中不允许进行出库撤回
-        if (this.tableModel == 'waitIn') {
+        if (this.tableModel == 'waitOut') {
           this.$Message.warning(this.$t('W_007', {'param': this.$t('W_117')}));
           return false;
         }
@@ -662,11 +662,11 @@ export default {
       }
       //销售出库
       else if (row[0].outType === this.$config.outTypeBySql.saleReturn) {
-        name = 'outHandleOrder'
+        name = 'outHandlePurReturn'
       }
       //销售退货出库
       else {
-        name = 'outHandlePurReturn'
+        name = 'outHandleOrder'
       }
       // 跳转到具体的办理页面
       this.open(this.$config.routeUrl[this.routeObjName][name])