Browse Source

fix time join

scorpio 2 years ago
parent
commit
5e42a819bd

+ 1 - 0
src/api/fetch.js

@@ -74,6 +74,7 @@ function fetch (url = '', params = {}, method = 'get', contentType = 'form', hea
       }
     }
     axios(requestParams).then(success).catch((err) => {
+      console.log(err)
       if (/502|503|504/.test(err.message) || (err + '').indexOf('timeout') > -1) {
         if (insurance) {
           resolve(insurance)

+ 1 - 1
src/api/params/index.js

@@ -48,7 +48,7 @@ export default {
       size: 999,
       current: 1,
       ...params
-    })
+    }, 'post', 'json')
   }
 
 }

+ 1 - 1
src/views/home/component/dash.vue

@@ -45,7 +45,7 @@
                @on-load="onLoad">
       <template #menu="{row}">
         <el-button v-if='user.info.viewStage !== 1' icon="Upload" type='primary' text @click="track(row)"> {{
-            row.isReport === 1 ? "已经上报" : "项目上报"
+            row.is_report === 1 ? "已经上报" : "项目上报"
           }}
         </el-button>
       </template>

+ 1 - 1
src/views/home/component/form_dialog.vue

@@ -386,7 +386,7 @@ export default {
         })
         return
       }
-      this.$api.params.getListByKey({ type: this.fieldType[index].dictKey, export: 1 }).then(res => {
+      this.$api.params.paramsList({ type: this.fieldType[index].dictKey, export: 1 }).then(res => {
         if (res.code === 200) {
           this.parseList(res.data.records, index, false)
         }

+ 16 - 5
src/views/home/component/owner_serach.vue

@@ -8,13 +8,16 @@
                 v-model="form.projectName"
                 placeholder="输入项目关键字"
                 prefix-icon="Search"
+                clearable
             />
           </el-form-item>
           <div class="flex flex-center">
             <el-form-item class="full-width" label="是否开工">
               <el-select
                   v-model="form.isStart"
-                  style="width: 100%">
+                  style="width: 100%"
+                  clearable
+              >
                 <el-option
                     v-for="item in start"
                     :key="item.value"
@@ -26,7 +29,9 @@
             <el-form-item class="full-width" label="是否入库">
               <el-select
                   v-model="form.isStorage"
-                  style="width: 100%">
+                  style="width: 100%"
+                  clearable
+              >
                 <el-option
                     v-for="item in storage"
                     :key="item.value"
@@ -47,6 +52,7 @@
                   end-placeholder="结束时间"
                   value-format='YYYY-MM-DD'
                   format='YYYY-MM-DD'
+                  clearable
               />
             </el-form-item>
           </div>
@@ -70,7 +76,9 @@
             <el-form-item class="full-width" label="省重点">
               <el-select
                   v-model="form.isImportant"
-                  style="width: 100%">
+                  style="width: 100%"
+                  clearable
+              >
                 <el-option
                     v-for="item in isimport"
                     :key="item.value"
@@ -82,7 +90,9 @@
             <el-form-item class="full-width" label="省集中开工">
               <el-select
                   v-model="form.isFocusStart"
-                  style="width: 100%">
+                  style="width: 100%"
+                  clearable
+              >
                 <el-option
                     v-for="item in isfocus"
                     :key="item.value"
@@ -98,6 +108,7 @@
                   v-model="form.amount"
                   @change="changeAmount"
                   style="width: 100%"
+                  clearable
               >
                 <el-option
                     v-for="item in totalAmount"
@@ -126,6 +137,7 @@
                   end-placeholder="结束时间"
                   value-format='YYYY-MM-DD'
                   format='YYYY-MM-DD'
+                  clearable
               />
             </el-form-item>
           </div>
@@ -352,7 +364,6 @@ export default {
     },
     changeAmount () {
       const tmps = this.form.amount.split(',')
-      console.log(tmps)
       this.form.totalAmountMin = tmps[0] === '-' ? '' : tmps[0]
       this.form.totalAmountMax = tmps[1] === '-' ? '' : tmps[1]
     },