1102的两个问题

client/src/store/modules/user.js

@@ -7,7 +7,8 @@ const getDefaultState = () => {
     token: getToken(),
     name: '',
     avatar: '',
-    perms: []
+    perms: [],
+    dept:''
   }
 }
 

client/src/views/ability/mQualityTask.vue

@@ -682,8 +682,13 @@
         style="padding: 10px 20px;position: relative"
       >
         <p style="font-size: 20px;font-weight: bold;">新增能力</p>
-        <p><span style="display: inline-block;width: 100px;font-weight: bold;">能力类型 ：</span>{{showData.data.atype_name}}</p>
+        <p><span class="drawerInfoTitle">能力类型 ：</span>{{showData.data.atype_name}}</p>
-        <p><span style="display: inline-block;width: 100px;font-weight: bold;">能力领域：</span>{{showData.data.afield_name}}</p>
+        <p><span class="drawerInfoTitle">能力领域：</span>{{showData.data.afield_name}}</p>
+
+        <p><span class="drawerInfoTitle">对象数量：</span>{{showData.data.num}}</p>
+        <p><span class="drawerInfoTitle">参数数量：</span>{{showData.data.num2}}</p>
+        <p><span class="drawerInfoTitle">方法标准数量：</span>{{showData.data.num3}}</p>
+        <p><span class="drawerInfoTitle">产品标准数量：</span>{{showData.data.num4}}</p>
         <p v-if="showData.data.file_"><span style="display: inline-block;width: 100px;font-weight: bold;">上传文件：</span>{{showData.data.file_.name}}</p>
         <el-link v-if="showData.data.file_" :href="showData.data.file_.file" target="_blank" type="primary">{{showData.data.file_.name}}</el-link>
         <el-divider></el-divider>
@@ -716,8 +721,9 @@
 <script>
   import {
     getQtaskMy,
+    qtaskDetail,
     getQtask,
-    qactionMy,
+    qactionList,
     getQualityMy,
     createQuali,
     qactionDelete,
@@ -732,7 +738,7 @@
   } from "@/api/ability";
   import {getDictList} from "@/api/dict";
   import {genTree} from "@/utils";
-  import {getOrgList} from "@/api/org";
+  import {getOrgList, getSubOrgList} from "@/api/org";
   import {getCMAGroup} from "@/api/cma";
   import checkPermission from "@/utils/permission";
   import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
@@ -854,6 +860,9 @@
       this.afieldOptions = [];
       this.getOptions();
       this.getProvince();
