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

src/views/basic-dictionary/ResultStatus.vue

@@ -106,13 +106,13 @@
               >
                 <el-color-picker
                   @change="reportBackgroundColorchange"
-                  v-model="form.reportBackgroundColor16"
+                  v-model="reportBackgroundColor16"
                 ></el-color-picker>
                 <!-- <el-input></el-input> -->
                 <!-- <input type="text" v-model="form.reportBackgroundColor"> -->
                 <el-input
                   v-model.number="form.reportBackgroundColor"
-                  @change="reportBackgroundColorchange1"
+                  @input="reportBackgroundColorchange1"
                   style="
                     width: 85%;
                     position: absolute;
@@ -130,14 +130,12 @@
               >
                 <!-- <el-input v-model="form.reportFontColor"></el-input> -->
                 <el-color-picker
-                  value="form.reportFontColor16"
+                  v-model="reportFontColor16"
                   @change="reportFontColorchange"
                 ></el-color-picker>
                 <el-input
-                  v-model.number="form.reportFontColor"
-                  @change="reportFontColor1"
-                  maxlength="15"
-                  minlength="6"
+                  v-model="form.reportFontColor"
+                  @input="reportFontColor1"
                   style="
                     width: 85%;
                     position: absolute;
@@ -150,11 +148,12 @@
             <el-col :span="12">
               <el-form-item label="数据录入背景" label-width="100px">
                 <el-color-picker
-                  v-model="form.dataInputBackgroundColor16"
+                  v-model="dataInputBackgroundColor16"
                   @change="dataInputBackgroundColorchange"
                 ></el-color-picker>
                 <el-input
-                  v-model.number="form.dataInputBackgroundColor"
+                  @input="inputdataInputBackgroundColor"
+                  v-model="form.dataInputBackgroundColor"
                   style="
                     width: 85%;
                     position: absolute;
@@ -172,12 +171,12 @@
                 prop="dataInputFontColor"
               >
                 <el-color-picker
-                  v-model="form.dataInputFontColor16"
+                  v-model="dataInputFontColor16"
                   @change="dataInputFontColorchange"
                 ></el-color-picker>
                 <el-input
                   v-model.number="form.dataInputFontColor"
-                  @change="dataInputFontColor1"
+                  @input="dataInputFontColor1"
                   style="
                     width: 85%;
                     margin-left: 10px;
@@ -221,15 +220,19 @@ export default {
         displayName: "",
         dataInputPrompt: "",
         reportPrompt: "",
-        reportBackgroundColor: "",
-        reportBackgroundColor16: "",
-        reportFontColor: "",
-        reportFontColor16: "",
-        dataInputBackgroundColor: "",
-        dataInputBackgroundColor16: "",
-        dataInputFontColor: "",
-        dataInputFontColor16: "",
+        reportBackgroundColor: 1089274,
+        // reportBackgroundColor16: "#409EFF",
+        reportFontColor: 1089274,
+        // reportFontColor16: "#409EFF",
+        dataInputBackgroundColor: 1089274,
+        // dataInputBackgroundColor16: "#409EFF",
+        dataInputFontColor: 1089274,
+        // dataInputFontColor16: "#409EFF",
       },
+      reportBackgroundColor16: "#409EFF",
+      reportFontColor16: "#409EFF",
+      dataInputBackgroundColor16: "#409EFF",
+      dataInputFontColor16: "#409EFF",
       dialogVisible: false,
       title: 1,
       tableData: [],
