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

src/views/manage/labelfieldinfo/index.vue

@@ -1,13 +1,34 @@
 <template>
   <div class="app-container" ref="layout">
     <div ref="topform" class="form">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="68px"
+      >
         <el-form-item label="字段名称" prop="fieldName">
-          <el-input v-model="queryParams.fieldName" placeholder="请输入字段名称" clearable @keyup.enter.native="handleQuery" />
+          <el-input
+            v-model="queryParams.fieldName"
+            placeholder="请输入字段名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
         </el-form-item>
         <el-form-item label="字段类型" label-width="100px" prop="fieldType">
-          <el-select v-model="queryParams.fieldType" placeholder="请选择字段类型" clearable>
+          <el-select
-            <el-option v-for="item in options" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue">
+            v-model="queryParams.fieldType"
+            placeholder="请选择字段类型"
+            clearable
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+            >
             </el-option>
           </el-select>
         </el-form-item>
@@ -36,110 +57,239 @@
         />
       </el-form-item> -->
         <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuery"
+            >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            >重置</el-button
+          >
         </el-form-item>
       </el-form>
     </div>
     <div ref="mb8" class="mb8">
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
-          <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          <el-button
-            v-hasPermi="['manage:labelfieldinfo:add']">新增</el-button>
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+            v-hasPermi="['manage:labelfieldinfo:add']"
+            >新增</el-button
+          >
         </el-col>
         <el-col :span="1.5">
-          <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          <el-button
-            v-hasPermi="['manage:labelfieldinfo:edit']">修改</el-button>
+            type="success"
+            plain
+            icon="el-icon-edit"
+            size="mini"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['manage:labelfieldinfo:edit']"
+            >修改</el-button
+          >
         </el-col>
         <el-col :span="1.5">
-          <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          <el-button
-            v-hasPermi="['manage:labelfieldinfo:remove']">删除</el-button>
+            type="danger"
+            plain
+            icon="el-icon-delete"
+            size="mini"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['manage:labelfieldinfo:remove']"
+            >删除</el-button
+          >
         </el-col>
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        <right-toolbar
+          :showSearch.sync="showSearch"
+          @queryTable="getList"
+        ></right-toolbar>
       </el-row>
     </div>
     <div ref="table">
-      <el-table :max-height="maxTableHeight" v-loading="loading" :data="labelfieldinfodata"
+      <el-table
-        @selection-change="handleSelectionChange">
+        :max-height="maxTableHeight"
+        v-loading="loading"
+        :data="labelfieldinfodata"
+        @selection-change="handleSelectionChange"
+      >
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="字段名称" align="center" prop="fieldName" />
         <el-table-column label="字段编码" align="center" prop="fieldCode" />
         <el-table-column label="字段类型" align="center" prop="fieldType">
           <template slot-scope="scope">
-            {{
+            {{ scope.row.fieldType == "STRING" ? "默认字符串" : "" }}
-        scope.row.fieldType == "STRING" ? "默认字符串" : ""
-      }}
             {{ scope.row.fieldType == "INT" ? "整型" : "" }}
             {{ scope.row.fieldType == "DECIMAL" ? "数值" : "" }}
             {{ scope.row.fieldType == "ENUM" ? "枚举" : "" }}
           </template>
         </el-table-column>
         <el-table-column label="字段排序" align="center" prop="fieldSort" />
-        <el-table-column label="字段备注信息" align="center" prop="fieldRemark" :show-overflow-tooltip="true" />
+        <el-table-column
+          label="字段备注信息"
+          align="center"
+          prop="fieldRemark"
+          :show-overflow-tooltip="true"
+        />
 
-        <el-table-column label="任务细分" align="center" prop="taskPartitionDictName" :show-overflow-tooltip="true" />
+        <el-table-column
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          label="任务细分"
+          align="center"
+          prop="taskPartitionDictName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="操作"
+          align="center"
+          class-name="small-padding fixed-width"
+        >
           <template slot-scope="scope">
-            <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            <el-button
-              v-hasPermi="['manage:labelfieldinfo:edit']">修改</el-button>
+              size="mini"
-            <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+              type="text"
-              v-hasPermi="['manage:labelfieldinfo:remove']">删除</el-button>
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['manage:labelfieldinfo:edit']"
+              >修改</el-button
+            >
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['manage:labelfieldinfo:remove']"
+              >删除</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
     </div>
     <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize" @pagination="getList" /> -->
