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

client/.env.production

@@ -3,4 +3,5 @@ ENV = 'production'
 
 # base api
 VUE_APP_BASE_API = 'https://testsearch.ctc.ac.cn/api'
+#VUE_APP_BASE_API = 'http://47.95.0.242:2222/api'
 

client/src/api/ability.js

@@ -155,6 +155,13 @@ export function updateQtask(id,data) {
   })
 }
 
+export function deleteQtask(id) {
+  return request({
+    url:`/ability/qtask/${id}/`,
+    method:'delete'
+  })
+}
+
 export function qtaskStart(id) {
   return request({
     url:`/ability/qtask/${id}/start/`,

client/src/views/ability/mQualityTask.vue

@@ -289,11 +289,11 @@
         label-position="right"
         :rules="rule"
       >
-        <el-form-item label="资质认定" prop="type">
+        <el-form-item label="资质名称" prop="type">
           <el-select
             style="width: 100%;"
             v-model="qualiForm.type"
-            placeholder="资质认定"
+            placeholder="资质名称"
             @change="qualiTypeChange"
           >
             <el-option
@@ -304,8 +304,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="资质名称" prop="name" v-if="qualiForm.type==='OTHER'">
-          <el-input v-model="qualiForm.name" placeholder="资质名称"/>
+        <el-form-item label="具体名称" prop="name" v-if="qualiForm.type==='OTHER'">
+          <el-input v-model="qualiForm.name" placeholder="具体名称"/>
         </el-form-item>
         <el-form-item label="资质类型" v-if="qualiForm.type==='CMA'">
           <el-select
@@ -494,11 +494,11 @@
         label-position="right"
         :rules="rule"
       >
-        <el-form-item label="资质认定" prop="type">
+        <el-form-item label="资质名称" prop="type">
           <el-select
             style="width: 100%;"
             v-model="qualiForm.type"
-            placeholder="资质认定"
+            placeholder="资质名称"
             @change="qualiTypeChange"
           >
             <el-option
@@ -509,8 +509,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="资质名称" prop="name" v-if="qualiForm.type==='OTHER'">
-          <el-input v-model="qualiForm.name" placeholder="资质名称"/>
+        <el-form-item label="具体名称" prop="name" v-if="qualiForm.type==='OTHER'">
+          <el-input v-model="qualiForm.name" placeholder="具体名称"/>
         </el-form-item>
         <el-form-item label="资质类型" v-if="qualiForm.type==='CMA'">
           <el-select
@@ -734,7 +734,7 @@
     cityLists,
     qactionItem,
     qualiNoChange,
-    abilityNoChange
+    abilityNoChange,
   } from "@/api/ability";
   import {getDictList} from "@/api/dict";
   import {genTree} from "@/utils";

client/src/views/ability/qualityTask.vue

@@ -65,18 +65,23 @@
               size="small"
               @click="handleClick(scope)"
             >执行</el-link>
-           <!-- <el-link
-              v-if="scope.row.state==='待发布'"
+           <el-link
+              v-if="scope.row.state!='已关闭'"
               type="primary"
               size="small"
               @click="handleEdit(scope)"
-            >编辑</el-link>-->
+            >编辑</el-link>
             <el-link
               v-if="scope.row.state==='待发布'"
               type="warning"
               size="small"
               @click="handleStart(scope)"
             >发布</el-link>
+            <el-link
+              type="danger"
+              size="small"
+              @click="handleDelete(scope)"
+            >删除</el-link>
           </template>
         </el-table-column>
       </el-table>
@@ -135,7 +140,7 @@
 
 <script>
   import { getOrgList } from "@/api/org";
-  import {getQtask,createQtask,updateQtask,qtaskStart} from "@/api/ability";
+  import {getQtask,createQtask,updateQtask,qtaskStart, deleteQtask} from "@/api/ability";
   import {genTree} from "@/utils";
   import checkPermission from "@/utils/permission";
   import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
@@ -280,6 +285,22 @@
       resetFilter() {
         this.pageForm.search = '';
         this.getQtaskList();
+      },
+            //删除操作
+      handleDelete(scope) {
+        let that = this;
+        that.$confirm("确认删除吗?", "提示")
+          .then(async () => {
+            await deleteQtask(scope.row.id).then(res => {
+              if (res.code >= 200 && res.code < 400) {
+                that.getQtaskList();
+                that.$message.success("成功");
+              }
+            });
+          })
+          .catch((err) => {
+            console.error(err);
+          });
       },
     },
 

client/src/views/ability/qualityTaskDo.vue

@@ -364,7 +364,8 @@
         atypeOptions: {},
         afieldOptions: {},
         atype_name:'',
-        afield_name:''
+        afield_name:'',
+        item:{}
       };
     },
     created() {
@@ -422,6 +423,7 @@
       },
       //操作处理
       handleRecord(type, item) {
+        this.item = item
         this.showData.id = item.id;
         this.showData.data = item;
         this.showData.type = item.action;