From 3ecc419f66407462969e1d9b3e5ee0218a59ada1 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期五, 01 三月 2024 11:20:44 +0800
Subject: [PATCH] qxtj

---
 src/views/hosp/project/index.vue |  762 ++++++++++++----------------------------------------------
 1 files changed, 159 insertions(+), 603 deletions(-)

diff --git a/src/views/hosp/project/index.vue b/src/views/hosp/project/index.vue
index 7eed577..97b3f50 100644
--- a/src/views/hosp/project/index.vue
+++ b/src/views/hosp/project/index.vue
@@ -3,91 +3,39 @@
     <el-row :gutter="20">
       <el-col :span="3" :xs="24">
         <div class="head-container">
-          <el-input
-            v-model="deptName"
-            placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�"
-            clearable
-            size="small"
-            prefix-icon="el-icon-search"
-            style="margin-bottom: 15px"
-          />
+          <el-input v-model="deptName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" clearable size="small" prefix-icon="el-icon-search"
+            style="margin-bottom: 15px" />
         </div>
         <el-scrollbar style="height: 629px; width: 100%">
           <div class="head-container">
-            <el-tree
-              :data="deptOptions"
-              :props="defaultProps"
-              :expand-on-click-node="false"
-              :filter-node-method="filterNode"
-              ref="tree"
-              node-key="id"
-              :default-expanded-keys="treeId"
-              highlight-current
-              @node-click="handleNodeClick"
-            />
+            <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
+              :filter-node-method="filterNode" ref="tree" node-key="id" :default-expanded-keys="treeId" highlight-current
+              @node-click="handleNodeClick" />
           </div>
         </el-scrollbar>
       </el-col>
       <el-col :span="20" :xs="24">
-        <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="proName">
-            <el-input
-              v-model="queryParams.proName"
-              placeholder="璇疯緭鍏ラ」鐩悕绉�"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
+            <el-input v-model="queryParams.proName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item label="妫�鏌ョ被鍒�" prop="checkType">
-            <el-input
-              v-model="queryParams.checkType"
-              placeholder="璇疯緭鍏ユ鏌ョ被鍒�"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
+            <el-input v-model="queryParams.checkType" placeholder="璇疯緭鍏ユ鏌ョ被鍒�" clearable @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item>
-            <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-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>
 
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button
-              type="primary"
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd"
-              v-hasPermi="['hosp:project:add']"
-              >鏂板</el-button
-            >
+            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
+              v-hasPermi="['hosp:project:add']">鏂板</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
-              :disabled="xiugais"
-              type="primary"
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleUpdate1"
-              v-hasPermi="['hosp:project:add']"
-              >淇敼</el-button
-            >
+            <el-button :disabled="xiugais" type="primary" icon="el-icon-plus" size="mini" @click="handleUpdate1"
+              v-hasPermi="['hosp:project: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" v-hasPermi="['hosp:project:edit']">淇敼</el-button>
@@ -96,180 +44,58 @@
         <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['hosp:project:remove']">鍒犻櫎</el-button>
       </el-col> -->
           <el-col :span="1.5">
-            <el-button
-              type="primary"
-              icon="el-icon-download"
-              size="mini"
-              @click="handleExport"
-              v-hasPermi="['hosp:project:export']"
-              >瀵煎嚭</el-button
-            >
+            <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
+              v-hasPermi="['hosp:project:export']">瀵煎嚭</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
-              type="primary"
-              icon="el-icon-sort"
-              size="mini"
-              @click="toggleExpandAll"
-              >灞曞紑/鎶樺彔</el-button
-            >
+            <el-button type="primary" icon="el-icon-sort" size="mini" @click="toggleExpandAll">灞曞紑/鎶樺彔</el-button>
           </el-col>
-          <right-toolbar
-            :showSearch.sync="showSearch"
-            @queryTable="getList"
-          ></right-toolbar>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table
-          v-if="refreshTable"
-          v-loading="loading"
-          :data="projectList"
-          ref="tableRef"
-          border
-        >
+        <el-table v-if="refreshTable" v-loading="loading" :data="projectList" ref="tableRef" border>
           <!-- :show-overflow-tooltip="true"  -->
