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

src/views/doctorCheck/personnelBatch.vue

@@ -164,12 +164,17 @@
           >自动创建部门</el-checkbox
         > -->
       </div>
+      <el-progress
+        :text-inside="true"
+        :stroke-width="26"
+        :percentage="100"
+        v-if="percentage"
+      ></el-progress>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible5 = false">取 消</el-button>
         <el-button type="primary" @click="submitBatch">确 定</el-button>
       </span>
     </el-dialog>
-
     <!--  -->
     <!--dialogVisible4  -->
     <el-dialog title="批量预约登记" :visible.sync="dialogVisible4" width="50%">
@@ -180,6 +185,7 @@
         height="300px"
         highlight-current-row
         ref="singleTable"
+        @header-click="colcliick(item.label)"
       >
         <el-table-column
           v-for="(item, index) in tableDataCol"
@@ -228,6 +234,17 @@ import { mapState } from "vuex";
 export default {
   data() {
     return {
+      apiCol: {
+        sexName: "姓名",
+        sex: "性别",
+        cettictetype: "证件类型",
+        idNo: "证件号码",
+        samplingpoints: "采样点",
+        population: "所属人群",
+        administrativedivision: "行政人员",
+        testtubebarcode: "试管条码",
+      },
+      percentage: false,
       checked: "",
       input: "",
       form: {
@@ -264,8 +281,10 @@ export default {
     ...mapState(["importexcel"]),
   },
   methods: {
+    colcliick(v) {
+      console.log(v);
+    },
     setCurrents() {},
-
     submitto() {
       if (this.form.customerOrgId == undefined) {
         this.$message.warning("请选择单位");
@@ -330,7 +349,13 @@ export default {
         this.tableData[i].isAutoCreateDepartment =
           this.form.isAutoCreateDepartment;
         this.tableData[i].customerOrgId = this.form.customerOrgId;
-        this.tableData[i].organizationUnitId=this.form.organizationUnitId
+        this.tableData[i].organizationUnitId = this.form.organizationUnitId;
+        // this.tableData[0].name = this.tableData[0];
+        // this.tableData[i]name=this.
+        // if(this.tableData[i]==3){
+        //   this.tableData[i]=name
+        // }
+
         console.log(i, this.tableData[i]);
         try {
           res = await postapi(
@@ -340,9 +365,8 @@ export default {
         } catch (error) {
           return;
         }
-
+        this.percentage = true; //进度条
         console.log(i, res);
-
         if (res.code != 1) {
           try {
             await this.$confirm("导入数据出错, 是否继续导入?", "提示", {
@@ -437,7 +461,6 @@ export default {
     },
     setCurrent(row) {
       console.log(row);
-
       // row.forEach(item=>{
       //   console.log(item,'22222');
       // })