Merge branch 'dev-磐石烟台1107' into dev

src/views/modules/base/epidemic/natFocus/nfVisiteList.vue

@@ -37,6 +37,23 @@
 
         </el-table-column>
 
+        <el-table-column fixed="right"
+                         label="操作"
+                         align="center"
+                         width="100">
+          <template slot-scope="scope">
+
+            <el-button @click="handleWatch(scope.row)"
+                       type="text"
+                       size="small">查看</el-button>
+            <el-button @click="handleDel(scope.row)"
+                       type="text"
+                       class="div-table-button--delete"
+                       size="small">删除</el-button>
+
+          </template>
+        </el-table-column>
+
       </el-table>
       <div>
         <el-pagination @size-change="handleSizeChange"
@@ -57,7 +74,8 @@
                @closed="handleCancle">
       <div v-if="dialogVisible"
            class="epidemic-form">
-        <el-form ref="ref_form"
+        <el-form v-if="formType==='add'"
+                 ref="ref_form"
                  :inline="true"
                  :model="formData"
                  :rules="dataRule"
@@ -76,6 +94,7 @@
                             clearable
                             placeholder="选择时间">
             </el-date-picker>
+
           </el-form-item>
 
           <el-form-item label="随访内容"
@@ -90,19 +109,38 @@
                       clearable
                       placeholder="请输入随访内容"
                       v-model="formData.content"></el-input>
+
           </el-form-item>
 
         </el-form>
 
+        <div v-else
+             class="m-row">
+          <div class="m-info">
+
+            <div class="info-prop">
+              <span class="info-title-2">随访时间：</span>
+              <span>{{ formData.visitTime||'--' }}</span>
+            </div>
+            <div class="info-prop">
+              <span class="info-title-2">随访内容：</span>
+              <span>{{ formData.content||'--' }}</span>
+            </div>
+
+          </div>
+        </div>
+
         <div class="form_div_btn">
           <el-button size="small"
-                     @click="handleCancle">取 消</el-button>
-          <el-button size="small"
+                     @click="handleCancle">{{formType==='add'?'取 消':'关 闭'}}</el-button>
+          <el-button v-if="formType==='add'"
+                     size="small"
                      type="primary"
                      @click="handleComfirm">确 定</el-button>
         </div>
       </div>
     </el-dialog>
+
   </div>
 </template>
 