-          <el-table-column
-            label="椤圭洰鍚嶇О"
-            prop="proName"
-            fixed="left"
-            :width="flexColumnWidth('rwdtypeName')"
-          />
-          <el-table-column
-            label="椤圭洰浠锋牸(鍗曚綅/鍏�)"
-            align="center"
-            prop="proPrice"
-            width="75px"
-            :show-overflow-tooltip="true"
-          ></el-table-column>
+          <el-table-column label="椤圭洰鍚嶇О" prop="proName" fixed="left" :width="flexColumnWidth('rwdtypeName')" />
+          <el-table-column label="椤圭洰浠锋牸(鍗曚綅/鍏�)" align="center" prop="proPrice" width="75px"
+            :show-overflow-tooltip="true"></el-table-column>
           <!-- <el-table-column label="绉戝鍚嶇О" align="center" prop="deptName" width="110px" :show-overflow-tooltip="true" /> -->
-          <el-table-column
-            label="妫�鏌ョ被鍒�"
-            align="center"
-            prop="proCheckType"
-            width="110px"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="榛樿鍊�"
-            align="center"
-            prop="proDefault"
-            width="110px"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="涓村簥鎰忎箟"
-            align="center"
-            prop="proMeaning"
-            width="350px"
-            :show-overflow-tooltip="true"
-          />
+          <el-table-column label="妫�鏌ョ被鍒�" align="center" prop="proCheckType" width="110px" :show-overflow-tooltip="true" />
+          <el-table-column label="榛樿鍊�" align="center" prop="proDefault" width="110px" :show-overflow-tooltip="true" />
+          <el-table-column label="涓村簥鎰忎箟" align="center" prop="proMeaning" width="350px" :show-overflow-tooltip="true" />
           <!-- <el-table-column label="妫�鏌ユ柟寮�" align="center" prop="proCheckMethod" :show-overflow-tooltip="true"
             width="110px" /> -->
-          <el-table-column
-            label="鍙備笌灏忕粨"
-            align="center"
-            prop="needReport"
-            :show-overflow-tooltip="true"
-            width="110px"
-          >
+          <el-table-column label="鍙備笌灏忕粨" align="center" prop="needReport" :show-overflow-tooltip="true" width="110px">
             <template slot-scope="scope">
-              <dict-tag
-                :options="dict.type.sys_yes_no"
-                :value="scope.row.needReport"
-              />
+              <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.needReport" />
             </template>
           </el-table-column>
-          <el-table-column
-            label="鏄惁绌鸿吂"
-            align="center"
-            prop="proCheckMethod"
-            :show-overflow-tooltip="true"
-            width="110px"
-          >
+          <el-table-column label="鏄惁绌鸿吂" align="center" prop="proCheckMethod" :show-overflow-tooltip="true" width="110px">
             <template slot-scope="scope">
-              <dict-tag
-                :options="dict.type.sys_yes_no"
-                :value="scope.row.proCheckMethod"
-              />
+              <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.proCheckMethod" />
             </template>
           </el-table-column>
-          <el-table-column
-            label="椤圭洰鏍囧噯鍊�"
-            align="center"
-            prop="proScope"
-            :show-overflow-tooltip="true"
-            width="90px"
-          >
+          <el-table-column label="椤圭洰鏍囧噯鍊�" align="center" prop="proScope" :show-overflow-tooltip="true" width="90px">
           </el-table-column>
-          <el-table-column
-            label="椤圭洰绫诲瀷"
-            align="center"
-            prop="resultType"
-            width="110px"
-            :show-overflow-tooltip="true"
-          >
+          <el-table-column label="椤圭洰绫诲瀷" align="center" prop="resultType" width="110px" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <dict-tag
-                :options="dict.type.tj_result_type"
-                :value="scope.row.resultType"
-              />
+              <dict-tag :options="dict.type.tj_result_type" :value="scope.row.resultType" />
             </template>
           </el-table-column>
-          <el-table-column
-            label="澶囨敞"
-            prop="remark"
-            align="center"
-            width="120px"
-            :show-overflow-tooltip="true"
-          >
+          <el-table-column label="澶囨敞" prop="remark" align="center" width="120px" :show-overflow-tooltip="true">
           </el-table-column>
-          <el-table-column
-            label="鐘舵��"
-            align="center"
-            prop="proStatus"
-            fixed="right"
-            width="80px"
-          >
+          <el-table-column label="鐘舵��" align="center" prop="proStatus" fixed="right" width="80px">
             <template slot-scope="scope">
-              <dict-tag
-                :options="dict.type.sys_normal_disable"
-                :value="scope.row.proStatus"
-              />
+              <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.proStatus" />
             </template>
           </el-table-column>