-    <myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
+    <myPagination
-      :indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
+      v-show="total > 0"
+      :total="total"
+      :pageSize="queryParams.pageSize"
+      :indexFromWrap="queryParams.pageNum"
+      @updateCPage="updateCPage"
+    ></myPagination>
 
     <!-- 添加标签字段信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="750px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="100px"
+        :inline="true"
+      >
         <div v-for="(aitem, index) in form.labelFieldInfoList" :key="index">
-          <el-form-item label="字段名称" :rules="rules.labelFieldInfoList.fieldName"
+          <el-form-item
-            :prop="`labelFieldInfoList.${index}.fieldName`">
+            label="字段名称"
-            <el-input v-model="aitem.fieldName" placeholder="请输入字段名称" style="width: 210px" />
+            :rules="rules.labelFieldInfoList.fieldName"
+            :prop="`labelFieldInfoList.${index}.fieldName`"
+          >
+            <el-input
+              v-model="aitem.fieldName"
+              placeholder="请输入字段名称"
+              style="width: 210px"
+            />
           </el-form-item>
-          <el-form-item label="字段类型" :rules="rules.labelFieldInfoList.fieldType"
+          <el-form-item
-            :prop="`labelFieldInfoList.${index}.fieldType`">
+            label="字段类型"
-            <el-select v-model="aitem.fieldType" placeholder="请选择字段类型" clearable style="width: 210px">
+            :rules="rules.labelFieldInfoList.fieldType"
-              <el-option v-for="item in options" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue">
+            :prop="`labelFieldInfoList.${index}.fieldType`"
+          >
+            <el-select
+              v-model="aitem.fieldType"
+              placeholder="请选择字段类型"
+              clearable
+              style="width: 210px"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.dictValue"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+              >
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="字段排序" :rules="rules.labelFieldInfoList.fieldSort"
+          <el-form-item
-            :prop="`labelFieldInfoList.${index}.fieldSort`">
+            label="字段排序"
-            <el-input-number v-model="aitem.fieldSort" controls-position="right" :min="0" placeholder="请输入字段排序"
+            :rules="rules.labelFieldInfoList.fieldSort"
-              style="width: 210px" />
+            :prop="`labelFieldInfoList.${index}.fieldSort`"
+          >
+            <el-input-number
+              v-model="aitem.fieldSort"
+              controls-position="right"
+              :min="0"
+              placeholder="请输入字段排序"
+              style="width: 210px"
+            />
             <!-- <el-input v-model="aitem.fieldSort" placeholder="请输入字段排序" oninput="value=value.replace(/[^\d]/g,'')"
               maxlength="5"/> -->
           </el-form-item>
           <el-form-item label="任务细分" prop="taskPartitionDictId">
-            <el-button type="" v-if="aitem.taskPartitionDictName == '请选择任务细分'" @click="clickinnerVisible(aitem, index)"
+            <el-button
+              type=""
+              v-if="aitem.taskPartitionDictName == '请选择任务细分'"
+              @click="clickinnerVisible(aitem, index)"
               style="
                 width: 210px;
                 text-align: left;
                 height: 36px;
                 color: #c0c4cc;
                 overflow: hidden;
-              ">{{ aitem.taskPartitionDictName }}</el-button>
+              "
-            <el-button @click="clickinnerVisible(aitem, index)" type="" v-else style="
+              >{{ aitem.taskPartitionDictName }}</el-button
+            >
+            <el-button
+              @click="clickinnerVisible(aitem, index)"
+              type=""
+              v-else
+              style="
                 width: 210px;
                 text-align: left;
                 height: 36px;
                 padding-left: -10px;
                 overflow: hidden;
-              ">{{ aitem.taskPartitionDictName }}</el-button>
+              "
+              >{{ aitem.taskPartitionDictName }}</el-button
+            >
           </el-form-item>
           <el-form-item label="字段备注信息" prop="fieldRemark">
-            <el-input style="width: 210px" v-model="aitem.fieldRemark" placeholder="请输入字段备注信息" type="textarea" />
+            <el-input
+              style="width: 210px"
+              v-model="aitem.fieldRemark"
+              placeholder="请输入字段备注信息"
+              type="textarea"
+            />
           </el-form-item>
 