@@ -259,7 +262,7 @@ export default {
           { required: true, message: "请输入报告单背景色", trigger: "blur" },
         ],
         reportFontColor: [
-          { required: true, message: "请输入报关单字体色", trigger: "blur" },
+          { required: true, message: "请输入报告单字体色", trigger: "blur" },
         ],
         dataInputBackgroundColor: [
           { required: true, message: "请输入数据录入背景色", trigger: "blur" },
@@ -287,51 +290,49 @@ export default {
 
     //数据录入字体
     dataInputFontColorchange(v) {
-      var hexColor = v;
-      hexColor = hexColor.substring(1);
-      this.form.dataInputFontColor = parseInt(hexColor, 16);
+      this.form.dataInputFontColor = eval(v.replace("#", "0x"));
+    },
+    //数据录入背景Input
+    inputdataInputBackgroundColor(v) {
+      this.form.dataInputBackgroundColor = Number(v);
+      let temp = "000000" + this.form.dataInputBackgroundColor.toString(16);
+      this.dataInputBackgroundColor16 =
+        "#" + temp.substring(temp.length - 6, temp.length);
     },
-
     //数据录入背景
     dataInputBackgroundColorchange(v) {
-      var hexColor = v;
-      hexColor = hexColor.substring(1);
-      this.form.dataInputBackgroundColor = parseInt(hexColor, 16);
+      this.form.dataInputBackgroundColor = eval(v.replace("#", "0x"));
     },
     //颜色选择器报告单字体色
     reportFontColorchange(v) {
-      var hexColor = v;
-      console.log(
-        "form.reportFontColor16",
-        hexColor,
-        this.form.reportFontColor16
-      );
-      hexColor = hexColor.substring(1);
-      this.form.reportFontColor = parseInt(hexColor, 16);
+      this.form.reportFontColor = eval(v.replace("#", "0x"));
+      console.log(this.form.reportFontColor);
     },
     //报告单背景色
     reportBackgroundColorchange(v) {
-      var hexColor = v;
-      // 去除开头的#号
-      hexColor = hexColor.substring(1);
-      // 转换为十进制
-      this.form.reportBackgroundColor = parseInt(hexColor, 16);
+      this.form.reportBackgroundColor = eval(v.replace("#", "0x"));
       console.log(this.form.reportBackgroundColor);
     },
+    //数据录入字体
     dataInputFontColor1(v) {
-      this.form.dataInputFontColor16 = "#" + v;
-      console.log(v);
+      this.form.dataInputFontColor = Number(v);
+      let temp = "000000" + this.form.dataInputFontColor.toString(16);
+      this.dataInputFontColor16 =
+        "#" + temp.substring(temp.length - 6, temp.length);
     },
     //报告单字体色
     reportFontColor1(v) {
-      console.log("v", v);
-      this.form.reportFontColor16 = "#" + Number(v).toString(16);
-      console.log("this.form.reportFontColor16", this.form.reportFontColor16);
+      this.form.reportFontColor = Number(v);
+      let temp = "000000" + this.form.reportFontColor.toString(16);
+      this.reportFontColor16 =
+        "#" + temp.substring(temp.length - 6, temp.length);
     },
     //报告单背景色
     reportBackgroundColorchange1(v) {
-      // 转换为十进制
-      this.form.reportBackgroundColor16 = "#" + v;
+      this.form.reportBackgroundColor = Number(v);
+      let temp = "000000" + this.form.reportBackgroundColor.toString(16);
+      this.reportBackgroundColor16 =
+        "#" + temp.substring(temp.length - 6, temp.length);
     },
     rowclick(row) {
       this.form = row;
@@ -339,15 +340,22 @@ export default {
       // this.form.reportFontColor16 = "#"+row.reportFontColor;
       // this.form.dataInputBackgroundColor16 = "#"+row.dataInputBackgroundColor;
       // this.form.dataInputFontColor16 = "#"+row.dataInputFontColor;
-
+      // this.reportBackgroundColor16 = reportBackgroundColor16;
+      // this.reportFontColor16 = row.reportFontColor16;
+      // this.dataInputBackgroundColor16 = row.dataInputBackgroundColor16;
+      // this.dataInputFontColor16 = row.dataInputFontColor16;
       this.form.reportBackgroundColor16 = "#" + row.reportBackgroundColor;
       this.form.reportFontColor16 = "#" + row.reportFontColor;
       this.form.dataInputBackgroundColor16 = "#" + row.dataInputBackgroundColor;
       this.form.dataInputFontColor16 = "#" + row.dataInputFontColor;
-
       console.log(this.form);
+      //颜色选择的数据反写
+      console.log(this.form.reportBackgroundColor16);
+      // this.reportBackgroundColor16 = this.form.reportBackgroundColor16;
+      // this.reportFontColor16 = this.form.reportFontColor16;
+      // this.dataInputBackgroundColor16 = this.form.dataInputBackgroundColor16;
+      // this.dataInputFontColor16 = this.form.dataInputFontColor16;
     },
-
     haxadecimal() {
       let str = this.form.dataInputFontColor;
       this.form.dataInputFontColor = str

src/views/doctorCheck/personnelBatch.vue

@@ -94,6 +94,24 @@
           >单位设置</el-col
         >
       </el-row>
+      <!-- 是否为体检中心 -->
+      <el-row>
+        <el-col :span="4">
+          <span style="height: 40px; font-size: 18px">体检中心</span>
+        </el-col>
+
+        <el-col :span="8">
+          <el-select v-model="form.organizationUnitId" placeholder="请选择">
+            <el-option
+              v-for="item in examinatioitems"
+              :key="item.id"
+              :label="item.displayName"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </el-col>
+      </el-row>
       <!-- row -->
       <div style="width: 100%">
         <div style="margin-top:10px;margin">
@@ -109,9 +127,9 @@
       </div>
       <div style="margin-top: 10px; margin-left: 10px">
         登记状态
-        <el-radio-group v-model="nameType">
-          <el-radio label="预登记">预登记</el-radio>
-          <el-radio label="仅本单位同名病人提示">仅本单位同名病人提示</el-radio>
+        <el-radio-group v-model="form.nameType">
+          <el-radio label="Y">预登记</el-radio>
+          <el-radio label="N">正式登记</el-radio>
         </el-radio-group>
       </div>
       <div style="margin-top: 10px">
@@ -137,9 +155,14 @@
         ></el-input>
       </div>
       <div style="margin-top: 10px">
-        <el-checkbox v-model="form.isAutoCreateDepartment" @change="createornot"
+        自动创建部门
+        <el-radio-group v-model="form.isAutoCreateDepartment">
+          <el-radio label="Y">是</el-radio>
+          <el-radio label="N">否</el-radio>
+        </el-radio-group>
+        <!-- <el-checkbox v-model="form.isAutoCreateDepartment" @change="createornot"
           >自动创建部门</el-checkbox
-        >
+        > -->
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible5 = false">取 消</el-button>
@@ -208,14 +231,16 @@ export default {
       checked: "",
       input: "",
       form: {
-        nameType: "",
+        nameType: "N",
         cardLength: "",
         isAutoCreateDepartment: "N", //
         customerOrgId: "", //单位id
         isAutoCreatePatientNo: "N",
         cardStartNum: "0",
         patientName: "",
+        organizationUnitId: "",
       },
+      examinatioitems: [], //体检中心的数据
       value: "",
       nameType: "1",
       currentRow: null,
@@ -298,35 +323,41 @@ export default {
     //登记状态 选不了
     //自动创建部门勾不上
     //数据列没有绑定
-    async submitBatch(){
-      let res = null,confirm=null;
-      for(let i=0;i<this.tableData.length;i++){
-        console.log(i,this.tableData[i])
+    async submitBatch() {
+      let res = null,
+        confirm = null;
+      for (let i = 0; i < this.tableData.length; i++) {
+        this.tableData[i].isAutoCreateDepartment =
+          this.form.isAutoCreateDepartment;
+        this.tableData[i].customerOrgId = this.form.customerOrgId;
+        this.tableData[i].organizationUnitId=this.form.organizationUnitId
+        console.log(i, this.tableData[i]);
         try {
-          res = await postapi("/api/app/patientregister/createpatientregisterexcel",this.tableData[i]); //错误：数据没有绑定
+          res = await postapi(
+            "/api/app/patientregister/createpatientregisterexcel",
+            this.tableData[i]
+          ); //错误：数据没有绑定
         } catch (error) {
           return;
         }
 
-        console.log(i,res)  
-
-        // if(res.code != -1){
-        //   try {
-        //     await this.$confirm("导入数据出错, 是否继续导入?", "提示", {
-        //           confirmButtonText: "是",
-        //           cancelButtonText: "否",
-        //           type: "warning",
-        //           showClose:false,
-        //         });
-        //   } catch (error) {
-        //     return;
-        //   }          
-        // }
+        console.log(i, res);
 
+        if (res.code != 1) {
+          try {
+            await this.$confirm("导入数据出错, 是否继续导入?", "提示", {
+              confirmButtonText: "是",
+              cancelButtonText: "否",
+              type: "warning",
+              showClose: false,
+            });
+          } catch (error) {
+            return;
+          }
+        }
       }
     },
 
-
     onchange(id) {
       // this.form.customerOrgId = id;
       // console.log(id);
@@ -345,16 +376,7 @@ export default {
       }
       console.log(this.nameType);
     },
-    //是否创建
-    createornot() {
-      if (this.form.isAutoCreateDepartment == true) {
-        this.form.isAutoCreateDepartment = "Y";
-      } else {
-        this.form.isAutoCreateDepartment = "N";
-        console.log("1");
-      }
-      console.log(this.form.isAutoCreateDepartment);
-    },
+
     slicetdata() {
       console.log("2");
       getapi("/api/app/customer-org/by-code-all").then((res) => {
@@ -380,7 +402,18 @@ export default {
         this.dialogVisible5 = true;
         this.dialogVisible4 = false;
         this.slicetdata();
+        this.getexamination();
+        //获取调用接口的地方
+      }
+    },
+    //获取调用体检中心的接口
+    getexamination() {
+      getapi("/api/app/organization-units/organization-unit-by-is-peis").then(
+        (res) => {
+          this.examinatioitems = res.data;
+          console.log(res, "res");
         }
+      );
     },
     determine() {
       if (JSON.stringify(this.formrow) == "{}") {

src/views/fee-settings/SysParmSet.vue

@@ -1,52 +1,98 @@
 <template>
   <div>
     <el-card>
-      <div style="display: flex;">
+      <div style="display: flex">
         <div class="leftTree">
-          <el-tree :data="sysParmTypesTree" :props="treeProps" @node-click="nodeClick" />
+          <el-tree
+            :data="sysParmTypesTree"
+            :props="treeProps"
+            @node-click="nodeClick"
+          />
         </div>
         <div class="midBlock">
-          <div style="display: flex;">
+          <div style="display: flex">
             <div>
               <span>体检中心</span>
-              <el-select v-model="organizationId" placeholder="请选择体检中心" style="margin-left: 15px" filterable 
-                size="small" @change="changeOrganization">
-                <el-option v-for="item in organization" :key="item.id" :label="item.displayName" :value="item.id">
+              <el-select
+                v-model="organizationId"
+                placeholder="请选择体检中心"
+                style="margin-left: 15px"
+                filterable
+                size="small"
+                @change="changeOrganization"
+              >
+                <el-option
+                  v-for="item in organization"
+                  :key="item.id"
+                  :label="item.displayName"
+                  :value="item.id"
+                >
                 </el-option>
               </el-select>
             </div>
-            <div style="display: flex;">
-              <el-color-picker v-model="color16" @change="chooseColor"/>
+            <div style="display: flex">
+              <el-color-picker v-model="color16" @change="chooseColor" />
               <el-input v-model="color10" @input="inputColor" />
             </div>
-            <div style="margin-left: 30px;">
+            <div style="margin-left: 30px">
               <el-button type="success" @click="save">保存</el-button>
             </div>
           </div>
-          <div style="margin-top: 2px;">
-            <el-table :data="sysParms" border :height="window.pageHeight < 600 ? 420 : window.pageHeight - 190"
-              size="small" highlight-current-row>
+          <div style="margin-top: 2px">
+            <el-table
+              :data="sysParms"
+              border
+              :height="window.pageHeight < 600 ? 420 : window.pageHeight - 190"
+              size="small"
+              highlight-current-row
+            >
               <el-table-column prop="id" label="参数ID" />
-              <el-table-column prop="displayName" label="参数名称" width="120"/>
+              <el-table-column
+                prop="displayName"
+                label="参数名称"
+                width="120"
+              />
               <el-table-column prop="organizationUnitId" label="体检中心">
                 <template slot-scope="scope">
-                  <el-select v-model="scope.row.organizationUnitId" placeholder="请选择体检中心" filterable size="small" >
-                    <el-option v-for="item in organization" :key="item.id" :label="item.displayName" :value="item.id">
+                  <el-select
+                    v-model="scope.row.organizationUnitId"
+                    placeholder="请选择体检中心"
+                    filterable
+                    size="small"
+                  >
+                    <el-option
+                      v-for="item in organization"
+                      :key="item.id"
+                      :label="item.displayName"
+                      :value="item.id"
+                    >
                     </el-option>
                   </el-select>
                 </template>
               </el-table-column>
               <el-table-column prop="sysParmValueName" label="参数值">
                 <template slot-scope="scope">
-                  <el-input type="textarea" v-model="scope.row.sysParmValueName" :autosize="{minRows: 1, maxRows: 100 }" maxlength="100" size="small"/>
+                  <el-input
+                    type="textarea"
+                    v-model="scope.row.sysParmValueName"
+                    :autosize="{ minRows: 1, maxRows: 100 }"
+                    maxlength="100"
+                    size="small"
+                  />
                 </template>
               </el-table-column>
               <el-table-column prop="valueRemark" label="备注">
                 <template slot-scope="scope">
-                  <el-input type="textarea" v-model="scope.row.valueRemark" :autosize="{minRows: 1, maxRows: 100 }" maxlength="500" size="small"/>
+                  <el-input
+                    type="textarea"
+                    v-model="scope.row.valueRemark"
+                    :autosize="{ minRows: 1, maxRows: 100 }"
+                    maxlength="500"
+                    size="small"
+                  />
                 </template>
               </el-table-column>
-              <el-table-column prop="remark" label="参数说明"/>
+              <el-table-column prop="remark" label="参数说明" />
             </el-table>
           </div>
         </div>
@@ -70,15 +116,15 @@ export default {
         children: "treeChildren",
       },
       organization: [], //体检中心
-      organizationId: '00000000-0000-0000-0000-000000000000',
-      sysParmTypeId: '',
+      organizationId: "00000000-0000-0000-0000-000000000000",
+      sysParmTypeId: "",
       sysParms: [], //系统参数列表
-      color16:'#409EFF',
-      color10:1089274,
+      color16: "#409EFF",
+      color10: 1089274,
     };
   },
 
-  created() { },
+  created() {},
 
   //挂载完成
   mounted() {
@@ -90,20 +136,26 @@ export default {
     ...mapState(["window", "dict"]),
   },
   methods: {
-    chooseColor(v){
-      this.color10 = eval(v.replace('#','0x'));
+    chooseColor(v) {
+      this.color10 = eval(v.replace("#", "0x"));
     },
-    inputColor(v){      
+    inputColor(v) {
       this.color10 = Number(v);
-      let temp = '000000' + this.color10.toString(16);
-      this.color16 = '#' + temp.substring(temp.length - 6,temp.length);
+      let temp = "000000" + this.color10.toString(16);
+      this.color16 = "#" + temp.substring(temp.length - 6, temp.length);
     },
 
     //获取组织体检中心数据
     getOraniztion() {
       getapi("/api/app/organization-units/organization-unit-by-is-peis").then(
         (res) => {
-          this.organization = [{ displayName: "公共参数", id: "00000000-0000-0000-0000-000000000000", }, ...res.data];
+          this.organization = [
+            {
+              displayName: "公共参数",
+              id: "00000000-0000-0000-0000-000000000000",
+            },
+            ...res.data,
+          ];
         }
       );
     },
@@ -111,7 +163,7 @@ export default {
     //获取系统参数类别树数据
     getSysParmTypesTree() {
       getapi("/api/app/sysparmtype/treelist").then((res) => {
-        if (res.code != - 1) {
+        if (res.code != -1) {
           this.sysParmTypesTree = res.data;
           //console.log("res.data", res.data);
           tcdate(this.sysParmTypesTree);
@@ -132,10 +184,10 @@ export default {
     getSysParms() {
       let url = `/api/app/sysparm/getlistinsysparmvaluename?SysParmTypeId=${this.sysParmTypeId}`;
       if (this.organizationId) {
-        url += `&OrganizationUnitId=${this.organizationId}`
+        url += `&OrganizationUnitId=${this.organizationId}`;
       }
       getapi(`${url}`).then((res) => {
-        if (res.code != - 1) {
+        if (res.code != -1) {
           this.sysParms = res.data;
         }
       });
@@ -143,28 +195,25 @@ export default {
 
     save() {
       let body = [];
-      if(this.sysParms.length < 1) return;
-      this.sysParms.forEach(item =>{
+      if (this.sysParms.length < 1) return;
+      this.sysParms.forEach((item) => {
         body.push({
-          sysParmId:item.id,
-          organizationUnitId:item.organizationUnitId,
-          parmValue:item.sysParmValueName,
-          remark:item.valueRemark
+          sysParmId: item.id,
+          organizationUnitId: item.organizationUnitId,
+          parmValue: item.sysParmValueName,
+          remark: item.valueRemark,
         });
       });
 
-      postapi("/api/app/sysparmvalue/updatesysparmvaluemany",body).then((res) => {
-        if (res.code != - 1) {
-          this.$message.success('操作成功！');
+      postapi("/api/app/sysparmvalue/updatesysparmvaluemany", body).then(
+        (res) => {
+          if (res.code != -1) {
+            this.$message.success("操作成功！");
           }
-      });
-
+        }
+      );
     },
-
-
   },
-
-
 };
 </script>
 <style scoped>
@@ -172,11 +221,15 @@ export default {
   overflow: scroll;
   border: 1px solid;
   width: 200px;
-  height: v-bind("(window.pageHeight < 600 ? 450 : window.pageHeight - 150) + 'px'");
+  height: v-bind(
+    "(window.pageHeight < 600 ? 450 : window.pageHeight - 150) + 'px'"
+  );
 }
 
 .midBlock {
   margin-left: 5px;
-  width: v-bind("(window.pageWidth < 500 ? 300 : window.pageWidth - 270) + 'px'");
+  width: v-bind(
+    "(window.pageWidth < 500 ? 300 : window.pageWidth - 270) + 'px'"
+  );
 }
 </style>

src/views/fee-settings/SysParmType.vue

@@ -142,6 +142,7 @@ export default {
       getapi("/api/app/organization-units/organization-unit-by-is-peis").then(
         (res) => {
           this.organizationdata = res.data;
+          console.log(res);
         }
       );
     },