Merge branch 'master' of http://ver.wh613.com:3000/shentun/peisweb

src/views/basic-dictionary/ResultStatus.vue

@@ -130,7 +130,7 @@
               >
                 <!-- <el-input v-model="form.reportFontColor"></el-input> -->
                 <el-color-picker
-                  v-model="form.reportFontColor16"
+                  value="form.reportFontColor16"
                   @change="reportFontColorchange"
                 ></el-color-picker>
                 <el-input 
@@ -284,12 +284,15 @@ export default {
         })
         .catch((_) => {});
     },
+
     //数据录入字体
     dataInputFontColorchange(v) {
       var hexColor = v;
       hexColor = hexColor.substring(1);
       this.form.dataInputFontColor = parseInt(hexColor, 16);
     },
+
+
     //数据录入背景
     dataInputBackgroundColorchange(v) {
       var hexColor = v;
@@ -299,6 +302,7 @@ export default {
     //颜色选择器报告单字体色
     reportFontColorchange(v) {
       var hexColor = v;
+      console.log('form.reportFontColor16',hexColor,this.form.reportFontColor16);
       hexColor = hexColor.substring(1);
       this.form.reportFontColor = parseInt(hexColor, 16);
     },
@@ -317,7 +321,10 @@ export default {
     },
     //报告单字体色
     reportFontColor1(v) {
-      this.form.reportFontColor16 = "#" + v;
+      console.log('v',v);
+      this.form.reportFontColor16 = "#" + Number(v).toString(16);
+      console.log('this.form.reportFontColor16',this.form.reportFontColor16);
+
     },
     //报告单背景色
     reportBackgroundColorchange1(v) {

src/views/doctorCheck/personnelBatch.vue

@@ -69,7 +69,17 @@
           选择单位或部门:
         </el-col>
         <el-col :span="6">
-          <el-cascader :options="departmentdata" :show-all-levels="false"  :props="{ value:'id',label: 'displayName',children: 'treeChildren'}"></el-cascader>
+          <el-cascader
+            @change="onchange"
+            v-model="form.customerOrgId"
+            :options="departmentdata"
+            :props="{
+              checkStrictly: true,
+              value: 'id',
+              label: 'displayName',
+              children: 'treeChildren',
+            }"
+          ></el-cascader>
           <!-- <el-select v-model="value" placeholder="请选择" @change="onchange">
             <el-option
               v-for="item in departmentdata"
@@ -205,11 +215,10 @@ export default {
   },
   methods: {
     submitto() {
-  
       if (this.form.customerOrgId == undefined) {
         this.$message.warning("请选择单位");
       } else {
-          this.form=  Object.assign(this.form,this.formrow)
+        this.form = Object.assign(this.form, this.formrow);
         postapi(
           "/api/app/patientregister/createpatientregisterexcel",
           this.form
@@ -224,8 +233,14 @@ export default {
       console.log(this.form.customerOrgId);
     },
     onchange(id) {
-      this.form.customerOrgId = id;
-      console.log(id);
+      // this.form.customerOrgId = id;
+      // console.log(id);
+      // this.form.customerOrgId=this.form.customerOrgId[0]
+      this.form.customerOrgId.forEach((item) => {
+        // console.log(item);
+        this.form.customerOrgId = item;
+      });
+      console.log(this.form.customerOrgId);
     },
     splices() {
       if (this.nameType == 1) {
@@ -246,10 +261,20 @@ export default {
     slicetdata() {
       console.log("2");
       getapi("/api/app/customer-org/by-code-all").then((res) => {
+        this.gettypelist(res.data);
         this.departmentdata = res.data;
         console.log(res);
       });
     },
+    gettypelist(listdata) {
+      listdata.forEach((items) => {
+        if (items.treeChildren.length > 0) {
+          this.gettypelist(items.treeChildren);
+        } else {
+          items.treeChildren = undefined;
+        }
+      });
+    },
     tablenext() {
       if (JSON.stringify(this.formrow) == "{}") {
         this.$message.warning("请选择数据");