-          <el-button type="primary" plain icon="el-icon-circle-plus-outline" style="margin-left: 6px;margin-top: 9px;"
+          <el-button
-            v-if="index == 0" @click="addnurseClassifyitem"></el-button>
+            type="primary"
-          <el-button type="danger" icon="el-icon-delete" plain style="margin-left: 6px;margin-top: 9px;"
+            plain
-            v-if="index != 0" @click="delnurseClassifyitem(index)"></el-button>
+            icon="el-icon-circle-plus-outline"
+            style="margin-left: 6px; margin-top: 9px"
+            v-if="index == 0"
+            @click="addnurseClassifyitem"
+          ></el-button>
+          <el-button
+            type="danger"
+            icon="el-icon-delete"
+            plain
+            style="margin-left: 6px; margin-top: 9px"
+            v-if="index != 0"
+            @click="delnurseClassifyitem(index)"
+          ></el-button>
         </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -148,39 +298,86 @@
       </div>
     </el-dialog>
     <!-- 修改标签字段信息对话框 -->
-    <el-dialog :title="titleup" :visible.sync="openup" width="750px" append-to-body>
+    <el-dialog
-      <el-form ref="form" :model="form" :rules="rulesup" label-width="100px" :inline="true">
+      :title="titleup"
+      :visible.sync="openup"
+      width="750px"
+      append-to-body
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rulesup"
+        label-width="100px"
+        :inline="true"
+      >
         <el-form-item label="字段名称" prop="fieldName">
-          <el-input v-model="form.fieldName" placeholder="请输入字段名称" style="width: 210px" />
+          <el-input
+            v-model="form.fieldName"
+            placeholder="请输入字段名称"
+            style="width: 210px"
+          />
         </el-form-item>
         <el-form-item label="字段类型" prop="fieldType">
-          <el-select v-model="form.fieldType" placeholder="请选择字段类型" clearable style="width: 210px">
+          <el-select
-            <el-option v-for="item in options" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue">
+            v-model="form.fieldType"
+            placeholder="请选择字段类型"
+            clearable
+            style="width: 210px"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+            >
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="字段排序" prop="fieldSort">
-          <el-input-number v-model="form.fieldSort" controls-position="right" :min="0" placeholder="请输入字段排序"
+          <el-input-number
-            style="width: 210px" />
+            v-model="form.fieldSort"
+            controls-position="right"
+            :min="0"
+            placeholder="请输入字段排序"
+            style="width: 210px"
+          />
         </el-form-item>
         <el-form-item label="任务细分" prop="taskPartitionDictId">
-          <el-button type="" v-if="form.taskPartitionDictName == '请选择任务细分'" @click="clickinnerVisiblexg()" style="
+          <el-button
+            type=""
+            v-if="form.taskPartitionDictName == '请选择任务细分'"
+            @click="clickinnerVisiblexg()"
+            style="
               width: 210px;
               text-align: left;
               height: 36px;
               color: #c0c4cc;
               overflow: hidden;
-            ">{{ form.taskPartitionDictName }}</el-button>
+            "
-          <el-button @click="clickinnerVisiblexg()" type="" v-else style="
+            >{{ form.taskPartitionDictName }}</el-button
+          >
+          <el-button
+            @click="clickinnerVisiblexg()"
+            type=""
+            v-else
+            style="
               width: 210px;
               text-align: left;
               height: 36px;
               padding-left: -10px;
               overflow: hidden;
-            ">{{ form.taskPartitionDictName }}</el-button>
+            "
+            >{{ form.taskPartitionDictName }}</el-button
+          >
         </el-form-item>
         <el-form-item label="字段备注信息" prop="fieldRemark">
-          <el-input style="width: 210px" v-model="form.fieldRemark" placeholder="请输入字段备注信息" type="textarea" />
+          <el-input
+            style="width: 210px"
+            v-model="form.fieldRemark"
+            placeholder="请输入字段备注信息"
+            type="textarea"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -189,44 +386,121 @@
       </div>
     </el-dialog>
     <!-- 任务细分弹框 -->
-    <el-dialog title="选择任务细分" :visible.sync="innerVisible" width="1000px" append-to-body
+    <el-dialog
-      :before-close="innerVisiblecancel">
+      title="选择任务细分"
-      <el-form :model="queryParamstask" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+      :visible.sync="innerVisible"
-        label-width="100px">
+      width="1000px"
+      append-to-body
+      :before-close="innerVisiblecancel"
+    >
+      <el-form
+        :model="queryParamstask"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="100px"
+      >
         <el-form-item label="任务细分名称" prop="taskPartitionName">
-          <el-input v-model="queryParamstask.taskPartitionName" placeholder="请输入任务细分名称" clearable />
+          <el-input
+            v-model="queryParamstask.taskPartitionName"
+            placeholder="请输入任务细分名称"
+            clearable
+          />
         </el-form-item>
         <el-form-item label="任务细分编码" prop="taskPartitionCode">
