Browse Source

bug修改

ljb 5 months ago
parent
commit
f1eec34c5f

+ 7 - 3
src/App.vue

@@ -83,7 +83,10 @@ export default {
           this.showDownLoading = true;
           this.showDownLoading = true;
           this.showError = false;
           this.showError = false;
           this.showSucc = false;
           this.showSucc = false;
-          this.checkTaskId(yearAndMonth, type);
+          this._checkTimeout = setTimeout(() => {
+            this.checkTaskId(yearAndMonth, type);
+          }, 3000)
+          
         }
         }
       },
       },
       deep: true
       deep: true
@@ -128,17 +131,18 @@ export default {
 
 
           if (status == 2) {
           if (status == 2) {
             this.showDownLoading = false;
             this.showDownLoading = false;
+            removeStore({ name: this.taskStoreName });
             this.downloadZip(yearAndMonth, taskId, fileType, fileSize);
             this.downloadZip(yearAndMonth, taskId, fileType, fileSize);
           } else if (status == 4) {
           } else if (status == 4) {
             // 任务过期或者不存在
             // 任务过期或者不存在
             removeStore({ name: this.taskStoreName });
             removeStore({ name: this.taskStoreName });
             this._checkTimeout = setTimeout(() => {
             this._checkTimeout = setTimeout(() => {
               this.checkTaskId(yearAndMonth, fileType);
               this.checkTaskId(yearAndMonth, fileType);
-            }, 3000)
+            }, 1500)
           } else {
           } else {
             this._checkTimeout = setTimeout(() => {
             this._checkTimeout = setTimeout(() => {
               this.checkTaskId(yearAndMonth, fileType);
               this.checkTaskId(yearAndMonth, fileType);
-            }, 3000)
+            }, 1500)
           }
           }
         }
         }
         
         

+ 4 - 1
src/components/person-select/index.vue

@@ -61,6 +61,7 @@ export default {
         if (!newVal) {
         if (!newVal) {
           this.currPerson = '';
           this.currPerson = '';
           this.$emit('input', '');
           this.$emit('input', '');
+          this.$emit('change', {})
           this.personList = [];
           this.personList = [];
           return;
           return;
         }
         }
@@ -73,6 +74,7 @@ export default {
   methods: {
   methods: {
     handleChange(e) {
     handleChange(e) {
       this.$emit('input', e);
       this.$emit('input', e);
+      this.$emit('change', this.personList.find(item => item.value == e))
     },
     },
     getPersonList() {
     getPersonList() {
       if (!this.yearAndMonth) {
       if (!this.yearAndMonth) {
@@ -86,7 +88,8 @@ export default {
             let nameArr = [item.name, item.number || '-', item.idCard || '-'];
             let nameArr = [item.name, item.number || '-', item.idCard || '-'];
             return {
             return {
               label: nameArr.join(' \\ '),
               label: nameArr.join(' \\ '),
-              value: item[this.valueKey]
+              value: item[this.valueKey],
+              ...item,
             }
             }
           });
           });
         }
         }

+ 6 - 1
src/views/basic-resource/comp-basic-info/ky-asset-list.vue

@@ -219,7 +219,12 @@ export default window.$crudCommon({
     },
     },
     getFormData() {
     getFormData() {
       let jcz = new Decimal(this.form.jcz || 0).div(new Decimal(100));
       let jcz = new Decimal(this.form.jcz || 0).div(new Decimal(100));
-      return { ...this.form, jcz: Number(jcz), yearAndMonth: this.params.yearAndMonth };
+      return {
+        ...this.form,
+        jcz: Number(jcz),
+        gl: this.form.gl === undefined || this.form.gl === null ? '' : this.form.gl,
+        yearAndMonth: this.params.yearAndMonth
+      };
     },
     },
     rowUpdate(row, index, done, loading) {
     rowUpdate(row, index, done, loading) {
       
       

+ 14 - 7
src/views/project-manage/components/apply-form.vue

@@ -96,7 +96,15 @@
               <span v-if="!isPrintPage" style="color: red; padding-right: 3px; font-size: 16px;">*</span>项目负责人
               <span v-if="!isPrintPage" style="color: red; padding-right: 3px; font-size: 16px;">*</span>项目负责人
             </td>
             </td>
             <td class="doc-input">
             <td class="doc-input">
-              <person-select v-show="!isPrintPage" v-model="formData.xmfzr" :yearAndMonth="xmStartDateYearAndMonth" valueKey="id" :disabled="isDisabled" style="width: 100%" />
+              <person-select
+                v-show="!isPrintPage"
+                v-model="formData.xmfzr"
+                :yearAndMonth="xmStartDateYearAndMonth"
+                valueKey="id"
+                :disabled="isDisabled"
+                style="width: 100%"
+                @change="handlePersonChange"
+              />
               <span v-show="isPrintPage" style="display: inline-block; padding: 12px 6px;">{{ getXmfzrName }}</span>
               <span v-show="isPrintPage" style="display: inline-block; padding: 12px 6px;">{{ getXmfzrName }}</span>
             </td>
             </td>
             <td class="doc-label">
             <td class="doc-label">
@@ -326,6 +334,7 @@ export default {
 
 
       // 项目负责人列表
       // 项目负责人列表
       fzrList: [],
       fzrList: [],
+      selFzrData: {},
 
 
       // 研究类型数据字典
       // 研究类型数据字典
       studyTypeList: [],
       studyTypeList: [],
@@ -467,12 +476,7 @@ export default {
       return tit;
       return tit;
     },
     },
     getXmfzrName() {
     getXmfzrName() {
-      // if (this.formData.xmfzr) {
-      //   let fzrObj = this.fzrList.find(item => item.value == this.formData.xmfzr);
-      //   return fzrObj ? fzrObj.label : "";
-      // }
-
-      return this.formData.xmfzrxm;
+      return this.formData.xmfzrxm || this.selFzrData.name;
     },
     },
     getXmDateRange() {
     getXmDateRange() {
       if (this.formData.xmkssj && this.formData.xmjssj) {
       if (this.formData.xmkssj && this.formData.xmjssj) {
@@ -725,6 +729,9 @@ export default {
         );
         );
       });
       });
     },
     },
+    handlePersonChange(data) {
+      this.selFzrData = data;
+    }
   },
   },
 };
 };
 </script>
 </script>