-          <el-table-column
-            label="鎿嶄綔"
-            align="center"
-            fixed="right"
-            class-name="small-padding fixed-width"
-            width="80px"
-          >
+          <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width" width="80px">
             <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-                @click="handleUpdate(scope.row)"
-                v-hasPermi="['hosp:project:edit']"
-                title="淇敼"
-              ></el-button>
-              <el-button
-                v-if="scope.row.proParentId == '0'"
-                size="mini"
-                type="text"
-                icon="el-icon-plus"
-                @click="handleAdd(scope.row)"
-                v-hasPermi="['system:dept:add']"
-                title="澧炲姞"
-              ></el-button>
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['hosp:project:remove']"
-                title="鍒犻櫎"
-              ></el-button>
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                v-hasPermi="['hosp:project:edit']" title="淇敼"></el-button>
+              <el-button v-if="scope.row.proParentId == '0'" size="mini" type="text" icon="el-icon-plus"
+                @click="handleAdd(scope.row)" v-hasPermi="['system:dept:add']" title="澧炲姞"></el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                v-hasPermi="['hosp:project:remove']" title="鍒犻櫎"></el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -277,39 +103,14 @@
     </el-row>
 
     <!-- 娣诲姞鎴栦慨鏀逛綋妫�椤圭洰瀵硅瘽妗� -->
-    <el-dialog
-      :title="title"
-      :visible.sync="open"
-      width="1200px"
-      append-to-body
-      :before-close="handleClose"
-    >
-      <el-form
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="100px"
-        :inline="true"
-      >
-        <el-form-item label="涓婚」鍚嶇О" prop="proParentId"  >
-          <treeselect
-          :disabled="proParent"
-            v-model="form.proParentId"
-            :options="projectOptions"
-            :normalizer="normalizer"
-            :show-count="true"
-            placeholder="閫夋嫨涓婚」鍚嶇О"
-            style="width: 260px"
-            @select="obtain"
-           
-          />
+    <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body :before-close="handleClose">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
+        <el-form-item label="涓婚」鍚嶇О" prop="proParentId">
+          <treeselect :disabled="proParent" v-model="form.proParentId" :options="projectOptions" :normalizer="normalizer"
+            :show-count="true" placeholder="閫夋嫨涓婚」鍚嶇О" style="width: 260px" @select="obtain" />
         </el-form-item>
         <el-form-item label="鏄庣粏椤圭洰" prop="proName" v-if="key == 'Y'">
-          <span
-            slot="label"
-            style="display: inline-block; border-bottom: 2px solid blue"
-            @click="getDetailed"
-          >
+          <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="getDetailed">
             鏄庣粏椤圭洰
             <!-- <el-tooltip effect="dark" content="鏄庣粏椤圭洰" placement="bottom">
               <i class='el-icon-question' @click="getDetailed" />
@@ -327,41 +128,21 @@
           <el-input v-model="form.proPrice" placeholder="璇疯緭鍏ラ」鐩环鏍�" />
         </el-form-item>
         <el-form-item label="妫�鏌ョ被鍒�" prop="proCheckType">
-          <el-input
-            v-model="form.proCheckType"
-            placeholder="璇疯緭鍏ユ鏌ョ被鍒�"
-            style="width: 260px"
-          />
+          <el-input v-model="form.proCheckType" placeholder="璇疯緭鍏ユ鏌ョ被鍒�" style="width: 260px" />
         </el-form-item>
         <el-form-item label="涓村簥鎰忎箟" prop="proMeaning">
           <el-input v-model="form.proMeaning" placeholder="璇疯緭鍏ヤ复搴婃剰涔�" />
         </el-form-item>
         <el-form-item label="鍙備笌灏忕粨" prop="needReport">
-          <el-select
-            v-model="form.needReport"
-            placeholder="璇烽�夋嫨鏄惁鍙備笌灏忕粨"
-            style="width: 200px"
-          >
-            <el-option
-              v-for="dict in dict.type.sys_yes_no"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+          <el-select v-model="form.needReport" placeholder="璇烽�夋嫨鏄惁鍙備笌灏忕粨" style="width: 200px">
+            <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="鏄惁绌鸿吂" prop="proCheckMethod">
-          <el-select
-            v-model="form.proCheckMethod"
-            placeholder="璇烽�夋嫨鏄惁绌鸿吂"
-            style="width: 260px"
-          >
-            <el-option
-              v-for="dict in dict.type.sys_yes_no"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+          <el-select v-model="form.proCheckMethod" placeholder="璇烽�夋嫨鏄惁绌鸿吂" style="width: 260px">
+            <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="绌鸿吂" prop="isEat">
@@ -371,18 +152,9 @@
           </el-select>
         </el-form-item> -->
         <el-form-item label="鎬у埆" prop="proSex">
