预算管理

.env.development

@@ -3,8 +3,8 @@ ENV = 'development'
 
 # base api
 #VUE_APP_DOMIAN = http://hjjc-hdcontract-test.ali251.langye.net
+#VUE_APP_DOMIAN = http://127.0.0.1:8000
 VUE_APP_DOMIAN = http://szemc-budget-execution.local
-VUE_APP_UPLOAD_API = http://szemc-budget-execution.local/api/admin/upload-file
 VUE_APP_BASE_API =
 VUE_APP_OUT_Book = http://hjjc-book-service-test.ali251.langye.net
 VUE_APP_OUT_GDZC = http://hjjc-szemcgdzc.ali251.langye.net/admin

src/views/contract/contractList.vue

@@ -246,9 +246,11 @@
 
                 <Select
                   v-model="select.join_status"
+                  multiple
                   clearable
+                  collapse-tags
                   placeholder="请选择"
-                  style="width: 100px"
+                  style="width: 180px"
                 >
                   <Option
                     v-for="item in options"
@@ -258,6 +260,19 @@
                   </Option>
                 </Select>
               </div>
+
+              <div>
+                <span style="padding: 0 6px; word-break: keep-all">结算状态</span>
+                <Select
+                  v-model="select.is_end"
+                  clearable
+                  placeholder="请选择"
+                  style="width: 100px"
+                >
+                  <Option :value="0">未结清</Option>
+                  <Option :value="1">已结清</Option>
+                </Select>
+              </div>
             </div>
           </xy-selectors>
 
@@ -1335,7 +1350,9 @@ export default {
         start_plan_price: undefined,
         end_plan_price: undefined,
         is_myself: 0,
-        is_simple: 0
+        is_simple: 0,
+        is_end: "",
+        join_status: []
       },
       selectCopy: {
         keyword: "",
@@ -1354,7 +1371,9 @@ export default {
         start_plan_price: undefined,
         end_plan_price: undefined,
         is_myself: 0,
-        is_simple: 0
+        is_simple: 0,
+        is_end: "",
+        join_status: []
       },
       type: [
         {
@@ -2473,17 +2492,24 @@ export default {
     },
     //获取合同列表
     async getContracts(is_export,noloading=false,isopenOa=false) {
+      const querySelect = {
+        ...this.select,
+        join_status: Array.isArray(this.select.join_status)
+          ? this.select.join_status.join(",")
+          : this.select.join_status,
+      };
       let tokens = getToken();
       if (is_export && this.select.is_export == 1) {
         var url = "/api/admin/contract/index?is_auth=1&token=" + tokens;
-        Object.keys(this.select).forEach((key, item) => {
+        Object.keys(querySelect).forEach((key, item) => {
           if (key === 'page') {
             url += '&page=1';
           } else if (key === 'page_size') {
             url += '&page_size=9999';
           } else {
-            if (this.select[key]) {
-              url += "&" + key + "=" + this.select[key];
+            const v = querySelect[key];
+            if (v != null && v !== '') {
+              url += "&" + key + "=" + v;
             }
           }
         });
@@ -2494,7 +2520,7 @@ export default {
         return;
       }
       const res = await getContract({
-        ...this.select,
+        ...querySelect,
         is_auth: 1,
       },noloading);
 
@@ -2878,7 +2904,7 @@ export default {
     if (/contractLedger/g.test(this.$route.path)) {
       this.select.is_contract = 1;
       this.select.purchase_status = 3;
-      this.select.join_status = '2,3'
+      this.select.join_status = [2, 3]
       //this.select.invite_status = 3;
       this.select.is_simple = "";
     }
@@ -2886,13 +2912,15 @@ export default {
       this.select.is_simple = "";
     }
     if (/contractList/g.test(this.$route.path)) {
-      this.select.is_substitute = 0;//is_substitute 用于是否有采购流程，1为合同台账中增加（没有流程）
+      this.select.is_substitute = 0;
+      this.select.join_status = [2, 3];//is_substitute 用于是否有采购流程，1为合同台账中增加（没有流程）
       //this.select.contract_type = 2;
     }
     if (/waitPay/g.test(this.$route.path)) {
       this.select.wait_pay = 1;
       this.select.is_simple = 0;
     }
+    this.selectCopy = deepCopy(this.select);
   },
   destroyed() {
     window.onfocus = null;