Browse Source

数据采集

gks 1 year ago
parent
commit
2123fb2cd3
3 changed files with 28 additions and 14 deletions
  1. 1 1
      src/components/Editor/index.vue
  2. 26 12
      src/views/GATHER/index.vue
  3. 1 1
      src/views/task/index.vue

+ 1 - 1
src/components/Editor/index.vue

@@ -82,7 +82,7 @@ export default {
             [{ color: [] }, { background: [] }],             // 字体颜色、字体背景颜色
             [{ align: [] }],                                 // 对齐方式
             ["clean"],                                       // 清除文本格式
-            ["link", "image", "video"]                       // 链接、图片、视频
+            ["link", "image"]                       // 链接、图片、视频
           ],
         },
         placeholder: "请输入内容",

+ 26 - 12
src/views/GATHER/index.vue

@@ -667,13 +667,13 @@
                   >
                   <!-- <p>{{ edit }}</p> -->
 
-                    <el-input
-                    v-if="edit == true"
-                    :disabled="!edit"
+                  <el-input
+                      :disabled="!edit"
+                      v-if="edit == true"
                       v-model="listItem.collCalue"
                       :placeholder="'请输入' + listItem.normfeeName"
                     ></el-input>
-                    <div v-if="edit == false" style="background-color: rgba(0, 0, 0, .03); padding-left: 5px;" >{{ listItem.collCalue }}</div>
+                    <div v-if="edit == false" style="background-color: rgba(0, 0, 0, .03); padding-left: 5px;" >{{ listItem.collCalue ? listItem.collCalue :"请输入" }}</div>
                   </el-form-item>
                 </el-col>
               </el-form>
@@ -683,7 +683,7 @@
       
       <div slot="footer" class="dialog-footer">
         <el-button v-if="audit &&  (this.form.collStatus != 2 && this.form.collStatus==1)" type="primary" @click="handleAudit(form)">提交审核</el-button>
-        <el-button type="primary" @click="submitForm('edit')" v-if="edit"
+        <el-button type="primary" @click="submitForm('edit')" v-if="edit && isEdit"
           >确 定</el-button
         >
         
@@ -761,6 +761,7 @@ export default {
     return {
       // 提交审核按钮
       audit:false,
+      isEdit:true,
 
       monthOpt: [{
           value: '01',
@@ -1180,6 +1181,7 @@ export default {
     },
     // 表单重置
     reset() {
+      this.isEdit = true;
       this.audit = false;
       this.deptName = "";
       this.form = {
@@ -1283,20 +1285,32 @@ export default {
         type: "1",
         gatherId: row.id,
       };
-      setAudit(data).then((res) => {
-        if (res.code) {
-          this.$message.success("审核成功");
-          this.getList();
-          this.openDetail = false;
-        }
+      this.form.collStatus = 1;
+      updateGATHER(this.form).then((response) => {
+        this.$modal.msgSuccess("修改成功");
+        compute(this.form).then((response) => {
+          setAudit(data).then((res) => {
+            if (res.code) {
+              this.$message.success("审核成功");
+              this.getList();
+              this.openDetail = false;
+            }
+          });
+        });
       });
+      
     },
     /** 查看按钮操作 */
     handleDetail(row, type) {
       //false 查看  true修改
       if (type == 0 ) {
         this.edit = false;
-      } else if (type == 1 || type == 3) {
+      } else if (type == 1 ) {
+        this.edit = true;
+        this.isEdit = true;
+        this.audit = false;
+      }else if(type == 3){
+        this.isEdit = false;
         this.edit = true;
         this.audit = true;
       }

+ 1 - 1
src/views/task/index.vue

@@ -67,7 +67,7 @@
       </el-table-column>
     </el-table>
 
-    <el-dialog title="审核" :visible.sync="dialogVisible" width="95%" :close-on-click-modal="false" @close="closeDia">
+    <el-dialog :title="taskList.fromKeyword +'-'+ taskList.proname" :visible.sync="dialogVisible" width="95%" :close-on-click-modal="false" @close="closeDia">
       <component :is="componentUrl" :taskList="taskList" ref="componentSH"></component>
       <el-dialog width="60%" :title="subTitle" :visible.sync="innerVisible" :close-on-click-modal="false"
         append-to-body center @close="qx()">