Merge branch 'sit' of daiyanrong/accout-ui into master

src/assets/js/linkType.js

@@ -32,10 +32,10 @@ const relationBasisType = [
   // { code: "5", name: "资金=>发票" },
 ]
 const RQList = [
-  { code: "1", name: "确认单=>发票",  },
-  { code: "2", name: "确认单=>资金",  },
-  { code: "3", name: "资金=>确认单",  },
-  { code: "4", name: "发票=>资金",},
+  { code: "1", name: "确认单=>发票", },
+  { code: "2", name: "确认单=>资金", },
+  { code: "3", name: "资金=>确认单", },
+  { code: "4", name: "发票=>资金", },
   { code: "5", name: "资金=>发票", },
 ]
 const relationList = [
@@ -50,6 +50,9 @@ const queryBasisList = [
   { code: "3", name: "资金", active: ['order', 'capital', 'invoice'] },
 
 ]
+const platform = [
+  '优选商城', '印刷系统', '客服部', '泰康小卖部', '特殊订单', '积分商城', '网络部', '采购部', '销售部', '项目部', '预付卡'
+]
 
 export {
   invoiceType,
@@ -60,5 +63,6 @@ export {
   RQList,
   relationBasisType,
   relationList,
-  queryBasisList
+  queryBasisList,
+  platform
 };

src/components/changeDialog/order.vue

@@ -17,7 +17,28 @@
     <el-card style="height: 700px; margin-top: -25px">
       <el-row :gutter="10">
         <el-col :span="24" style="padding: 0 0 10px 0">
-          <el-col :span="8" style="width: 290px">
+          <el-col :span="6" style="width: 200px">
+            <el-select
+              style="width: 100%"
+              :size="searchSize"
+              v-model="parmValue.platform"
+              clearable
+              @change="
+                parmValue.page = 1;
+                searchList();
+              "
+              placeholder="所属平台"
+            >
+              <el-option
+                v-for="item in platform"
+                :key="item"
+                :label="item"
+                :value="item"
+              >
+              </el-option>
+            </el-select>
+          </el-col>
+          <el-col :span="8" style="width: 300px">
             <el-input
               v-model="parmValue.sequenceNo"
               placeholder="请输入确认单编号"
@@ -25,12 +46,24 @@
               <el-button
                 slot="append"
                 icon="el-icon-search"
-                @click="searchList"
+                @click="
+                  parmValue.page = 1;
+                  searchList();
+                "
               ></el-button>
             </el-input>
           </el-col>
+
           <el-col :span="4" style="width: 160px" class="fr tr">
-            <el-button type="primary" @click="searchList"> 刷新 </el-button>
+            <el-button
+              type="primary"
+              @click="
+                parmValue.page = 1;
+                searchList();
+              "
+            >
+              刷新
+            </el-button>
             <el-button type="warning" @click="restSearch"> 重置 </el-button>
           </el-col>
         </el-col>
@@ -207,7 +240,7 @@
             <el-table-column
               type="selection"
               width="45"
-                 fixed="left"
+              fixed="left"
               align="center"
             ></el-table-column>
             <el-table-column
@@ -216,6 +249,12 @@
               show-overflow-tooltip
               width="140"
             ></el-table-column>
+            <el-table-column
+              prop="platform"
+              label="所属平台"
+              show-overflow-tooltip
+              width="120"
+            ></el-table-column>
             <el-table-column
               prop="companyNo"
               label="企业编码"
@@ -388,6 +427,7 @@
 import asyncRequest from "@/apis/service/InvoiceSales/invoiceApply";
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
+import { platform } from "@/assets/js/linkType";
 export default {
   props: [
     "id",
@@ -407,10 +447,12 @@ export default {
       tableData: [],
       showModelThis: this.showModel,
       multipleSelection: [],
+      platform: platform,
       parmValue: {
         starttime: "", // 起始时间
         endtime: "", //结束时间
         sequenceNo: "", // 订单编号
+        platform: "",
         companyNo: this.id, // 客户企业编码
         page: 1, // 页码
         size: 10, // 每页显示条数
@@ -439,6 +481,7 @@ export default {
       if (!val) {
         this.$emit("cancel");
       } else {
+        this.parmValue.page = 1;
         this.searchList();
       }
     },

src/config/env.development.js

@@ -5,11 +5,11 @@ module.exports = {
   api: {
     // baseApi: 'http://inv.sit.wanyuhengtong.com/',
     // baseApi: 'http://inv.test241.wanyuhengtong.com/',
-    // baseApi: 'http://www.invoice.com/',
-    // testApi: 'http://inv.test241.wanyuhengtong.com/',
-    baseApi: 'http://inv.sitw.wanyuhengtong.com/',
-    // tableApi: 'http://inv.sit.wanyuhengtong.com/',
+    baseApi: 'http://www.invoice.com/',
     testApi: 'http://inv.test241.wanyuhengtong.com/',
+    // baseApi: 'http://inv.sitw.wanyuhengtong.com/',
+    // // tableApi: 'http://inv.sit.wanyuhengtong.com/',
+    // testApi: 'http://inv.test241.wanyuhengtong.com/',
   },
   fileURL: `https://api2.edusit.zretchome.com`,
   appId: 'wx5ac3a2c2d72b6f26',

src/views/InvoiceSales/sheetOrderPool/index.vue

@@ -2,7 +2,29 @@
   <div class="sheetOrderPool pagePadding">
     <div style="padding: 5px 0 10px 0">
       <el-row :gutter="10" style="padding: 0 0 10px 0">
-        <el-col :span="6" style="width: 470px">
+        <el-col :span="6" style="width: 170px">
+          <el-select
+            style="width: 100%"
+            :size="searchSize"
+            v-model="parmValue.platform"
+            clearable
+            @change="
+              pageInfo.curr = 1;
+              parmValue.page = 1;
+              searchList();
+            "
+            placeholder="所属平台"
+          >
+            <el-option
+              v-for="item in platform"
+              :key="item"
+              :label="item"
+              :value="item"
+            >
+            </el-option>
+          </el-select>
+        </el-col>
+        <el-col :span="6" style="width: 440px">
           <el-select
             v-model="code"
             multiple
@@ -12,7 +34,7 @@
             style="width: 100%"
             :multiple-limit="1"
             reserve-keyword
-            placeholder="请输入公司名称"
+            placeholder="公司名称"
             :remote-method="remoteMethod"
             :loading="selectLoading"
             class="setWidth"
@@ -25,13 +47,15 @@
             />
           </el-select>
         </el-col>
-        <el-col :span="6" style="width: 380px">
+
+        <el-col :span="6" style="width: 240px">
           <el-input
             v-model="parmValue.sequenceNo"
             :size="searchSize"
-            placeholder="请输入确认单编号"
+            placeholder="确认单编号"
           ></el-input>
         </el-col>
+
         <el-col
           :span="6"
           style="float: right; width: 66px; padding: 0; text-align: right"
@@ -310,6 +334,12 @@
         show-overflow-tooltip
         width="140"
       ></el-table-column>
+      <el-table-column
+        prop="platform"
+        label="所属平台"
+        show-overflow-tooltip
+        width="120"
+      ></el-table-column>
       <el-table-column
         prop="companyNo"
         label="企业编码"
@@ -455,7 +485,7 @@ import asyncRequest from "@/apis/service/InvoiceSales/sheetOrderPool";
 import { mapGetters } from "vuex";
 import PeriodDatePicker from "@/components/PeriodDatePicker";
 import numberRange from "@/components/numberRange";
-import { invoiceType, capitalType } from "@/assets/js/linkType";
+import { invoiceType, capitalType, platform } from "@/assets/js/linkType";
 import resToken from "@/mixins/resToken";
 export default {
   name: "sheetOrderPool",
@@ -480,6 +510,7 @@ export default {
       selectLoading: false,
       invoiceType: invoiceType,
       capitalType: capitalType,
+      platform: platform,
       loading: false,
       showModel: false,
       isDetail: false,
@@ -495,6 +526,7 @@ export default {
         total_up: "", //最大金额
         pay_status: "", //资金核销状态
         inv_status: "", //发票核销状态
+        platform: "", //所属平台
         inv_low: "", //发票未核销最小金额
         inv_up: "", //发票未核销最大金额
         pay_low: "", //资金未核销最小金额
@@ -523,6 +555,7 @@ export default {
         size: 15, // 每页显示条数
         total_low: "", //最小金额
         total_up: "", //最大金额
+        platform: "",
         pay_status: "", //资金核销状态
         inv_status: "", //发票核销状态
         inv_low: "", //发票未核销最小金额