-          <el-select
-            v-model="form.proSex"
-            placeholder="璇烽�夋嫨浣撴浜烘�у埆"
-            style="width: 200px"
-            clearable
-          >
-            <el-option
-              v-for="dict in dict.type.sys_user_sex"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+          <el-select v-model="form.proSex" placeholder="璇烽�夋嫨浣撴浜烘�у埆" style="width: 200px" clearable>
+            <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="椤圭洰绫诲瀷" prop="proType">
@@ -390,114 +162,45 @@
         </el-form-item>
 
         <el-form-item label="绉戝鍚嶇О" prop="deptId">
-          <el-select
-            v-model="form.deptId"
-            placeholder="璇烽�夋嫨绉戝鍚嶇О"
-            @change="$forceUpdate()"
-            filterable
-            style="width: 260px"
-          >
-            <el-option
-              v-for="item in parentNameList"
-              :key="item.deptId"
-              :label="item.deptName"
-              :value="item.deptId"
-            />
+          <el-select v-model="form.deptId" placeholder="璇烽�夋嫨绉戝鍚嶇О" @change="changeType" filterable style="width: 260px">
+            <el-option v-for="item in parentNameList" :key="item.deptId" :label="item.deptName" :value="item.deptId" />
           </el-select>
         </el-form-item>
         <el-form-item label="鍚敤鏍囧織" prop="proStatus">
-          <el-select
-            v-model="form.proStatus"
-            placeholder="璇烽�夋嫨鐘舵��"
-            style="width: 200px"
-            filterable
-            clearable
-          >
-            <el-option
-              v-for="dict in dict.type.sys_normal_disable"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+          <el-select v-model="form.proStatus" placeholder="璇烽�夋嫨鐘舵��" style="width: 200px" filterable clearable>
+            <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="椤圭洰榛樿鍊�" prop="proDefault">
-          <el-input
-            v-model="form.proDefault"
-            placeholder="璇疯緭鍏ラ」鐩粯璁ゅ��"
-            style="width: 200px"
-          />
+          <el-input v-model="form.proDefault" placeholder="璇疯緭鍏ラ」鐩粯璁ゅ��" style="width: 200px" />
         </el-form-item>
         <el-form-item label="閲囨牱鏍囪" prop="isSampling">
-          <el-select
-            v-model="form.isSampling"
-            placeholder="璇烽�夋嫨閲囨牱鏍囪"
-            style="width: 260px"
-            filterable
-            clearable
-          >
-            <el-option
-              v-for="dict in dict.type.dis_sampling_tab"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+          <el-select v-model="form.isSampling" placeholder="璇烽�夋嫨閲囨牱鏍囪" style="width: 260px" filterable clearable>
+            <el-option v-for="dict in dict.type.dis_sampling_tab" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="鏍囨湰绫诲瀷" prop="specimenType">
-          <el-select
-            v-model="form.specimenType"
-            placeholder="璇烽�夋嫨鏍囨湰绫诲瀷"
-            style="width: 200px"
-            filterable
-            clearable
-          >
-            <el-option
-              v-for="dict in dict.type.sys_dict_specimen"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+          <el-select v-model="form.specimenType" placeholder="璇烽�夋嫨鏍囨湰绫诲瀷" style="width: 200px" filterable clearable>
+            <el-option v-for="dict in dict.type.sys_dict_specimen" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="妫�鏌ラ儴浣�" prop="checkBw">
-          <el-select
-            v-model="form.checkBw"
-            placeholder="璇烽�夋嫨妫�鏌ラ儴浣�"
-            style="width: 200px"
-            filterable
-            clearable
-          >
-            <el-option
-              v-for="dict in dict.type.sys_dict_position"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+          <el-select v-model="form.checkBw" placeholder="璇烽�夋嫨妫�鏌ラ儴浣�" style="width: 200px" filterable clearable>
+            <el-option v-for="dict in dict.type.sys_dict_position" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="缁撴灉绫诲瀷" prop="resultType">
-          <el-select
-            v-model="form.resultType"
-            placeholder="璇烽�夋嫨缁撴灉绫诲瀷"
-            style="width: 260px"
-            filterable
-            clearable
-          >
-            <el-option
-              v-for="dict in dict.type.tj_result_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+          <el-select v-model="form.resultType" placeholder="璇烽�夋嫨缁撴灉绫诲瀷" style="width: 260px" filterable clearable>
+            <el-option v-for="dict in dict.type.tj_result_type" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="LIS椤圭洰" prop="lisXmmc">
-          <span
-            slot="label"
-            style="display: inline-block; border-bottom: 2px solid blue"
-            @click="handleQuerys"
-          >
+          <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="handleQuerys">
             LIS椤圭洰
             <!-- <el-tooltip effect="dark" content="鏄庣粏椤圭洰" placement="bottom">
               <i class='el-icon-question' @click="getDetailed" />
