Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search

client/src/views/dashboard/index.vue

@@ -87,26 +87,33 @@
         <div slot="header" class="clearfix">
         <span>待办任务提醒</span>
       </div>
+      <div class="litem" @click="goRecord('task2do')" v-if="checkPermission(['task2do'])">
+        <el-link class="desc">
+          您有
+          <span style="color:red">{{task2Num}}</span>
+          条记录待完成
+        </el-link>
+      </div>
       <div class="litem" @click="goRecord('待报送')" v-if="!checkPermission(['record_confirm']) && checkPermission(['record_up'])">
-      <el-link class="desc">
+        <el-link class="desc">
-        您有
+          您有
-        <span style="color:red">{{todos.toup}}</span>
+          <span style="color:red">{{todos.toup}}</span>
-        条记录待报送
+          条记录待报送
-      </el-link>
+        </el-link>
       </div>
       <div class="litem">
-      <el-link class="desc" @click="goRecord('待整改')" v-if="!checkPermission(['record_confirm']) && checkPermission(['record_up'])">
+        <el-link class="desc" @click="goRecord('待整改')" v-if="!checkPermission(['record_confirm']) && checkPermission(['record_up'])">
-        您有
+          您有
-        <span style="color:red">{{todos.tozg}}</span>
+          <span style="color:red">{{todos.tozg}}</span>
-        条记录待整改
+          条记录待整改
-      </el-link>
+        </el-link>
       </div>
       <div class="litem" @click="goRecord('已报送')" v-if="checkPermission(['record_confirm'])">
-      <el-link class="desc" v-if="todos.toconfirm">
+        <el-link class="desc" v-if="todos.toconfirm">
-        您有
+          您有
-        <span style="color:red">{{todos.toconfirm}}</span>
+          <span style="color:red">{{todos.toconfirm}}</span>
-        条记录待确认
+          条记录待确认
-      </el-link>
+        </el-link>
       </div>
       </el-card>
     </el-col>
@@ -115,6 +122,7 @@
 </template>
 
 <script>
+import { getMyTask2Do } from "@/api/task";
 import { mapGetters } from 'vuex'
 import { getRecordtodos } from "@/api/todos"
 import checkPermission from "@/utils/permission";
@@ -128,24 +136,41 @@ export default {
   },
   data(){
     return {
-      todos:{}
+      todos:{},
+      task2Num:0,
     }
   },
   created(){
-    this.gettodos()
+    this.gettodos();
+    this.geTask2Num();
   },
   methods:{
     checkPermission,
     toPath(val) {
       this.$router.push({path:val})
     },
+    geTask2Num(){
+      getMyTask2Do({page:0}).then((res) => {
+        let data = res.data,list=[];
+          data.forEach(item => {
+            if(item.count_up<item.count_all){
+              list.push(item)
+            }
+          });
+          this.task2Num = list.length;
+      });
+    },
     gettodos() {
       getRecordtodos().then(res=>{
         this.todos = res.data
       })
     },
     goRecord(state){
-      this.$router.push({name:'Record', params: {state:state}})
+      if(state=='task2do'){
+        this.$router.push({name:'myGoalTask'})
+      }else{
+        this.$router.push({name:'Record', params: {state:state}})
+      }
     }
   }
 }

client/src/views/supervisionNew/basicGoal.vue

@@ -103,7 +103,7 @@
                         :headers="upHeaders"
                         :file-list="fileList1"
                         :limit="5"
-                        accept=".doc,.docx,.xls,.xlsx,.ppt,.pptx"
+                        accept=".doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf"
                     >
                         <el-button size="small" type="primary">上传文件</el-button>
                     </el-upload>

client/src/views/supervisionNew/mytask.vue

@@ -162,7 +162,7 @@
                         :headers="upHeaders"
                         :file-list="item.fileLists"
                         :limit="1"
-                        accept=".doc,.docx,.xls,.xlsx,.ppt,.pptx"
+                        accept=".doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf"
                       >
                         <el-button size="small" type="primary">上传文件</el-button>
                       </el-upload>
