瀏覽代碼

fix all bug

xjc 4 年之前
父節點
當前提交
760fa809aa

+ 6 - 0
src/api.js

@@ -102,6 +102,9 @@ export default {
 	editTemplate: params => {
 		return axios.put(`${baseURL}/api/admin/message/template`, params);
 	},
+	editTemplateStatus: params => {
+		return axios.put(`${baseURL}/api/admin/message/template/status`, params);
+	},
 	// 删除表单模板
 	delTemplate: params => {
 		return axios.delete(`${baseURL}/api/admin/message/template`, { params: params });
@@ -144,6 +147,9 @@ export default {
 	editMessage: params => {
 		return axios.put(`${baseURL}/api/admin/message`, params);
 	},
+	editMessageStatus: params => {
+		return axios.put(`${baseURL}/api/admin/message/status`, params);
+	},
 	getMessageList: params => {
 		return axios.get(`${baseURL}/api/admin/message/list`, { params: params });
 	},

+ 7 - 0
src/style/home.scss

@@ -236,3 +236,10 @@ tbody{
 .el-dialog__footer{
 	text-align: center;
 }
+// 停用启用样式
+.open {
+	color: rgb(19, 206, 102);
+}
+.close {
+	color: red;
+}

+ 18 - 3
src/views/message/InnerSurvey.vue

@@ -177,12 +177,21 @@ a {
         </el-table-column>
         <el-table-column prop="zip" width="150" label="操作">
           <template slot-scope="scope">
+            <el-button
+              :class="scope.row.status == 1 ? 'close' : 'open'"
+              type="text"
+              @click="switchStatus(scope.row)"
+              >{{ scope.row.status == 1 ? "禁用" : "启用" }}</el-button
+            >
             <el-button class="edit" type="text" @click="edit(scope.row)"
               >编辑</el-button
             >
-            <el-button class="del" @click="del(scope.row.id)" type="text"
-              >删除</el-button
-            >
+            <el-button
+              v-if="scope.row.status == 0"
+              class="del"
+              @click="del(scope.row.id)"
+              type="text"
+              >删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -235,6 +244,7 @@ a {
           <el-select
             placeholder="请选择问卷模板"
             v-model="form1.template_id"
+            :disabled="form1.edit"
             clearable
           >
             <el-option
@@ -559,6 +569,11 @@ export default {
     };
   },
   methods: {
+    switchStatus(row) {
+      this.$api.editMessageStatus({id:row.id}).then((res)=>{
+        row.status = res.data.data
+      })
+    },
     showQrcode(row) {
       this.dialogTitle4 = "生成二维码";
       this.dialogVisible4 = true;

+ 4 - 1
src/views/message/Notice.vue

@@ -74,9 +74,12 @@ a {
     font-weight: 600;
   }
 }
-.w-e-text {
+/deep/.w-e-text {
   min-height: 500px;
 }
+.w-e-text-container{
+  height: 500px;
+}
 .fu-dialog {
   .el-dialog {
     width: 60%;

+ 18 - 3
src/views/message/OutSurvey.vue

@@ -167,12 +167,21 @@ a {
         </el-table-column>
         <el-table-column prop="zip" width="150" label="操作">
           <template slot-scope="scope">
+            <el-button
+              :class="scope.row.status == 1 ? 'close' : 'open'"
+              type="text"
+              @click="switchStatus(scope.row)"
+              >{{ scope.row.status == 1 ? "禁用" : "启用" }}</el-button
+            >
             <el-button class="edit" type="text" @click="edit(scope.row)"
               >编辑</el-button
             >
-            <el-button class="del" @click="del(scope.row.id)" type="text"
-              >删除</el-button
-            >
+            <el-button
+              v-if="scope.row.status == 0"
+              class="del"
+              @click="del(scope.row.id)"
+              type="text"
+              >删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -211,6 +220,7 @@ a {
           <el-select
             placeholder="请选择问卷模板"
             v-model="form1.template_id"
+            :disabled="form1.edit"
             clearable
           >
             <el-option
@@ -536,6 +546,11 @@ export default {
   },
   // computed() {},
   methods: {
+    switchStatus(row) {
+      this.$api.editMessageStatus({id:row.id}).then((res)=>{
+        row.status = res.data.data
+      })
+    },
     showQrcode(row) {
       this.dialogTitle4 = "生成二维码";
       this.dialogVisible4 = true;

+ 41 - 19
src/views/message/templateList.vue

@@ -54,7 +54,7 @@
         <el-table-column prop="name" label="模板名称"> </el-table-column>
         <el-table-column prop="cname" label="创建人"> </el-table-column>
         <el-table-column prop="ctime" label="创建时间"> </el-table-column>
-        <el-table-column prop="zip" width="150" label="操作">
+        <el-table-column prop="zip" width="250" label="操作">
           <template slot-scope="scope">
             <el-button
               class="edit"
@@ -63,15 +63,24 @@
               v-if="scope.row.edit"
               >编辑</el-button
             >
-            <el-button
-              class="edit"
-              type="text"
-              @click="edit(scope.row)"
+            <el-tooltip
               v-else
-              disabled
-              >编辑</el-button
+              class="item"
+              effect="dark"
+              content="该模版使用的问卷正在被填报,无法修改,可新增模版-选择复用历史模版使用该模版或删除正在使用该模版的问卷!"
+              placement="top-start"
             >
-            <el-button class="del" @click="del(scope.row.id)" type="text"
+              <el-button
+                class="edit"
+                type="text"
+                style="color: #ccc; cursor: not-allowed"
+                >编辑</el-button
+              >
+            </el-tooltip>
+            <el-button
+              class="del"
+              @click="del(scope.row.id)"
+              type="text"
               >删除</el-button
             >
           </template>
@@ -96,12 +105,17 @@
         size="small"
         class="preview"
         :inline="false"
-        label-width="80px"
+        label-width="100px"
         :rules="rules"
         :model="form1"
       >
-        <el-form-item label="选择历史模板" v-if="!form1.id">
-          <el-select v-model="form1.copyid" filterable @change="changeTemplate">
+        <el-form-item label="复用历史模板" v-if="!form1.id">
+          <el-select
+            v-model="form1.copyid"
+            filterable
+            @change="changeTemplate"
+            placeholder="请选择历史模板"
+          >
             <el-option
               v-for="(item, index) in allTemplate"
               :key="index"
@@ -153,17 +167,24 @@ export default {
     };
   },
   methods: {
-    changeTemplate(val){
-      let selVal = this.allTemplate.filter(function(x){return x.id==val})
-      this.form1.name = selVal[0].name
+    switchStatus(row) {
+      this.$api.editTemplateStatus({id:row.id}).then((res)=>{
+        row.status = res.data.data
+      })
+    },
+    changeTemplate(val) {
+      let selVal = this.allTemplate.filter(function (x) {
+        return x.id == val;
+      });
+      this.form1.name = selVal[0].name;
     },
     addTtitle() {
       this.$refs["form1"].validate((valid) => {
         if (valid) {
-          let query = { title: this.form1.name, id: this.form1.id }
-          if(this.form1.copyid){
-            query.id = this.form1.copyid
-            query.copyid = this.form1.copyid
+          let query = { title: this.form1.name, id: this.form1.id };
+          if (this.form1.copyid) {
+            query.id = this.form1.copyid;
+            query.copyid = this.form1.copyid;
           }
           this.$router.push({
             path: "/message/template/add",
@@ -190,7 +211,8 @@ export default {
     },
     edit(row) {
       this.$api.getTemplate({ id: row.id }).then((res) => {
-        this.form1 = row;
+        // this.form1 = row;
+        this.form1 = res.data.data;
         this.dialogVisible = true;
       });
     },