@@ -508,48 +211,18 @@
           </el-input>
         </el-form-item>
         <el-form-item label="澶囨敞" prop="proRemark">
-          <el-input
-            v-model="form.proRemark"
-            placeholder="璇疯緭鍏ュ娉�"
-            style="width: 200px"
-          />
+          <el-input v-model="form.proRemark" placeholder="璇疯緭鍏ュ娉�" style="width: 200px" />
         </el-form-item>
       </el-form>
-      <el-button
-        style="margin-left: 40px"
-        type="primary"
-        plain
-        size="mini"
-        icon="el-icon-plus"
-        @click="addmembers"
-        >鏂板琛�</el-button
-      >
+      <el-button style="margin-left: 40px" type="primary" plain size="mini" icon="el-icon-plus"
+        @click="addmembers">鏂板琛�</el-button>
       <!-- 鑰楁潗琛� -->
-      <el-table
-        :data="form.consumablesList"
-        border
-        style="margin-top: 10px; margin-left: 40px; width: 890px"
-        v-if="showPrise"
-      >
-        <el-table-column
-          label="鑰楁潗鍚嶇О"
-          align="center"
-          prop="makings"
-          width="200px"
-        >
+      <el-table :data="form.consumablesList" border style="margin-top: 10px; margin-left: 40px; width: 890px"
+        v-if="showPrise">
+        <el-table-column label="鑰楁潗鍚嶇О" align="center" prop="makings" width="200px">
           <template slot-scope="scope">
-            <el-select
-              filterable
-              v-model="scope.row.makings"
-              placeholder="璇烽�夋嫨鏀惰垂椤圭洰"
-              @change="getSelectValue"
-            >
-              <el-option
-                v-for="(item, index) in consumableList"
-                :key="index"
-                :label="item.makings"
-                :value="item.makings"
-              >
+            <el-select filterable v-model="scope.row.makings" placeholder="璇烽�夋嫨鏀惰垂椤圭洰" @change="getSelectValue">
+              <el-option v-for="(item, index) in consumableList" :key="index" :label="item.makings" :value="item.makings">
               </el-option>
             </el-select>
           </template>
@@ -558,109 +231,51 @@
         </el-table-column>
         <el-table-column label="浠锋牸" align="center" prop="price">
         </el-table-column>
-        <el-table-column
-          label="鎿嶄綔"
-          align="center"
-          fixed="right"
-          class-name="small-padding fixed-width"
-        >
+        <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width">
           <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click.native.prevent="Delete(scope.$index)"
-              v-hasPermi="['hosp:consumables:remove']"
-              title="鍒犻櫎"
-            ></el-button>
+            <el-button size="mini" type="text" icon="el-icon-delete" @click.native.prevent="Delete(scope.$index)"
+              v-hasPermi="['hosp:consumables:remove']" title="鍒犻櫎"></el-button>
           </template>
         </el-table-column>
       </el-table>
       <!-- 椤圭洰鏍囧噯鍊艰〃 -->
-      <el-table
-        :data="form.tjStandardList"
-        border
-        style="margin-top: 10px; margin-left: 40px; width: 890px"
-        v-if="showRentPrise"
-      >
+      <el-table :data="form.tjStandardList" border style="margin-top: 10px; margin-left: 40px; width: 890px"
+        v-if="showRentPrise">
         <el-table-column label="浣撴浜烘�у埆" align="center" prop="tjSex">
           <template slot-scope="scope">
             <el-select v-model="scope.row.tjSex" placeholder="璇烽�夋嫨浣撴浜烘�у埆">
-              <el-option
-                v-for="dict in dict.type.sys_user_sex"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
+              <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
+                :value="dict.value"></el-option>
             </el-select>
           </template>
         </el-table-column>
         <el-table-column label="浣撴浜虹被鍨�" align="center" prop="tjType">
           <template slot-scope="scope">
