Просмотр исходного кода

fix:人员管理增加是否出单查询及分页修改

刘恒 1 год назад
Родитель
Сommit
f2e9083a8e

+ 21 - 0
src/components/form/FormRow.vue

@@ -156,6 +156,24 @@
         </a-select-option>
         </a-select-option>
       </a-select>
       </a-select>
     </a-form-item>
     </a-form-item>
+    <a-form-item
+      label="是否出单"
+      :labelCol="{ span: 7 }"
+      :colon="false"
+      v-show="showStatus"
+    >
+      <a-select
+        placeholder="请选择"
+        v-model="formState.outThere"
+        allowClear
+        show-search
+        :filter-option="filterOption"
+      >
+        <a-select-option :value="1"> 出单 </a-select-option>
+        <a-select-option :value="0"> 不出单 </a-select-option>
+      </a-select>
+    </a-form-item>
+
     <a-form-item
     <a-form-item
       label="             "
       label="             "
       :labelCol="{ span: 5 }"
       :labelCol="{ span: 5 }"
@@ -201,6 +219,9 @@ export default {
     showManage: {
     showManage: {
       default: false,
       default: false,
     },
     },
+    showStatus: {
+      default: false,
+    },
   },
   },
   watch: {
   watch: {
     "formState.provinceId"(val) {
     "formState.provinceId"(val) {

+ 15 - 2
src/pages/personnelManage/channel.vue

@@ -96,6 +96,18 @@
             </a-select-option>
             </a-select-option>
           </a-select>
           </a-select>
         </a-form-item>
         </a-form-item>
+        <a-form-item label="是否出单" :labelCol="{ span: 7 }" :colon="false">
+          <a-select
+            placeholder="请选择"
+            v-model="formState.outThere"
+            allowClear
+            show-search
+            :filter-option="filterOption"
+          >
+            <a-select-option :value="1"> 出单 </a-select-option>
+            <a-select-option :value="0"> 不出单 </a-select-option>
+          </a-select>
+        </a-form-item>
         <a-form-item
         <a-form-item
           label="             "
           label="             "
           :labelCol="{ span: 5 }"
           :labelCol="{ span: 5 }"
@@ -210,6 +222,7 @@ export default {
         createtimeStart: moment().format("YYYY-MM-DD"),
         createtimeStart: moment().format("YYYY-MM-DD"),
         createtimeEnd: moment().format("YYYY-MM-DD"),
         createtimeEnd: moment().format("YYYY-MM-DD"),
         leaderId: undefined,
         leaderId: undefined,
+        outThere: undefined,
       },
       },
       process: process.env.VUE_APP_API_BASE_URL,
       process: process.env.VUE_APP_API_BASE_URL,
 
 
@@ -274,8 +287,8 @@ export default {
           if (res.data.code === 200) {
           if (res.data.code === 200) {
             this.loading = false;
             this.loading = false;
 
 
-            this.list = [...res.data.data.records];
-            this.pageInfo.total = res.data.data.total;
+            this.list = [...res.data.data.content];
+            this.pageInfo.total = res.data.data.totalSize;
           }
           }
         });
         });
     },
     },

+ 7 - 3
src/pages/personnelManage/front/personnel.vue

@@ -20,7 +20,9 @@
         :search="true"
         :search="true"
         :showManage="true"
         :showManage="true"
         :className="'item-4'"
         :className="'item-4'"
-      ></fromRow>
+        :showStatus="true"
+      >
+      </fromRow>
 
 
       <!-- <div
       <!-- <div
         style="
         style="
@@ -252,6 +254,7 @@ export default {
         time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
         time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
         days: undefined,
         days: undefined,
         leaderId: undefined,
         leaderId: undefined,
+        outThere: undefined,
       },
       },
       rankForm: {
       rankForm: {
         provinceId: "140000",
         provinceId: "140000",
@@ -304,6 +307,7 @@ export default {
       this.pageInfo.pageNum = 1;
       this.pageInfo.pageNum = 1;
       this.pageInfo.pageSize = 9;
       this.pageInfo.pageSize = 9;
       this.getList();
       this.getList();
+      this.getRankingList();
     },
     },
     //区/县选择事件
     //区/县选择事件
     countyChange() {
     countyChange() {
@@ -373,8 +377,8 @@ export default {
           this.loading = false;
           this.loading = false;
 
 
           if (res.data.code === 200) {
           if (res.data.code === 200) {
-            this.list = res.data.data.records;
-            this.pageInfo.total = res.data.data.total;
+            this.list = res.data.data.content;
+            this.pageInfo.total = res.data.data.totalSize;
           }
           }
         });
         });
     },
     },

+ 0 - 1
src/pages/task/insurance.vue

@@ -152,7 +152,6 @@ const columns = [
     dataIndex: "partnerCompaniesName",
     dataIndex: "partnerCompaniesName",
     // scopedSlots: { customRender: "qutationCount" },
     // scopedSlots: { customRender: "qutationCount" },
   },
   },
-
   {
   {
     title: "报价中",
     title: "报价中",
     dataIndex: "qutationCount",
     dataIndex: "qutationCount",