+      // debugger;
+      console.log(this.$store.state.user.dept);
+      this.pageForm.org = this.$store.state.user.dept;
     },
 
     methods: {
@@ -943,8 +952,9 @@
       },
       checkPermission,
       getTableList() {
-        this.listLoading = true;
+        this.listLoading = true;getQtaskMy
         getQtaskMy(this.pageForm).then((response) => {
+        // qtaskDetail(this.pageForm).then((response) => {
           if (response.data) {
             debugger;
             this.taskList = response.data;
@@ -956,9 +966,15 @@
         });
       },
       getGroup() {
-        getOrgList({can_supervision: true}).then((res) => {
+        if (this.checkPermission(["record_confirm"])) {
+        getOrgList({ can_supervision: true }).then((res) => {
           this.orgData = res.data;
         });
+      } else {
+        getSubOrgList().then((res) => {
+          this.orgData = res.data;
+        });
+      }
       },
       getrecordlist() {
         this.getTableList();
@@ -970,16 +986,18 @@
         this.checkedItem = obj;
         this.qtask = obj.qtask;
         this.qtaskName = obj.qtask_.name;
-        this.buttonsShow = true;
+        if(obj.org== this.$store.state.user.dept){
+          this.buttonsShow = true;
+        }else{
+          this.buttonsShow = false;
+        }
         this.listQuery.qtask = obj.qtask;
-        qactionMy(this.listQuery).then((res) => {
+        qactionList(this.listQuery).then((res) => {
           this.recordList = res.data;
         })
       },
-
-      ///////
       getList() {
-        qactionMy(this.listQuery).then((res) => {
+        qactionList(this.listQuery).then((res) => {
           this.recordList = res.data;
         })
       },
@@ -1134,6 +1152,9 @@
         });
       },
       handleDetail(type,item){
+        debugger;
+        console.log(type)
+        console.log(item)
         let that = this;
         that.drawer = true;
         this.showData.id = item.id;
@@ -1148,7 +1169,9 @@
           if (res.code>=200) {
             let updateDetail = res.data.update_detail;//更改字段
             updateDetail.forEach(item=>{
+              // debugger;
               this.fieldList2.push(item.field);//所有字段
+              debugger;
             });
             this.drawer = true;
           }
@@ -1177,5 +1200,9 @@
 </script>
 
 <style scoped>
-
+.drawerInfoTitle{
+  display: inline-block;
+  width: 120px;
+  font-weight: bold;
+}
 </style>

client/src/views/ability/qualityTaskDo.vue

@@ -481,7 +481,7 @@
       clickRow(row, col, e) {
         this.listLoading2 = true;
         this.detailItem = row;
-        this.listQuery = {pageoff: true, qtask: row.qtask, belong_dept: row.dept};
+        this.listQuery = {pageoff: true, qtask: row.qtask, belong_dept: row.org};
         this.getQactionList();
       },
       handleSelectRecords(val) {

client/src/views/ability/recordselect.vue

@@ -60,7 +60,6 @@
         highlight-current-row
         max-height="600"
         @sort-change="changeTableSort"
-        :span-method="objectSpanMethod"
       >
         <el-table-column type="index" width="50" />
 
@@ -116,7 +115,7 @@
           <template slot-scope="scope" v-if="scope.row.files">
             <el-link
               v-if="scope.row.files.length > 1"
-              @click="handleRecord({ action: 'view', record: scope.row })"
+              @click="handleRecord(scope.row)"
               >有
               <span style="color: red">{{ scope.row.files.length }}</span>
               个文件</el-link
@@ -138,33 +137,56 @@
         @pagination="getList"
       />
     </el-card>
-   
+   <el-drawer
+      :visible.sync="drawerLiminted"
+      :with-header="false"
+      size="40%">
+    <div class="drawerTitle">资质能力报送记录</div>
+    <el-form   class="drawerBody"  v-if="record.content_">
+      <el-form-item label="材料名称">
+        {{ record.content_.name }}
+      </el-form-item>
+      <el-form-item label="材料详情" v-if="record.content_">
+        {{ record.content_.desc }}
+      </el-form-item>
+      <el-form-item label="报送状态">
+        {{ record.state }}
+        <el-tag v-if="record.is_self" style="margin-left: 2px" effect="plain">主动报送</el-tag>
+      </el-form-item>
+      <el-form-item label="所属任务" v-if="record.task_">
+        {{ record.task_.name }}/{{ record.task_.end_date }}
+      </el-form-item>
+      <el-form-item label="执行组织" v-if="record.belong_dept_">
+        {{ record.belong_dept_.name }}
+      </el-form-item>
+      <el-form-item label="报送人" v-if="record.up_user_">
+        {{ record.up_user_.name }}/{{ record.up_date }}
+      </el-form-item>
+      <el-form-item label="文件列表">
+      </el-form-item>
+      <div
+      class="recordfiles"
+        v-for="(item, index) in record.files_"
+        v-bind:key="item.id"
+      >
+        <el-link :href="item.path" target="_blank" type="primary">{{
+          item.name
+        }}</el-link>
+      </div>
+    </el-form>
+   </el-drawer>
   </div>
 </template>
-<style lang="scss">
-.el-transfer-panel {
-  width: 470px;
-}
-.el-transfer__buttons {
-  padding: 0 2px;
-  .el-button {
-    display: block;
-  }
-}
-</style>
 <script>
 import { getOrgList, getSubOrgList } from "@/api/org";
 import { getRecordList } from "@/api/ability";
 import checkPermission from "@/utils/permission";
 import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-const defaultrecord = {
-  name: "",
-};
 export default {
   components: { Pagination},
   data() {
     return {
-      record: defaultrecord,
+      record: {},
       recordList: {
         count: 0,
       },
@@ -215,7 +237,9 @@ export default {
       },
       listLoading: false,
       dialogVisible: false,
+      drawerLiminted:false,
       dialogType: "new",
+      orgData:[],
       rule1: {
         name: [{ required: true, message: "请输入", trigger: "blur" }],
       },
@@ -225,10 +249,21 @@ export default {
   watch: {},
   created() {
     this.getState();
+    this.getGroup();
   },
   methods: {
     checkPermission,
-
+    getGroup() {
+        if (this.checkPermission(["record_confirm"])) {
+        getOrgList({ can_supervision: true }).then((res) => {
+          this.orgData = res.data;
+        });
+      } else {
+        getSubOrgList().then((res) => {
+          this.orgData = res.data;
+        });
+      }
+      },
     getState() {
       if(this.checkPermission(["record_confirm"])){
         this.listQuery = {
@@ -248,7 +283,14 @@ export default {
       });
     },
    
-
+    changeTableSort(val) {
+      if (val.order == "ascending") {
+        this.listQuery.ordering = val.prop;
+      } else {
+        this.listQuery.ordering = "-" + val.prop;
+      }
+      this.getList();
+    },
     handleFilter() {
       this.listQuery.page = 1;
       this.getList();
@@ -261,8 +303,32 @@ export default {
       };
       this.getList();
     },
+    handleRecord(item){
+      this.drawerLiminted = true;
+      this.record = item;
+    },
 
     
   },
 };
 </script>
+<style lang="scss">
+.el-transfer-panel {
+  width: 470px;
+}
+.el-transfer__buttons {
+  padding: 0 2px;
+  .el-button {
+    display: block;
+  }
+}
+.drawerTitle{
+  padding: 20px 0 20px 20px;
+}
+.drawerBody{
+  padding-left: 20px;
+}
+.recordfiles{
+  margin: 2px;
+}
+</style>