-            <el-select
-              filterable
-              v-model="scope.row.tjType"
-              placeholder="璇烽�夋嫨浣撴浜虹被鍨�"
-            >
-              <el-option
-                v-for="dict in dict.type.dict_personnel_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
+            <el-select filterable v-model="scope.row.tjType" placeholder="璇烽�夋嫨浣撴浜虹被鍨�">
+              <el-option v-for="dict in dict.type.dict_personnel_type" :key="dict.value" :label="dict.label"
+                :value="dict.value"></el-option>
             </el-select>
           </template>
         </el-table-column>
         <el-table-column label="鍗曚綅" align="center" prop="company">
           <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.company"
-              autocomplete="off"
-              placeholder="璇疯緭鍏ュ唴瀹�"
-            ></el-input>
+            <el-input v-model="scope.row.company" autocomplete="off" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
           </template>
         </el-table-column>
-        <el-table-column
-          label="鏍囧噯鏈�灏忓��"
-          align="center"
-          prop="tjStandardLtValue"
-        >
+        <el-table-column label="鏍囧噯鏈�灏忓��" align="center" prop="tjStandardLtValue">
           <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.tjStandardLtValue"
-              autocomplete="off"
-              placeholder="璇疯緭鍏ユ爣鍑嗘渶灏忓��"
-            ></el-input>
+            <el-input v-model="scope.row.tjStandardLtValue" autocomplete="off" placeholder="璇疯緭鍏ユ爣鍑嗘渶灏忓��"></el-input>
           </template>
         </el-table-column>
-        <el-table-column
-          label="鏍囧噯鏈�澶у��"
-          align="center"
-          prop="tjStandardGtValue"
-        >
+        <el-table-column label="鏍囧噯鏈�澶у��" align="center" prop="tjStandardGtValue">
           <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.tjStandardGtValue"
-              autocomplete="off"
-              placeholder="璇疯緭鍏ユ爣鍑嗘渶澶у��"
-            ></el-input>
+            <el-input v-model="scope.row.tjStandardGtValue" autocomplete="off" placeholder="璇疯緭鍏ユ爣鍑嗘渶澶у��"></el-input>
           </template>
         </el-table-column>
-        <el-table-column
-          label="鎿嶄綔"
-          align="center"
-          fixed="right"
-          class-name="small-padding fixed-width"
-        >
+        <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width">
           <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click.native.prevent="Delete(scope.$index)"
-              v-hasPermi="['hosp:consumables:remove']"
-              title="鍒犻櫎"
-            ></el-button>
+            <el-button size="mini" type="text" icon="el-icon-delete" @click.native.prevent="Delete(scope.$index)"
+              v-hasPermi="['hosp:consumables:remove']" title="鍒犻櫎"></el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -677,76 +292,32 @@
           <el-col :span="6" :xs="24">
             <div style="height: 560px; overflow-y: scroll">
               <div class="head-container">
-                <el-input
-                  v-model="xmmc"
-                  placeholder="璇疯緭鍏ラ」鐩紪鐮�"
-                  clearable
-                  size="small"
-                  prefix-icon="el-icon-search"
-                  style="margin-bottom: 20px"
-                />
+                <el-input v-model="xmmc" placeholder="璇疯緭鍏ラ」鐩紪鐮�" clearable size="small" prefix-icon="el-icon-search"
+                  style="margin-bottom: 20px" />
               </div>
               <div id="changtree">
-                <el-tree
-                  ref="tree"
-                  node-key="id"
-                  highlight-current
-                  :default-expanded-keys="chargeId"
-                  :data="deptOptionstree"
-                  :props="defaultPropstree"
-                  :expand-on-click-node="false"
-                  :auto-expand-parent="false"
-                  :filter-node-method="filterNode2"
-                  @node-click="handleNodecharge"
-                />
+                <el-tree ref="tree" node-key="id" highlight-current :default-expanded-keys="chargeId"
+                  :data="deptOptionstree" :props="defaultPropstree" :expand-on-click-node="false"
+                  :auto-expand-parent="false" :filter-node-method="filterNode2" @node-click="handleNodecharge" />
               </div>
             </div>
           </el-col>
           <el-col :span="18" :xs="24">
-            <el-form
-              :model="querycharge"
-              ref="queryForm"
-              size="small"
-              :inline="true"
-              v-show="showSearch"
-              label-width="68px"
-            >
+            <el-form :model="querycharge" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+              label-width="68px">
               <el-form-item label="椤圭洰鍚嶇О" prop="xmmc">
