Merge branch 'feature/Feature-sticky' into develop

src/api/basic_data/dealer.js

@@ -162,3 +162,12 @@ export function getListCustomer(params) {
     params
   })
 }
+
+//获取经销商
+export function getK3DepartmentList(params) {
+  return request({
+    url: '/k3/department/list',
+    method: 'get',
+    params
+  })
+}

src/views/basic_data/dealer/dealer_stock.vue

@@ -201,10 +201,16 @@
           </template> -->
         </el-form-item>
         <el-form-item label="金蝶部门编号" prop="k3OrgNumber">
-          <el-input v-model="addForm.k3OrgNumber"></el-input>
-          <!-- <template slot-scope="scope">
-            {{ scope.row }}
-          </template> -->
+          <!--          <el-input v-model="addForm.k3OrgNumber"></el-input>-->
+          <el-select class="selectStyle" v-model="addForm.k3OrgNumber" placeholder="请选择" filterable>
+            <el-option
+              v-for="item in k3DepartmentList"
+              :key="item.number"
+              :label="item.name + '（' + item.number + '）'"
+              :value="item.number"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="钱包" prop="customerWalletId">
           <el-select class="selectStyle" v-model="addForm.customerWalletId" placeholder="请选择" filterable>
@@ -304,7 +310,8 @@ import {
   getAdminUserList,
   getCustomerPtDetail,
   getCustomerPtUpdate,
-  getWalletCustomerList
+  getWalletCustomerList,
+  getK3DepartmentList
 } from '@/api/basic_data/dealer'
 import { getDealerList } from '@/api/basic_data/dealer'
 import { getDepartmentList } from '@/api/setting'
@@ -387,13 +394,15 @@ export default {
       // threeList: [], //三级区域数据
       userList: [], //业务员
       ids: [],
-      rowID: null //编辑ID
+      rowID: null, //编辑ID
+      k3DepartmentList: []
     }
   },
   async created() {
     this.getTree()
     // this.getAdminWebsit(1);
     this.getList()
+    this.getK3DepartmentList()
     this.getDealerDataList({ pageNum: 1, pageSize: -1 })
     this.getUserList(1)
     // this.getSelectList({ sysDictEnum: "PRODUCT_TYPE" });
@@ -459,6 +468,11 @@ export default {
         this.$message.error(result.message)
       }
     },
+    getK3DepartmentList() {
+      getK3DepartmentList().then(res => {
+        this.k3DepartmentList = res.data
+      })
+    },
     //下载模板
     downLoadFn() {
       downloadFiles('customer/pt/download')

src/views/supply/deliver/commerce_list.vue

@@ -439,7 +439,18 @@ export default {
       dialogTable_currentPage: 1, // 密码记录 - 当前页码
       dialogTable_pageSize: 10, // 密码记录 - 每页数量
       dialogTable_listTotal: 0, // 密码记录 - 列表总数
-
+      statusList: [
+        { label: '已保存', value: 'SAVE' },
+        { label: '待审核', value: 'WAIT' },
+        { label: '审核通过', value: 'OK' },
+        //  // { label: '审核驳回', value: 'FAIL' },,
+        { label: '已关闭', value: 'CLOSE' }
+      ],
+      orderTypeList: [
+        { label: '发货申请单', value: 1 },
+        { label: '退货申请单', value: 2 },
+        { label: '直调发货单', value: 3 }
+      ],
       queryItem: {}
     }
   },

src/views/supply/deliver/home_list.vue

@@ -192,7 +192,7 @@
               </template>
             </el-table-column>
 
-            <el-table-column align="right" label="数量" prop="qty" min-width="100" show-overflow-tooltip />
+            <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip />
             <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip />
             <el-table-column align="right" label="总金额" prop="payAmount" min-width="100" show-overflow-tooltip />
             <el-table-column