Merge remote-tracking branch 'origin/dev' into dev

src/views/manage/servicewaycontent/index.vue

@@ -152,30 +152,29 @@
           <div class="name">
             服务方式
             <el-button
-              type="success"
               plain
               icon="el-icon-circle-plus-outline"
               size="mini"
               @click="handleUpdateserve"
-              >新增</el-button
+            ></el-button>
-            >
+          
             <el-button
               v-if="this.itemname"
-              type="success"
+            
               plain
-              icon="el-icon-edit"
+              icon="el-icon-s-tools"
               size="mini"
               @click="handleedit"
-              >修改</el-button
+              ></el-button
             >
             <el-button
               v-if="this.itemname"
-              type="success"
+            
               plain
               icon="el-icon-delete"
               size="mini"
               @click="handledelete"
-              >删除</el-button
+              ></el-button
             >
           </div>
           <div>
@@ -225,7 +224,6 @@
             label="服务频次"
             align="center"
             prop="serviceWayFrequencyList"
-      
           >
             <!-- <template slot-scope="scope">
             
@@ -259,29 +257,22 @@
 
             <!-- </div> -->
             <!-- </template>  -->
-             <template slot-scope="scope">
+            <template slot-scope="scope">
               <!-- {{ scope.row.serviceFrequencyType }} -->
               <!-- <div
                 v-for="(item, index) in scope.row"
                 :key="index"
               > -->
-                <div
+              <div v-if="scope.row.serviceFrequencyType == 'DIGIT'">
-               
+                {{ scope.row.serviceFrequencyStart }}~{{
-                  v-if="scope.row.serviceFrequencyType == 'DIGIT'"
+                  scope.row.serviceFrequencyEnd
-                
+                }}
-                >
+              </div>
-                  {{ scope.row.serviceFrequencyStart }}~{{
+              <div v-if="scope.row.serviceFrequencyType == 'TEXT'">
-                    scope.row.serviceFrequencyEnd
+                {{ scope.row.serviceFrequencyText }}
-                  }}
+              </div>
-                </div>
-                <div
-                  v-if="scope.row.serviceFrequencyType == 'TEXT'"
-                 
-                >
-                  {{ scope.row.serviceFrequencyText }}
-                </div>
               <!-- </div> -->
-            </template> 
+            </template>
           </el-table-column>
 
           <el-table-column
@@ -350,7 +341,6 @@
         <el-form-item label="服务内容" prop="serviceContent" label-width="80">
           <el-input
             type="textarea"
-         
             style="width: 400px"
             placeholder="请输入服务内容"
             v-model="form.serviceContent"
@@ -643,15 +633,17 @@ export default {
     /** 查询服务方式内容列表 */
     getList() {
       this.loading = true;
-      this.servicewaycontentList=[]
+      this.servicewaycontentList = [];
       listServicewaycontent(this.queryParams).then((response) => {
         // this.servicewaycontentList = response.rows;
         response.rows.forEach((e) => {
           e.serviceWayFrequencyList.forEach((el) => {
             el.serviceContent = e.serviceContent;
-            this.servicewaycontentList.push(el)
+            this.servicewaycontentList.push(el);
-            console.log(this.servicewaycontentList, "this.servicewaycontentList");
+            console.log(
-
+              this.servicewaycontentList,
+              "this.servicewaycontentList"
+            );
           });
         });
 
@@ -895,6 +887,15 @@ export default {
 };
 </script>
 <style lang="scss">
+.el-form-item__error {
+    color: #ff4949;
+    font-size: 12px;
+    line-height: 1;
+    padding-top: 4px;
+    padding-left: 80px;
+    position: absolute;
+    top: 100%;
+    left: 0;}
 .left {
   height: 530px;
   overflow: auto;