@@ -116,6 +154,7 @@ export default {
   data () {
     return {
       tableLoading: false,
+      formType: 'add',
 
       tableData: [],
       total: 0,
@@ -188,11 +227,33 @@ export default {
     },
 
     handleAdd () {
+      this.formData.id = ''
+      this.formType = 'add'
+      this.dialogVisible = true
+    },
+
+    handleWatch (row) {
+      this.formType = 'detail'
+      this.formData = JSON.parse(JSON.stringify(row))
       this.dialogVisible = true
     },
 
 
     async handleComfirm () {
+
+      this.$refs['ref_form'].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj)
+
+        } else {
+          this.handleAddVisit()
+        }
+
+      })
+
+    },
+
+    async handleAddVisit () {
       this.formData.visitTime = this.formData.visitTime + ':00'
       let url = "/epmetuser/followup/save"
       // let url = "http://yapi.elinkservice.cn/mock/245/epmetuser/followup/save"
@@ -205,7 +266,6 @@ export default {
       } else {
         this.$message.error(msg)
       }
-
     },
 
     handleCancle () {
@@ -215,6 +275,31 @@ export default {
 
     },
 
+    async handleDel (rowData) {
+      let message = "确认删除?";
+
+      this.$confirm(message, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.delEvent(rowData.id);
+      }).catch((err) => { });
+    },
+    async delEvent (id) {
+      const url = "/epmetuser/followup/delete";
+      let idsArr = [id];
+
+      const { data, code, msg } = await requestPost(url, idsArr);
+
+      if (code === 0) {
+        this.$message.success("删除成功！");
+        this.loadTable();
+      } else {
+        this.$message.error("操作失败！");
+      }
+    },
+
     //导出表格
     async handleExport () {
       let today = new Date()
@@ -324,5 +409,7 @@ export default {
 
 
 <style lang="scss" scoped >
+@import "@/assets/scss/buttonstyle.scss";
 @import "@/assets/scss/modules/management/epidemic.scss";
+@import "@/assets/scss/modules/management/detail-main.scss";
 </style>

src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue

@@ -33,12 +33,29 @@
                          header-align="center"
                          align="center"
                          label="随访内容"
+                         :show-overflow-tooltip="true"
                          min-width="280">
           <template slot-scope="scope">
             <div class="twoline">{{scope.row.content}}</div>
 
           </template>
         </el-table-column>
+        <el-table-column fixed="right"
+                         label="操作"
+                         align="center"
+                         width="100">
+          <template slot-scope="scope">
+
+            <el-button @click="handleWatch(scope.row)"
+                       type="text"
+                       size="small">查看</el-button>
+            <el-button @click="handleDel(scope.row)"
+                       type="text"
+                       class="div-table-button--delete"
+                       size="small">删除</el-button>
+
+          </template>
+        </el-table-column>
 
       </el-table>
       <div>
@@ -59,7 +76,8 @@
                append-to-body
                @closed="handleCancle">
       <div class="epidemic-form">
-        <el-form ref="ref_form"
+        <el-form v-if="formType==='add'"
+                 ref="ref_form"
                  :inline="true"
                  :model="formData"
                  :rules="dataRule"
@@ -78,6 +96,7 @@
                             clearable
                             placeholder="选择时间">
             </el-date-picker>
+
           </el-form-item>
 
           <el-form-item label="随访内容"
@@ -92,14 +111,32 @@
                       clearable
                       placeholder="请输入随访内容"
                       v-model="formData.content"></el-input>
+
           </el-form-item>
 
         </el-form>
 
+        <div v-else
+             class="m-row">
+          <div class="m-info">
+
+            <div class="info-prop">
+              <span class="info-title-2">随访时间：</span>
+              <span>{{ formData.visitTime||'--' }}</span>
+            </div>
+            <div class="info-prop">
+              <span class="info-title-2">随访内容：</span>
+              <span>{{ formData.content||'--' }}</span>
+            </div>
+
+          </div>
+        </div>
+
         <div class="form_div_btn">
           <el-button size="small"
-                     @click="handleCancle">取 消</el-button>
-          <el-button size="small"
+                     @click="handleCancle">{{formType==='add'?'取 消':'关 闭'}}</el-button>
+          <el-button v-if="formType==='add'"
+                     size="small"
                      type="primary"
                      @click="handleComfirm">确 定</el-button>
         </div>
@@ -118,7 +155,7 @@ export default {
   data () {
     return {
       tableLoading: false,
-
+      formType: 'add',
       tableData: [],
       total: 0,
       pageSize: 20,
@@ -189,11 +226,33 @@ export default {
     },
 
     handleAdd () {
+      this.formData.id = ''
+      this.formType = 'add'
+      this.dialogVisible = true
+    },
+
+    handleWatch (row) {
+      this.formType = 'detail'
+      this.formData = JSON.parse(JSON.stringify(row))
       this.dialogVisible = true
     },
 
 
     async handleComfirm () {
+
+      this.$refs['ref_form'].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj)
+
+        } else {
+          this.handleAddVisit()
+        }
+
+      })
+
+    },
+    async handleAddVisit () {
+
       this.formData.visitTime = this.formData.visitTime + ':00'
       let url = "/epmetuser/followup/save"
       // let url = "http://yapi.elinkservice.cn/mock/245/epmetuser/followup/save"
@@ -206,15 +265,40 @@ export default {
       } else {
         this.$message.error(msg)
       }
-
     },
 
     handleCancle () {
-      this.$refs.ref_form.resetFields()
+      this.formData.visitTime = ''
+      this.formData.content = ''
       this.dialogVisible = false
 
     },
 
+    async handleDel (rowData) {
+      let message = "确认删除?";
+
+      this.$confirm(message, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.delEvent(rowData.id);
+      }).catch((err) => { });
+    },
+    async delEvent (id) {
+      const url = "/epmetuser/followup/delete";
+      let idsArr = [id];
+
+      const { data, code, msg } = await requestPost(url, idsArr);
+
+      if (code === 0) {
+        this.$message.success("删除成功！");
+        this.loadTable();
+      } else {
+        this.$message.error("操作失败！");
+      }
+    },
+
     //导出表格
     async handleExport () {
       let today = new Date()
@@ -324,5 +408,7 @@ export default {
 
 
 <style lang="scss" scoped >
+@import "@/assets/scss/buttonstyle.scss";
 @import "@/assets/scss/modules/management/epidemic.scss";
+@import "@/assets/scss/modules/management/detail-main.scss";
 </style>