-          <el-input v-model="queryParamstask.taskPartitionCode" placeholder="请输入任务细分编码" clearable />
+          <el-input
+            v-model="queryParamstask.taskPartitionCode"
+            placeholder="请输入任务细分编码"
+            clearable
+          />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuerytask">搜索</el-button>
+          <el-button
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuerytask">重置</el-button>
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuerytask"
+            >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuerytask"
+            >重置</el-button
+          >
         </el-form-item>
       </el-form>
-      <el-table :max-height="maxTableHeight" v-loading="loading" :data="partitionList"
+      <el-table
-        @selection-change="handleSelectionChange">
+        :max-height="maxTableHeight"
+        v-loading="loading"
+        :data="partitionList"
+        @selection-change="handleSelectionChange"
+      >
         <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">
-            <el-button type="primary" style="width: 15px; height: 15px"
+            <el-button
-              v-if="taskPartitionDictId == scope.row.taskTypeId" circle @click="nurseclickzx(scope.row)"></el-button>
+              type="primary"
-            <el-button v-else style="width: 15px; height: 15px" circle @click="nurseclickzx(scope.row)"></el-button>
+              style="width: 15px; height: 15px"
+              v-if="taskPartitionDictId == scope.row.taskTypeId"
+              circle
+              @click="nurseclickzx(scope.row)"
+            ></el-button>
+            <el-button
+              v-else
+              style="width: 15px; height: 15px"
+              circle
+              @click="nurseclickzx(scope.row)"
+            ></el-button>
           </template>
         </el-table-column>
-        <el-table-column label="任务类型名称" align="center" prop="taskTypeName" />
+        <el-table-column
-        <el-table-column label="任务细分名称" align="center" prop="taskPartitionName" />
+          label="任务类型名称"
-        <el-table-column label="任务细分编码" align="center" prop="taskPartitionCode" />
+          align="center"
-        <el-table-column label="二级分类描述" align="center" prop="secondClassifyDescribe" :show-overflow-tooltip="true" />
+          prop="taskTypeName"
-        <el-table-column label="执行时间" align="center" prop="executionTime" width="180">
+        />
+        <el-table-column
+          label="任务细分名称"
+          align="center"
+          prop="taskPartitionName"
+        />
+        <el-table-column
+          label="任务细分编码"
+          align="center"
+          prop="taskPartitionCode"
+        />
+        <el-table-column
+          label="二级分类描述"
+          align="center"
+          prop="secondClassifyDescribe"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="执行时间"
+          align="center"
+          prop="executionTime"
+          width="180"
+        >
         </el-table-column>
-        <el-table-column label="任务细分排序" align="center" prop="taskPartitionSort" />
+        <el-table-column
-        <el-table-column label="任务细分备注" align="center" prop="taskPartitionRemark" :show-overflow-tooltip="true" />
+          label="任务细分排序"
+          align="center"
+          prop="taskPartitionSort"
+        />
+        <el-table-column
+          label="任务细分备注"
+          align="center"
+          prop="taskPartitionRemark"
+          :show-overflow-tooltip="true"
+        />
       </el-table>
       <!-- <pagination class="pag" v-show="totaltask > 0" :total="totaltask" :page.sync="queryParamstask.pageNum"
         :limit.sync="queryParamstask.pageSize" @pagination="getListpartit" />
        -->
-      <myPagination v-show="totaltask > 0" :total="totaltask" :pageSize="queryParamstask.pageSize"
+      <myPagination
-        :indexFromWrap="queryParamstask.pageNum" @updateCPage="updateCPagetwo"></myPagination>
+        v-show="totaltask > 0"
+        :total="totaltask"
+        :pageSize="queryParamstask.pageSize"
+        :indexFromWrap="queryParamstask.pageNum"
+        @updateCPage="updateCPagetwo"
+      ></myPagination>
     </el-dialog>
   </div>
 </template>
@@ -418,12 +692,11 @@ export default {
       console.log(row)
       if (this.title == '添加标签字段信息') {
         this.form.labelFieldInfoList[this.nnerVisibleindex].taskPartitionDictName =
-          row.taskTypeName;
+          row.taskPartitionName;
         this.form.labelFieldInfoList[this.nnerVisibleindex].taskPartitionDictId =
           row.taskTypeId;
       } else if (this.titleup == '修改标签字段信息') {
-        this.form.taskPartitionDictName =
+        this.form.taskPartitionDictName =row.taskPartitionName;
-          row.taskTypeName;
         this.form.taskPartitionDictId =
           row.taskTypeId;