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

client/src/api/record.js

@@ -34,7 +34,13 @@ export function updateRecord(id, data) {
     data
   })
 }
-
+export function createself(data) {
+  return request({
+    url: `/supervision/record/createself/`,
+    method: 'post',
+    data
+  })
+}
 export function upRecord(id, data) {
   return request({
     url: `/supervision/record/${id}/up/`,

client/src/views/supervision/record.vue

@@ -76,15 +76,15 @@
       <el-table-column type="index" width="50" />
       
       <el-table-column label="任务标题">
-        <template slot-scope="scope">{{ scope.row.task_.name }}</template>
+        <template slot-scope="scope" v-if="scope.row.task">{{ scope.row.task_.name }}</template>
       </el-table-column>
        <el-table-column label="材料名称">
-        <template slot-scope="scope">{{ scope.row.content_.name }}</template>
+        <template slot-scope="scope" >{{ scope.row.content_.name }}</template>
       </el-table-column>
        <el-table-column  sortable label="上报时间">
-        <template  slot-scope="scope">{{ scope.row.up_date }}</template>
+        <template  slot-scope="scope" >{{ scope.row.up_date }}</template>
       </el-table-column>
-      <el-table-column label="上报人">
+      <el-table-column label="上报人" >
         <template slot-scope="scope">{{ scope.row.up_user }}</template>
       </el-table-column>
       <el-table-column  sortable label="截止时间">
@@ -100,7 +100,7 @@
       </el-table-column>
        
          <el-table-column label="上报单位">
-        <template slot-scope="scope">{{ scope.row.belong_dept_.name }}</template>
+        <template slot-scope="scope" >{{ scope.row.belong_dept_.name }}</template>
       </el-table-column>
        <el-table-column label="记录状态">
         <template slot-scope="scope">{{ scope.row.state }}</template>

client/src/views/supervision/report.vue

@@ -1,13 +1,51 @@
 <template>
   <div class="app-container">
-    <div style="margin-top: 10px">
+   <el-card
-      <el-tabs v-model="activeName">
+    style="margin-top: 10px"
-        <el-tab-pane label="待上报" name="first" lazy> </el-tab-pane>
+    >
-        <el-tab-pane label="已上报" name="three" lazy> </el-tab-pane>
+    <el-row>
-        <el-tab-pane label="待整改" name="secord" lazy> </el-tab-pane>
+  <el-button type="primary" @click="centerDialogVisible = true" plain>主动上报</el-button>
-        <el-tab-pane label="已确认" name="fore" lazy> </el-tab-pane>
+  <el-dialog
+  title="提示"
+  :visible.sync="centerDialogVisible"
+  width="50%"
+  center>
+  <el-transfer
+      v-model="contents"
+      :data="contentOptions"
+      :titles="['材料清单', '选择的清单']"
+      :props="{ key : 'id' , label: 'name' }"
+    />
+  <span slot="footer" class="dialog-footer">
+        <el-button type="danger" @click="dialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="contentup()">确认</el-button>
+      
+  </span>
+</el-dialog>
+  </el-row>
+  </el-card>
+    <el-card
+    style="margin-top: 10px"
+    >
+    <el-row>
+    <el-col :span="24">
+    <el-tabs v-model="activeName"  @tab-click="handleClick">
+    <el-tab-pane label="待上报" name="first" lazy>
+    </el-tab-pane>
+     <el-tab-pane label="已上报" name="second" lazy>
+      </el-tab-pane>
+     <el-tab-pane label="待整改" name="third" lazy>
+      </el-tab-pane>
+       <el-tab-pane label="已确认" name="forth" lazy>
+      </el-tab-pane>
+      
+
+    
   </el-tabs>
-    </div>
+   
+   </el-col>
+    
+</el-row>
    <el-table
                   v-loading="listLoading"
                   :data="recordList"
@@ -18,25 +56,30 @@
                   max-height="600px"
                 >
                   <el-table-column label="序号" type="index" align="center" />
-      <el-table-column label="单位">
+                    <el-table-column label="任务标题">
+                    <template slot-scope="scope" v-if="scope.row.task">{{
+                      scope.row.task_.name
+                    }}</template>
+                  </el-table-column>
+                  <el-table-column label="材料">
                     <template slot-scope="scope">{{
-          scope.row.belong_dept_.name
+                      scope.row.content_.name
                     }}</template>
                   </el-table-column>
                   <el-table-column label="状态">
-        <template slot-scope="scope">{{ scope.row.state }}</template>
+                    <template slot-scope="scope">{{
+                      scope.row.state
+                    }}</template>
                   </el-table-column>
                   <el-table-column label="上报情况">
-        <template slot-scope="scope" v-if="scope.row.up_user_"
+                    <template slot-scope="scope"
-          >{{ scope.row.up_user_.name }}/{{ scope.row.up_date }}</template
+                      v-if="scope.row.up_user_">{{ scope.row.up_user_.name }}/{{ scope.row.up_date }}</template
                     >
                   </el-table-column>
                     <el-table-column align="center" label="操作">
                     <template slot-scope="scope">
                       <el-button
-            v-if="
+                        v-if="scope.row.state == '待上报' && checkPermission(['record_update'])"
-              scope.row.state == '待上报' && checkPermission(['record_update'])
-            "
                         type="primary"
                         size="small"
                         @click="handleUpdate(scope)"
@@ -50,9 +93,7 @@
                         >上报</el-button
                       >
                       <el-button
-            v-if="
+                        v-if="scope.row.state == '已提交' && checkPermission(['record_confirm'])"
-              scope.row.state == '已提交' && checkPermission(['record_confirm'])
-            "
                         type="primary"
                         size="small"
                         @click="handleConfirm(scope)"
@@ -73,7 +114,10 @@
                       >
                     </template>
                   </el-table-column>
+                
                 </el-table>
+</el-card>
+     
                   <el-dialog
       :visible.sync="dialogVisible"
       title="主动上报"
@@ -92,7 +136,9 @@
   </div>
 </template>
 <script>
-import { getRecordList } from "@/api/record";
+import { getRecordList,createself } from "@/api/record";
+
+import { getContentList } from "@/api/content";
 import Pagination from "@/components/Pagination";
 import taskinit from "@/views/supervision/taskinit";
 import checkPermission from "@/utils/permission";
@@ -101,8 +147,13 @@ export default {
   components: { Pagination, taskinit, recorddo },
   data() {
     return {
+         centerDialogVisible: false,
       dialogVisible: false,
       activeName: "first",
+      state:"待上报",
+      can_doself:true,
+      contents: [],
+      contentOptions: [],
       contents: [],
       depts: [],
       listLoading: false,
@@ -112,22 +163,60 @@ export default {
     };
   },
   created() {
+    this.getContentList();
     this.getRecordList();
   },
   methods: {
    checkPermission,
-    getRecordList() {
+    getRecordList(){
-      getRecordList().then((res) => {
+      
+      getRecordList({state:this.state}).then((res) => {
         this.listLoading = false;
         this.recordList = res.data.results;
       });
     },
+     getContentList() {
+        getContentList({can_doself:this.can_doself}).then(res=>{
+            this.contentOptions = res.data
+        })
+    },
+      
+     handleClick(tab, event) {
+      switch (tab.name) {
+        case "first":
+          this.state="待上报";
+          this.getRecordList();
+          break;
+        case "second":          
+          this.state="已上报";
+          this.getRecordList();
+          break;
+        case "third":
+          this.state="待整改";
+          this.getRecordList();
+          break;
+        case "forth":          
+          this.state="已确认";
+          this.getRecordList();
+          break;
+      }
+    },
+  
     handleUpdate(scope) {
       this.data = {
         action: "update",
         record: scope.row,
       };
       this.drawer = true;
+    },
+     chooseComplete(data) {
+      this.dialogVisible = false;
+      const rLoading = this.openLoading("正在初始化任务,请稍等...");
+      inittask(this.task.id, data).then((res) => {
+        rLoading.close();
+        this.$message.success("成功");
+        this.$router.go(0);
+      });
     },
     handleUp(scope) {
       this.data = {
@@ -161,6 +250,19 @@ export default {
       };
       this.drawer = true;
     },
+    contentup(){
+      console.log(this.contents)
+         if(this.contents.length>0){
+           
+          
+             createself({contents:this.contents}
+        ).then((res) => {
+          alert(1)
+        });
+        }else{
+            this.$message.error('请选择清单!')
+        }
+    },
   },
 };
 </script>

server/apps/supervision/views.py

@@ -29,7 +29,7 @@ class ContentViewSet(CreateUpdateCustomMixin, ModelViewSet):
     serializer_class = ContentSerializer
     pagination_class = None
     search_fields = ['name', 'desc']
-    filterset_fields = ['type']
+    filterset_fields = ['type','can_doself']
     ordering = ['type__sort', 'create_time']
 
 class TaskViewSet(CreateUpdateCustomMixin, ModelViewSet):
@@ -125,7 +125,7 @@ class RecordViewSet(RbacFilterSet, PageOrNot, CreateUpdateCustomMixin, ModelView
         instance.save()
         return Response(status=status.HTTP_200_OK)
     
-    @action(methods=['post'], detail=True, perms_map = {'post':'record_up'})
+    @action(methods=['post'], detail=False, perms_map = {'post':'record_creates'})
     def createself(self, request, *args, **kwargs):
         contents = request.data['contents']
         rlist = []