修改服务包

src/views/manage/servicewaycontent/index.vue

@@ -336,16 +336,30 @@
 
     <!-- 添加或修改服务方式内容对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="70px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <!-- <el-form-item label="服务方式名称" prop="serviceWayName">
           <el-input v-model="form.serviceWayName" placeholder="请输入服务方式名称" />
         </el-form-item>
         <el-form-item label="服务方式编码" prop="serviceWayCode">
           <el-input v-model="form.serviceWayCode" placeholder="请输入服务方式编码" />
-        </el-form-item>
-        <el-form-item label="所属服务方式id" prop="serviceWayId">
-          <el-input v-model="form.serviceWayId" placeholder="请输入所属服务方式id" />
         </el-form-item> -->
+         <el-form-item label="所属服务方式" prop="serviceWayId">
+          <el-select
+            v-model="form.serviceWayId"
+            clearable
+            placeholder="请选择服务方式"
+            style="width: 250px"
+            @change="change"
+          >
+            <el-option
+              v-for="item in DepartmentoList"
+              :key="item.id"
+              :label="item.serviceWayName"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+          <!-- <el-input v-model="form.serviceWayId" placeholder="请输入所属服务方式id" /> -->
+        </el-form-item>
         <el-form-item label="服务内容" prop="serviceContent" label-width="80">
           <el-input
             type="textarea"
@@ -514,6 +528,7 @@ export default {
         // ],
       },
       itemname: null,
+      serviceWayName:null,
       querydepartmen: {
         serviceWayName: "",
       },
@@ -605,11 +620,15 @@ export default {
         this.DepartmentoList = response.data;
         // this.count=this.DepartmentoList.length
         console.log(this.DepartmentoList);
-
+        // this.Option
         // this.total = response.total;
         this.loading = false;
       });
     },
+    change(e){
+console.log(e)
+// this.form.serviceWayId=e
+    },
     // 左侧科室
     itemdata(item) {
       if (item) {
@@ -620,10 +639,12 @@ export default {
         //   this.disabled=true
         // }
         this.itemname = item.id;
+        this.serviceWayName=item.serviceWayName
+        this.form.serviceWayId = item.id;
+
         // this.departmentName = item.serviceWayName;
         this.loading = true;
         this.queryParams.serviceWayId = item.id;
-        this.form.serviceWayId=item.id
         this.getList();
       } else {
         this.queryParams.serviceWayId = "";
@@ -712,6 +733,16 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      console.log(this.itemname,'itemname')
+      if (this.itemname) {
+        this.form.serviceWayName = this.serviceWayName
+        this.form.serviceWayId = this.itemname
+        console.log( this.form,' this.form')
+        
+      } 
+      // else if (this.itemname == null) {
+      //   this.form.serviceWayId = "请选择服务方式"
+      // }
       this.form.serviceFrequencyType = "DIGIT";
       this.open = true;
       this.title = "添加服务方式内容";
@@ -720,10 +751,11 @@ export default {
     handleUpdate(row) {
       console.log(row,'99999');
       this.reset();
-      // const id = row.id
       getServicewaycontent(row.valuePlusMax).then((response) => {
         this.form = response.data;
+        // this.form.serviceWayId=row.serviceWayId
         this.form.id = response.data.serviceFrequencyId;
+        this.form.serviceWayId=response.data.serviceWayId
         //  ----------
 
         if (response.data.serviceFrequencyType == "DIGIT") {
@@ -744,7 +776,6 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      console.log(this.form)
     
           this.$refs["form"].validate((valid) => {
         if (valid) {
@@ -761,7 +792,9 @@ this.$message.error("请输入服务频次起始值和结束值")
 
       }else if(this.form.serviceFrequencyType!="TEXT"&&this.form.serviceFrequencyType!="DIGIT"){
         this.$message.error("请选择数字还是文本")}else{
-          console.log(this.form.id, "555555");
+          console.log(this.form, "555555");
+      console.log(this.form.serviceWayId)
+
           if (this.form.serviceContentId != null) {
             updateServicewaycontent(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");

src/views/system/agency/index.vue

@@ -642,8 +642,8 @@ export default {
         agencyName: [
           { required: true, message: "机构名称能为空", trigger: "blur" },
         ],
-        // areaCode:[{ required: true, message: "行政区划不能为空", trigger: "blur" },
-        // ],
+        areaCode:[{ required: true, message: "行政区划不能为空", trigger: "blur" },
+        ],
       },
       treeOptionsagencyCategoryId: [],
       treeOptions: [],
@@ -747,7 +747,7 @@ export default {
 
     //点击街道
     clickstreet(item) {
-      // this.form.areaCode = item.areaCode;
+      this.form.communityName =''
       getSecondaryLevelInfo(item.id).then((res) => {
         this.streetlists = res.data;
       });
@@ -760,6 +760,9 @@ export default {
     clickarea(item) {
       this.form.areaCode = "";
       this.form.streetCode = "";
+      // this.form.streetName=''
+      this.form.communityCode =''
+
       getSecondaryLevelInfo(item.id).then((res) => {
         this.streetlist = res.data;
       });
@@ -769,6 +772,10 @@ export default {
       this.form.regionName = "";
       this.form.areaCode = "";
       this.form.streetCode = "";
+      this.form.streetName = "";
+      this.form.communityCode =''
+
+      
       getSecondaryLevelInfo(item.id).then((res) => {
         this.arealist = res.data;
       });
@@ -782,7 +789,8 @@ export default {
     //点击省
     province(item) {
       this.form.cityName = "";
-      this.form.streeName = "";
+      // this.form.streeName = "";
+      // this.form.communityCode =''
 
       this.form.areaName = "";
       this.form.communityName = "";