@@ -254,7 +254,7 @@
                 <el-table-column label="报告证书编号" prop="number"></el-table-column>
                 <el-table-column label="更改后编号" prop="number_correct"></el-table-column>
                 <el-table-column label="出错原因" prop="reason_error"></el-table-column>
-                <el-table-column label="更改发放日期" prop="date_issue"></el-table-column>
+                <el-table-column label="更改报告发放日期" prop="date_issue"></el-table-column>
                 <el-table-column
                     align="center"
                     label="操作"
@@ -1075,38 +1075,62 @@ import user from "@/store/modules/user";
           if(this.impType=='rc'){
             impRc(this.impForm).then(res=>{
               if(res.code>=200){
-
+                this.impDialogVisible = false;
-              }else{}
+                this.$message.success("提交成功");
+                this.getRcList();
+              }else{
+                this.$message.warning(res.msg);
+              }
             })
           }else if(this.impType=='rc2'){
             impOverdue(this.impForm).then(res=>{
               if(res.code>=200){
-                
+                this.impDialogVisible = false;
-              }else{}
+                this.$message.success("提交成功");
+                this.getRcList();
+              }else{
+                this.$message.warning(res.msg);
+              }
             })
           }else if(this.impType=='pt'){
             impPt(this.impForm).then(res=>{
               if(res.code>=200){
-                
+                this.impDialogVisible = false;
-              }else{}
+                this.$message.success("提交成功");
+                this.getPtList();
+              }else{
+                this.$message.warning(res.msg);
+              }
             })
           }else if(this.impType=='risk'){
             impRisk(this.impForm).then(res=>{
               if(res.code>=200){
-                
+                this.impDialogVisible = false;
-              }else{}
+                this.$message.success("提交成功");
+                this.getRiskList();
+              }else{
+                this.$message.warning(res.msg);
+              }
             })
           }else if(this.impType=='complaint'){
             impComplaint(this.impForm).then(res=>{
               if(res.code>=200){
-                
+                this.impDialogVisible = false;
-              }else{}
+                this.$message.success("提交成功");
+                this.getComplaintList();
+              }else{
+                this.$message.warning(res.msg);
+              }
             })
           }else if(this.impType=='oinspect'){
             impOinspect(this.impForm).then(res=>{
               if(res.code>=200){
-                
+                this.impDialogVisible = false;
-              }else{}
+                this.$message.success("提交成功");
+                this.getOinspectList();
+              }else{
+                this.$message.warning(res.msg);
+              }
             })
           }
         },

client/src/views/supervisionNew/pt_form.vue

@@ -28,6 +28,7 @@
                     <el-select
                         v-model="form.result"
                         placeholder="结果"
+                        @change="resultChange"
                     >
                     <el-option
                         v-for="item in options"
@@ -40,8 +41,9 @@
                 </el-form-item>
                 <el-form-item label="处理结果" >
                     <el-select
-                        v-model="form.result"
+                        v-model="form.handle_result"
                         placeholder="处理结果"
+                        :disabled="form.result==10"
                     >
                     <el-option
                         v-for="item in handleOptions"
@@ -74,7 +76,7 @@ import { options } from "runjs";
             organizer: "",
             params: "",
             result: 10,
-            handle_result:10,
+            handle_result:0,
             task2do: 0
         },
         titleOption: {
@@ -117,6 +119,13 @@ import { options } from "runjs";
             debugger;
             console.log(this.form);
         },
+        resultChange(value){
+            debugger;
+            console.log(value)
+            if(value==10){
+                this.form.handle_result = 0;
+            }
+        },
         onSubmit() {
             this.$refs.dialogForm.validate(async (valid) => {
                 if (valid) {

client/src/views/supervisionNew/rc_form.vue

@@ -51,7 +51,7 @@
                     >
                     </el-date-picker>
                 </el-form-item>
-                <el-form-item label="发放日期"  v-else>
+                <el-form-item label="更改报告发放日期"  v-else>
                     <el-date-picker
                         v-model="form.date_issue"
                         type="date"