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

src/views/manage/servicewaycontent/index.vue

@@ -192,7 +192,7 @@
             >
               全部
             </div>
-            <!-- <span class="count">{{ count }}</span> -->
+            <span class="count">{{ count }}</span>
           </div>
           <div
             class="listitem"
@@ -351,7 +351,10 @@
           prop="serviceFrequencyType"
           label-width="80px"
         >
+        <el-form-item label="" prop="serviceFrequencyType" label-width="">
           <el-checkbox v-model="DIGIT" @change="DIGITlist">数字</el-checkbox>
+        </el-form-item>
+
           <div style="display: flex; margin: -32px 34px 0 66px">
             <el-form-item label="" prop="serviceFrequencyStart" label-width="">
               <el-input
@@ -371,7 +374,10 @@
           </div>
           <div>
             <div style="position: relative; top: 12px">
+              <el-form-item label="" prop="serviceFrequencyType" label-width="">
               <el-checkbox v-model="TEXT" @change="textlist">文本</el-checkbox>
+            </el-form-item>
+
             </div>
             <div style="margin: -23px 45px 0px 74px">
               <el-form-item label="" prop="serviceFrequencyText" label-width="">
@@ -497,15 +503,21 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        serviceFrequencyType: [
-          { required: true, message: "请选中服务频次", trigger: "blur" },
-        ],
-        serviceContent: [
-          { required: true, message: "请输入服务内容", trigger: "blur" },
-        ],
+        // serviceFrequencyType: [
+        //   { required: true, message: "请选中服务频次", trigger: "blur" },
+        // ],
+        // serviceContent: [
+        //   { required: true, message: "请输入服务内容", trigger: "blur" },
+        // ],
         // serviceFrequencyEnd:[
         // { required: true, message: "请输入结束值", trigger: "blur" },
         // ],
+        // serviceFrequencyStart:[
+        // { required: true, message: "请输入结束值", trigger: "blur" },
+        // ],
+        // serviceFrequencyText:[
+        // { required: true, message: "请输入结束值", trigger: "blur" },
+        // ],
       },
       itemname: null,
       serviceWayName: null,
@@ -543,6 +555,9 @@ export default {
     },
     textlist(e) {
       if (e == true) {
+        this.form.serviceFrequencyStart=null
+        this.form.serviceFrequencyEnd=null
+
         this.disableda = true;
         this.disabledb = true;
         this.disabled = false;
@@ -554,6 +569,7 @@ export default {
     DIGITlist(e) {
       console.log(e, "5");
       if (e == true) {
+        this.form.serviceFrequencyText=null
         this.disableda = false;
         this.disabledb = false;
         this.disabled = true;
@@ -596,10 +612,14 @@ export default {
       this.loading = true;
       serviceWayList(this.querydepartmen).then((response) => {
         this.DepartmentoList = response.data;
-        // this.count=this.DepartmentoList.length
-        console.log(this.DepartmentoList);
-        // this.Option
-        // this.total = response.total;
+        let sum = 0;
+        this.DepartmentoList.forEach(item=>{
+          if (item.serviceContentNum) {
+            console.log(item.countNum)
+            sum += item.serviceContentNum;
+          }
+          this.count = sum;
+        })
         this.loading = false;
       });
     },
@@ -737,7 +757,10 @@ export default {
         this.form = response.data;
         // this.form.serviceWayId=row.serviceWayId
         this.form.id = response.data.serviceFrequencyId;
-        this.form.serviceWayId = response.data.serviceWayId;
+        if(response.data.serviceWayId){
+          this.form.serviceWayId = response.data.serviceWayId;
+
+        }
         //  ----------
 
         if (response.data.serviceFrequencyType == "DIGIT") {
@@ -768,33 +791,33 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          if (
-            this.form.serviceFrequencyType == "DIGIT" &&
-            this.form.serviceFrequencyStart == null &&
-            this.form.serviceFrequencyEnd == null
-          ) {
-            this.$message.error("请输入服务频次起始值和结束值");
-          } else if (
-            this.form.serviceFrequencyType == "DIGIT" &&
-            this.form.serviceFrequencyStart == null
-          ) {
-            this.$message.error("请输入服务频次起始值");
-          } else if (
-            this.form.serviceFrequencyType == "DIGIT" &&
-            this.form.serviceFrequencyEnd == null
-          ) {
-            this.$message.error("请输入服务频次结束值");
-          } else if (
-            this.form.serviceFrequencyType == "TEXT" &&
-            this.form.serviceFrequencyText == null
-          ) {
-            this.$message.error("请输入服务频次文本");
-          } else if (
-            this.form.serviceFrequencyType != "TEXT" &&
-            this.form.serviceFrequencyType != "DIGIT"
-          ) {
-            this.$message.error("请选择数字还是文本");
-          } else {
+          // if (
+          //   this.form.serviceFrequencyType == "DIGIT" &&
+          //   this.form.serviceFrequencyStart == null &&
+          //   this.form.serviceFrequencyEnd == null
+          // ) {
+          //   this.$message.error("请输入服务频次起始值和结束值");
+          // } else if (
+          //   this.form.serviceFrequencyType == "DIGIT" &&
+          //   this.form.serviceFrequencyStart == null
+          // ) {
+          //   this.$message.error("请输入服务频次起始值");
+          // } else if (
+          //   this.form.serviceFrequencyType == "DIGIT" &&
+          //   this.form.serviceFrequencyEnd == null
+          // ) {
+          //   this.$message.error("请输入服务频次结束值");
+          // } else if (
+          //   this.form.serviceFrequencyType == "TEXT" &&
+          //   this.form.serviceFrequencyText == null
+          // ) {
+          //   this.$message.error("请输入服务频次文本");
+          // } else if (
+          //   this.form.serviceFrequencyType != "TEXT" &&
+          //   this.form.serviceFrequencyType != "DIGIT"
+          // ) {
+          //   this.$message.error("请选择数字还是文本");
+          // } else {
             console.log(this.form, "555555");
             console.log(this.form.serviceWayId);
 
@@ -814,7 +837,7 @@ export default {
               });
             }
           }
-        }
+        // }
       });
     },
     // 修改服务方式

src/views/system/agency/index.vue

@@ -1097,6 +1097,6 @@ export default {
 }
 
 .el-cascader .el-input input::-webkit-input-placeholder {
-  color: black;
+  color: #686a6d;
 }
 </style>