Browse Source

Merge branch 'develop_fencang' of jianguan-web/jg-ocs-html into master

刘俊俊 2 years ago
parent
commit
40da36e64f

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.2.21",
+    "version": "2.2.22",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 0 - 25
src/config/router.config.js

@@ -3475,31 +3475,6 @@ export const asyncRouterMap = [
               }
             ]
           },
-          {
-            path: '/setting/checkDingTask',
-            redirect: '/setting/checkDingTask/list',
-            name: 'checkDingTask',
-            component: BlankLayout,
-            meta: {
-              title: '钉钉审批',
-              icon: 'sketch',
-              permission: 'M_dingAuditUpdate'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'M_dingAuditUpdate',
-                component: () => import(/* webpackChunkName: "setting" */ '@/views/setting/checkDingTask/list.vue'),
-                meta: {
-                  title: '钉钉审批',
-                  icon: 'sketch',
-                  hidden: true,
-                  permission: 'M_dingAuditUpdate'
-                }
-              }
-            ]
-          },
           {
             path: '/setting/checkDingTask',
             redirect: '/setting/checkDingTask/list',

+ 15 - 2
src/views/salesReturnManagement/billOfLading/add.vue

@@ -134,7 +134,13 @@
               <a-form-model-item label="关联销退单" :label-col="{span:2}" :wrapper-col="{span:20}">
                 <a-button type="primary" class="button-primary" @click="openSelModal">选择销退单</a-button>
                 <div style="margin-top:10px;">
-                  <a-table :columns="columns" :scroll="{ y: 400 }" :pagination="false" :data-source="chooseData" bordered>
+                  <a-table
+                    ref="salesReturnOrderTable"
+                    :columns="columns"
+                    :scroll="{ y: 400 }"
+                    :pagination="false"
+                    :data-source="chooseData"
+                    bordered>
                     <!-- 编号 -->
                     <template slot="no" slot-scope="text, record,index">
                       <span>{{ index+1 }}</span>
@@ -235,6 +241,7 @@ export default {
         attachmentList: '', // 附件
         warehouseSn: undefined// 退货仓库
       },
+      salerReturnWsn: undefined,
       attachList: [],
       rules: {
         applyPersonSn: [
@@ -264,7 +271,11 @@ export default {
     handleWarehouse (val) {
       this.form.warehouseSn = val
       if (val) {
-        this.getReturnOrderList(val)
+        this.chooseData = []
+        if (this.salerReturnWsn && this.salerReturnWsn == val) {
+          const cd = this.$store.state.app.tempBillOfData
+          this.chooseData.push(cd)
+        }
       }
     },
     custChange (val) {
@@ -425,6 +436,8 @@ export default {
         // 从销售退货列表过来的数据
         const cd = this.$store.state.app.tempBillOfData
         if (cd && this.$route.query.path == 'salerReturn') {
+          this.form.warehouseSn = cd.warehouseSn
+          this.salerReturnWsn = cd.warehouseSn
           this.chooseData.push(cd)
         }
       }