-                <el-input
-                  v-model="querycharge.xmmc"
-                  placeholder="璇疯緭鍏ラ」鐩悕绉�"
-                  clearable
-                  @keyup.enter.native="handlecharge"
-                />
+                <el-input v-model="querycharge.xmmc" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable @keyup.enter.native="handlecharge" />
               </el-form-item>
               <el-form-item label="鎷奸煶鐮�" prop="pym">
-                <el-input
-                  v-model="querycharge.pym"
-                  placeholder="璇疯緭鍏ユ嫾闊崇爜"
-                  clearable
-                  @keyup.enter.native="handlecharge"
-                />
+                <el-input v-model="querycharge.pym" placeholder="璇疯緭鍏ユ嫾闊崇爜" clearable @keyup.enter.native="handlecharge" />
               </el-form-item>
               <el-form-item>
-                <el-button
-                  type="primary"
-                  icon="el-icon-search"
-                  size="mini"
-                  @click="handlecharge"
-                  >鎼滅储</el-button
-                >
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handlecharge">鎼滅储</el-button>
               </el-form-item>
             </el-form>
 
-            <el-table
-              v-loading="loading"
-              ref="tb"
-              :data="sfxmList"
-              @selection-change="handleSelectionChange"
-              border
-              height="520px"
-              style="width: 100%"
-            >
+            <el-table v-loading="loading" ref="tb" :data="sfxmList" @selection-change="handleSelectionChange" border
+              height="520px" style="width: 100%">
               <el-table-column type="selection" align="center" />
               <el-table-column label="搴忓彿" align="center" prop="newID" />
               <el-table-column label="椤圭洰缂栫爜" align="center" prop="xmbm" />
@@ -754,48 +325,22 @@
               <el-table-column label="鎷奸煶鐮�" align="center" prop="pym" />
               <!-- <el-table-column label="浜旂瑪鐮�" align="center" prop="wbm"  /> -->
               <el-table-column label="鍙傝�冨崟浠�" align="center" prop="ckdj" />
-              <el-table-column
-                label="涓�绾ф渶楂橀檺浠�"
-                align="center"
-                prop="yjzgxj"
-              />
-              <el-table-column
-                label="浜岀骇鏈�楂橀檺浠�"
-                align="center"
-                prop="ejzgxj"
-              />
-              <el-table-column
-                label="涓夌骇鏈�楂橀檺浠�"
-                align="center"
-                prop="sjzgxj"
-              />
-              <el-table-column
-                label="鐗瑰畾鏈�楂橀檺浠�"
-                align="center"
-                prop="tdzgxj"
-              />
+              <el-table-column label="涓�绾ф渶楂橀檺浠�" align="center" prop="yjzgxj" />
+              <el-table-column label="浜岀骇鏈�楂橀檺浠�" align="center" prop="ejzgxj" />
+              <el-table-column label="涓夌骇鏈�楂橀檺浠�" align="center" prop="sjzgxj" />
+              <el-table-column label="鐗瑰畾鏈�楂橀檺浠�" align="center" prop="tdzgxj" />
             </el-table>
 
             <div class="pag" v-if="List == true">
               <div class="pag1">
-                <pagination
-                  v-show="total > 0"
-                  :total="total"
-                  :page.sync="querycharge.pageNum"
-                  :limit.sync="querycharge.pageSize"
-                  @pagination="getlistSfxm"
-                />
+                <pagination v-show="total > 0" :total="total" :page.sync="querycharge.pageNum"
+                  :limit.sync="querycharge.pageSize" @pagination="getlistSfxm" />
               </div>
             </div>
             <div class="pag" v-if="List == false">
               <div class="pag1">
-                <pagination
-                  v-show="total > 0"
-                  :total="total"
-                  :page.sync="queryParam.page"
-                  :limit.sync="queryParam.pageSize"
-                  @pagination="getListByXmId"
-                />
+                <pagination v-show="total > 0" :total="total" :page.sync="queryParam.page"
+                  :limit.sync="queryParam.pageSize" @pagination="getListByXmId" />
               </div>
             </div>
           </el-col>
@@ -923,7 +468,7 @@
         children: "children",
         label: "label",
       },
-      proParent:false,
+      proParent: false,
       id: "",
       // 閲嶆柊娓叉煋琛ㄦ牸鐘舵��
       refreshTable: true,
@@ -950,7 +495,10 @@
       },
       // 琛ㄥ崟鍙傛暟
       form: {
+        proParentId: "",
+        deptId: "",
         needReport: "Y",
+        proStatus:"0",
         proName: "",
         proPrice: "",
         sfxmId: "",
@@ -1035,7 +583,7 @@
       this.form.lisXmmc = param1[0].pacName;
     },
     //鏄惁鏄剧ず閫変腑鐨勫��
-    display(value) {},
+    display(value) { },
     /** 鏌ヨ浣撴椤圭洰鍒楄〃 */
     getList() {
       // this.loading = true;
@@ -1084,6 +632,7 @@
           project.children = this.handleTree(response.data.list, "proId");
           this.key = response.data.key;
           this.projectOptions.push(project);
+          console.log(this.projectOptions)
           if (row) {
             this.form.proParentId = row.proId;
             this.open = true;
@@ -1092,11 +641,11 @@
           }
         }
       });
-     
+
       this.title = "浣撴椤圭洰淇℃伅缁存姢";
-      if(this.queryParams.deptId){
+      if (this.queryParams.deptId) {
         this.form.deptId = this.queryParams.deptId;
-      }else{
+      } else {
         this.form.deptId = null
       }
       // this.form.proId = this.queryParams.proId;
@@ -1135,8 +684,12 @@
         this.$message.error("璇烽�夋嫨涓婚」鍚嶇О");
       }
     },
+    changeType() {
+      this.$forceUpdate()
+    },
 
     obtain(vals) {
+     
       if (this.projectOptions) {
         this.selectList = vals;
       }
@@ -1144,6 +697,7 @@
         this.showPrise = true;
         this.showRentPrise = false;
       } else {
+        this.form.deptId = this.selectList.deptId
         this.showPrise = false;
         this.showRentPrise = true;
       }
@@ -1491,7 +1045,7 @@
       this.getData();
       // this.form = row;
       const proId = row.proId || this.ids;
-      this.proParent =false
+      this.proParent = false
       getProject(proId).then((response) => {
         this.form = response.data;
         if (this.form.proParentId === "0") {
@@ -1545,15 +1099,15 @@
           });
         }
         getlist().then((response) => {
-        if (response.code == 200) {
-          this.loading = false;
-          this.projectOptions = [];
-          const project = { proId: 0, proName: "涓荤被鐩�", children: [] };
-          project.children = this.handleTree(response.data.list, "proId");
-          this.key = response.data.key;
-          this.projectOptions.push(project);
-        }
-      })
+          if (response.code == 200) {
+            this.loading = false;
+            this.projectOptions = [];
+            const project = { proId: 0, proName: "涓荤被鐩�", children: [] };
+            project.children = this.handleTree(response.data.list, "proId");
+            this.key = response.data.key;
+            this.projectOptions.push(project);
+          }
+        })
         this.open = true;
         this.title = "浣撴椤圭洰淇℃伅缁存姢";
       });
@@ -1629,14 +1183,14 @@
               this.form.lisXmbm = this.form.lisXmbm;
               updateProject(this.form).then((response) => {
                 this.$modal.msgSuccess("淇敼鎴愬姛");
-                if(this.proParent == true){
+                if (this.proParent == true) {
                   this.getDeptTree();
                   this.cancel();
-                }else{
+                } else {
                   this.cancel();
-                this.getList();
+                  this.getList();
                 }
-               
+
               });
             } else {
               if (this.form.proParentId === 0) {
@@ -1699,14 +1253,14 @@
               this.form.lisXmbm = this.form.lisXmbm;
               updateProject(this.form).then((response) => {
                 this.$modal.msgSuccess("淇敼鎴愬姛");
-                if(this.proParent == true){
+                if (this.proParent == true) {
                   this.getDeptTree();
                   this.cancel();
-                }else{
+                } else {
                   this.cancel();
-                this.getList();
+                  this.getList();
                 }
-                
+
               });
             } else {
               if (this.form.proParentId === 0) {
@@ -1759,7 +1313,7 @@
           this.getList();
           this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
@@ -1798,15 +1352,17 @@
   background: #e5f3ff;
 }
 
-.el-tree-node.is-current > .el-tree-node__content {
+.el-tree-node.is-current>.el-tree-node__content {
   background-color: #e5f3ff !important;
   color: #333 !important;
 }
+
 .el-scrollbar__bar.is-vertical {
   opacity: 1;
   padding-right: 5px;
   width: 7px;
 }
+
 .el-scrollbar__wrap {
   overflow-x: hidden;
 }

--
Gitblit v1.8.0