From e08d725d241c7eca309cb50339ceaf1845471a31 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期一, 26 二月 2024 15:21:51 +0800
Subject: [PATCH] qxtj

---
 src/views/hosp/project/index.vue | 1130 ++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 882 insertions(+), 248 deletions(-)

diff --git a/src/views/hosp/project/index.vue b/src/views/hosp/project/index.vue
index 7de6eeb..25fa209 100644
--- a/src/views/hosp/project/index.vue
+++ b/src/views/hosp/project/index.vue
@@ -3,33 +3,91 @@
     <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>
-        <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" />
-        </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"
+            />
+          </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-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>
@@ -38,46 +96,180 @@
         <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 row-key="proId"
-          :expand-row-keys="ListId" :row-class-name="selectSingleRow"
-          :tree-props="{ children: 'tjProjectList', hasChildren: 'tjProjectList.length>0', }">
-          <el-table-column label="椤圭洰鍚嶇О" prop="proName" fixed="left" width="150px" :show-overflow-tooltip="true" />
-          <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="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="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
+          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="绉戝鍚嶇О" 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="proCheckMethod" :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.tj_result_type" :value="scope.row.resultType" />
+              <dict-tag
+                :options="dict.type.sys_yes_no"
+                :value="scope.row.needReport"
+              />
             </template>
           </el-table-column>
-          <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="proCheckMethod"
+            :show-overflow-tooltip="true"
+            width="110px"
+          >
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.proStatus" />
+              <dict-tag
+                :options="dict.type.sys_yes_no"
+                :value="scope.row.proCheckMethod"
+              />
             </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"
+            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"
+          >
             <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 size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                v-hasPermi="['hosp:project:remove']" title="鍒犻櫎"></el-button>
+              <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>
+          <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"
+              />
+            </template>
+          </el-table-column>
+          <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>
             </template>
           </el-table-column>
         </el-table>
@@ -85,14 +277,37 @@
     </el-row>
 
     <!-- 娣诲姞鎴栦慨鏀逛綋妫�椤圭洰瀵硅瘽妗� -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :before-close="handleClose">
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
+    <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 v-model="form.proParentId" :options="projectOptions" :normalizer="normalizer" :show-count="true"
-            placeholder="閫夋嫨涓婚」鍚嶇О" style="width: 200px" @select="obtain" />
+          <treeselect
+            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" />
@@ -110,24 +325,62 @@
           <el-input v-model="form.proPrice" placeholder="璇疯緭鍏ラ」鐩环鏍�" />
         </el-form-item>
         <el-form-item label="妫�鏌ョ被鍒�" prop="proCheckType">
-          <el-input v-model="form.proCheckType" placeholder="璇疯緭鍏ユ鏌ョ被鍒�" />
+          <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="proCheckMethod">
-          <el-input v-model="form.proCheckMethod" placeholder="璇疯緭鍏ユ鏌ユ柟寮�" />
+        <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>
         </el-form-item>
-        <el-form-item label="绌鸿吂" prop="isEat">
+        <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>
+        </el-form-item>
+        <!-- <el-form-item label="绌鸿吂" prop="isEat">
           <el-select v-model="form.isEat" 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> -->
         <el-form-item label="鎬у埆" prop="proSex">
-          <el-select v-model="form.proSex" placeholder="璇烽�夋嫨浣撴浜烘�у埆" style="width: 200px">
-            <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">
@@ -135,53 +388,166 @@
         </el-form-item>
 
         <el-form-item label="绉戝鍚嶇О" prop="deptId">
-          <el-select v-model="form.deptId" placeholder="璇烽�夋嫨绉戝鍚嶇О" @change="changeValue" filterable style="width: 205px">
-            <el-option v-for="dict in parentNameList" :key="dict.deptId" :label="dict.deptName" :value="dict.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>
         </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> </el-form-item>
+          <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: 210px" 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> </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> </el-form-item>
-        <el-form-item label="缁撴灉绫诲瀷" prop="resultType">
-          <el-select v-model="form.resultType" placeholder="璇烽�夋嫨缁撴灉绫诲瀷" style="width: 210px" 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="澶囨敞" prop="proRemark">
-          <el-input v-model="form.proRemark" placeholder="璇疯緭鍏ュ娉�" style="width: 510px" />
+          <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>
+        </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>
+        </el-form-item>
+        <el-form-item label="LIS椤圭洰" prop="lisXmmc">
+          <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" />
+            </el-tooltip> -->
+          </span>
 
+          <el-input v-model="form.lisXmmc" placeholder="璇疯緭鍏IS椤圭洰">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="澶囨敞" prop="proRemark">
+          <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>
@@ -190,51 +556,109 @@
         </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>
@@ -245,64 +669,131 @@
     </el-dialog>
 
     <el-dialog title="鏀惰垂椤圭洰" :visible.sync="dialogTableVisible" width="80%">
-
       <div class="app-container">
         <el-row :gutter="24">
           <!--閮ㄩ棬鏁版嵁-->
           <el-col :span="6" :xs="24">
-            <div style="height:560px;overflow-y: scroll;">
+            <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="handleQuery" />
+                <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="handleQuery" />
+                <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-column type="selection"  align="center"  />
-              <el-table-column label="搴忓彿" align="center" prop="newID" 
-               />
-              <el-table-column label="椤圭洰缂栫爜" align="center" prop="xmbm"  />
-              <el-table-column label="椤圭洰鍚嶇О" align="center" prop="xmmc"/>
+            <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" />
+              <el-table-column label="椤圭洰鍚嶇О" align="center" prop="xmmc" />
               <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="querycharge.page"
-                  :limit.sync="querycharge.pageSize" @pagination="getListByXmId" />
+                <pagination
+                  v-show="total > 0"
+                  :total="total"
+                  :page.sync="queryParam.page"
+                  :limit.sync="queryParam.pageSize"
+                  @pagination="getListByXmId"
+                />
               </div>
             </div>
           </el-col>
@@ -314,17 +805,23 @@
         <el-button type="primary" @click="submit">纭� 瀹�</el-button>
       </div>
     </el-dialog>
+    <Packagese ref="aaa" @add="handleChanges" />
   </div>
 </template>
 
 <script>
+import Packagese from "@/components/Packagese";
 import {
   getProject,
   delProject,
   addProject,
   updateProject,
   ProjectTree,
+  getlist,
   deptTree,
+  deptTree111,
+  getAllChildListById,
+  getInfoByProId,
 } from "@/api/hosp/project";
 import { listDept } from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
@@ -339,15 +836,37 @@
   addSfxm,
   updateSfxm,
   gettreeList,
-  getListByXmId
+  getListByXmId,
 } from "@/api/system/sfxm";
 
 export default {
   name: "Project",
-  dicts: ["sys_normal_disable", "dict_personnel_type", "sys_user_sex", "tj_result_type", "dis_sampling_tab", "sys_dict_specimen", "sys_dict_position", "tj_result_type", "sys_yes_no"],
-  components: { Treeselect, IconSelect },
+  dicts: [
+    "sys_normal_disable",
+    "dict_personnel_type",
+    "sys_user_sex",
+    "tj_result_type",
+    "dis_sampling_tab",
+    "sys_dict_specimen",
+    "sys_dict_position",
+    "tj_result_type",
+    "sys_yes_no",
+  ],
+  components: { Treeselect, IconSelect, Packagese },
   data() {
+    let checkPhoneNum = (rule, value, callback) => {
+      let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/);
+      if (value == "" && value == undefined && !value) {
+        return callback("");
+      } else if (value != undefined && value != "") {
+        return callback();
+      } else if (!patter.test(value)) {
+        return callback("");
+      }
+    };
     return {
+      xiugais: true,
+      xiugaiList: [],
       // 閮ㄩ棬鏍戦�夐」
       deptOptions: undefined,
       dialogTableVisible: false,
@@ -413,10 +932,11 @@
         proEngName: null,
         checkType: null,
         deptId: undefined,
+        proId: undefined,
       },
       querycharge: {
         pageNum: 1,
-        pageSize: 50,
+        pageSize: 10,
         xmmc: null,
         pym: null,
       },
@@ -426,27 +946,32 @@
         id: null,
       },
       // 琛ㄥ崟鍙傛暟
-      form: {},
+      form: {
+        needReport: "Y",
+        proName: "",
+        proPrice: "",
+        sfxmId: "",
+        lisXmbm: "",
+        lisXmmc: "",
+      },
       // 琛ㄥ崟鏍¢獙
       rules: {
         createTime: [
-          { required: true, message: "鍒涘缓鏃堕棿涓嶈兘涓虹┖", trigger: "blur" },
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
         ],
         updateTime: [
-          { required: true, message: "淇敼鏃堕棿涓嶈兘涓虹┖", trigger: "blur" },
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
         ],
         deleted: [
-          { required: true, message: "鍒犻櫎鏍囪涓嶈兘涓虹┖", trigger: "blur" },
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
         ],
         proName: [
-          { required: true, message: "椤圭洰鍚嶇О涓嶈兘涓虹┖", trigger: "blur" },
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
         ],
         proPrice: [
-          { required: true, message: "椤圭洰浠锋牸涓嶈兘涓虹┖", trigger: "blur" },
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
         ],
-        deptId: [
-          { required: true, message: "绉戝鍚嶇О涓嶈兘涓虹┖", trigger: "blur" },
-        ],
+        deptId: [{ required: true, validator: checkPhoneNum, trigger: "blur" }],
         // proStandard: [
         //   { required: true, message: "椤圭洰鏍囧噯鍊间笉鑳戒负绌�", trigger: "blur" },
         // ],
@@ -462,7 +987,7 @@
       if (newVal) {
         this.$nextTick(() => {
           document
-            .querySelector('.el-tree-node__children .el-tree-node__content')
+            .querySelector(".el-tree-node__children .el-tree-node__content")
             .click();
         });
       }
@@ -476,11 +1001,13 @@
         this.$nextTick(() => {
           // document.getElementById("changtree").click();;
           document
-            .querySelector('#changtree .el-tree-node__children .el-tree-node.is-focusable .el-tree-node__content')
+            .querySelector(
+              "#changtree .el-tree-node__children .el-tree-node.is-focusable .el-tree-node__content"
+            )
             .click();
         });
       }
-    }
+    },
   },
 
   created() {
@@ -489,9 +1016,23 @@
     this.getDeptTree();
   },
   methods: {
+    handleQuerys() {
+      this.$refs.aaa.open = true;
+      this.$refs.aaa.getAllList();
+      this.$refs.aaa.title = "鏁版嵁瀛楀吀";
+    },
+    handleChanges(param1) {
+      // if(this.form.pacCode == "涓嶈"){
+      //   this.form.cusIdcard = param1[0].xh;
+      // }else{
+      //   this.form.cusIdcard = param1[0].pacCode;
+      // }
 
+      this.form.lisXmbm = param1[0].pacCode;
+      this.form.lisXmmc = param1[0].pacName;
+    },
     //鏄惁鏄剧ず閫変腑鐨勫��
-    display(value) { },
+    display(value) {},
     /** 鏌ヨ浣撴椤圭洰鍒楄〃 */
     getList() {
       // this.loading = true;
@@ -507,9 +1048,11 @@
         proName: this.queryParams.proName,
         checkType: this.queryParams.checkType,
         deptId: this.queryParams.deptId,
+        proId: this.queryParams.proId,
       };
-      ProjectTree(data).then((response) => {
-        this.projectList = this.handleTree(response.data.list, "proId");
+      getAllChildListById(data).then((response) => {
+        // this.projectList = this.handleTree(response.data.list, "proId");
+        this.projectList = response.data.list;
         this.loading = false;
       });
     },
@@ -523,39 +1066,73 @@
     },
 
     /** 鏂板鎸夐挳鎿嶄綔 */
-    handleAdd() {
-      this.reset();
-      this.getData();
-      // if (row != null && row.proId) {
-      //   this.form.proParentId = row.proId;
-      // } else {
-      //   this.form.proParentId = 0;
-      // }
-      this.open = true;
+    handleAdd(row) {
+      // this.reset();
+      this.loading = true;
+      this.form.proPrice = 0.0;
+      this.form.proName = "";
+      this.form.proId = null;
+      //  ProjectTree
+      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 (row) {
+            this.form.proParentId = row.proId;
+            this.open = true;
+          } else {
+            this.open = true;
+          }
+        }
+      });
+     
       this.title = "浣撴椤圭洰淇℃伅缁存姢";
-      this.form.deptId = this.queryParams.deptId
-      if (this.key = "Y") {
+      if(this.queryParams.deptId){
+        this.form.deptId = this.queryParams.deptId;
+      }else{
+        this.form.deptId = null
+      }
+      
+      console.log(this.form.deptId)
+      // this.form.proId = this.queryParams.proId;
+      this.form.proCheckMethod = "N";
+
+      if ((this.key = "Y")) {
         gettreeList().then((response) => {
           this.deptOptionstree = response.data;
-          this.chargeId.push(this.deptOptionstree[0].id)
         });
       }
     },
 
     // 鎵撳紑input寮规
     getDetailed() {
-      if (this.form.proParentId) {
+      if (this.selectList) {
         if (this.selectList.proName === "涓荤被鐩�") {
           this.dialogTableVisible = false;
         } else {
           this.dialogTableVisible = true;
-          this.getlistSfxm()
+          this.$nextTick(() => {
+            this.chargeId.push(this.deptOptionstree[0].id);
+          });
+          this.getlistSfxm();
         }
-      }else{
+      } else if (this.form.proParentId) {
+        if (this.form.proParentId != 0) {
+          this.dialogTableVisible = true;
+          this.$nextTick(() => {
+            this.chargeId.push(this.deptOptionstree[0].id);
+          });
+          this.getlistSfxm();
+        } else if (this.form.proParentId == 0) {
+          this.dialogTableVisible = false;
+        }
+      } else {
         this.$message.error("璇烽�夋嫨涓婚」鍚嶇О");
       }
-
-
     },
 
     obtain(vals) {
@@ -572,11 +1149,14 @@
     },
     getlistSfxm() {
       this.loading = true;
-      this.List = true
+      this.List = true;
       listSfxm(this.querycharge).then((response) => {
         this.sfxmList = response.rows;
         response.rows.forEach((item, index) => {
-          item.newID = (this.querycharge.pageNum - 1) * this.querycharge.pageSize + index + 1;
+          item.newID =
+            (this.querycharge.pageNum - 1) * this.querycharge.pageSize +
+            index +
+            1;
         });
         this.total = response.total;
         this.loading = false;
@@ -585,14 +1165,14 @@
     // input寮规鎼滅储
     handlecharge() {
       this.querycharge.pageNum = 1;
-      this.List = true
-      this.getlistSfxm()
+      this.List = true;
+      this.getlistSfxm();
     },
 
     handleNodecharge(data) {
       this.queryParam.id = data.id;
-      this.List = false
-      this.getListByXmId()
+      this.List = false;
+      this.getListByXmId();
     },
 
     getListByXmId() {
@@ -600,7 +1180,8 @@
       getListByXmId(this.queryParam).then((response) => {
         this.sfxmList = response.data.date;
         response.data.date.forEach((item, index) => {
-          item.newID = (this.queryParam.page - 1) * this.queryParam.pageSize + index + 1;
+          item.newID =
+            (this.queryParam.page - 1) * this.queryParam.pageSize + index + 1;
         });
         this.total = response.data.total;
         this.loading = false;
@@ -621,11 +1202,11 @@
     // // 鏌ヨ浣撴椤圭洰鍒楄〃(鏍戝舰缁撴瀯)
     getData() {
       /** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
-      ProjectTree().then((response) => {
+      getAllChildListById().then((response) => {
         this.projectOptions = [];
         const project = { proId: 0, proName: "涓荤被鐩�", children: [] };
         project.children = this.handleTree(response.data.list, "proId");
-        this.key = response.data.key
+        this.key = response.data.key;
         // if (this.key == "Y") {
         //   this.key = response.data.key
         // } else if (response.data.key == "N") {
@@ -637,16 +1218,16 @@
     /** 鏌ヨ閮ㄩ棬鍒楄〃 */
     getDeptList() {
       listDept(this.queryParams).then((response) => {
-        console.log(response)
         this.parentNameList = response.data;
+        console.log(this.parentNameList)
         this.deptList = this.handleTree(response.data, "proId");
       });
     },
     /** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
     getDeptTree() {
-      deptTree().then((response) => {
+      deptTree111().then((response) => {
         this.deptOptions = response.data;
-        this.treeId.push(this.deptOptions[0].id)
+        this.treeId.push(this.deptOptions[0].id);
       });
     },
 
@@ -662,28 +1243,46 @@
     },
     // 鑺傜偣鍗曞嚮浜嬩欢
     handleNodeClick(date) {
+      if (date.children) {
+        this.xiugais = true;
+      } else {
+        this.xiugais = false;
+      }
+      let proId = date.id;
+      getInfoByProId(proId).then((response) => {
+        this.xiugaiList = response.data;
+      });
       this.id = date.id;
-      this.queryParams.deptId = date.id;
+      this.queryParams.proId = date.id;
       let data = {
-        deptId: this.queryParams.deptId,
+        proId: this.queryParams.proId,
+        proName: this.queryParams.proNamez,
       };
-      ProjectTree(data).then((response) => {
-        this.projectList = this.handleTree(response.data.list, "proId");
-        this.ListId.push(this.projectList[0].proId)
-        this.key = response.data.key
-        // if (this.key == "Y") {
-        //   this.key = response.data.key
-        // } else if (response.data.key == "N") {
-        //   this.key = response.data.key
-        // }
-        this.loading = false;
+      this.loading = true;
+      getAllChildListById(data).then((response) => {
+        if (response.code == 200) {
+          if (response.data.list.length >= 1) {
+            this.projectList = this.handleTree(response.data.list, "proId");
+            this.ListId.push(this.projectList[0].proId);
+            this.key = response.data.key;
+          } else {
+            this.projectList = [];
+          }
+
+          // if (this.key == "Y") {
+          //   this.key = response.data.key
+          // } else if (response.data.key == "N") {
+          //   this.key = response.data.key
+          // }
+          this.loading = false;
+        }
       });
     },
     selectSingleRow({ row, rowIndex }) {
       if (rowIndex === 1) {
-        return 'warning-row';
+        return "warning-row";
       }
-      return '';
+      return "";
     },
 
     /** 灞曞紑/鎶樺彔鎿嶄綔 */
@@ -700,18 +1299,18 @@
       this.open = false;
       this.queryParam.id = this.id;
       let data = {
-        deptId: this.queryParams.deptId,
+        proId: this.queryParams.proId,
       };
-      ProjectTree(data).then((response) => {
-        this.projectList = this.handleTree(response.data.list, "proId");
-        this.ListId.push(this.projectList[0].proId)
-        this.key = response.data.key
+      getAllChildListById(data).then((response) => {
+        // this.projectList = this.handleTree(response.data.list, "proId");
+        // this.ListId.push(this.projectList[0].proId);
+        // this.key = response.data.key;
         this.loading = false;
       });
     },
 
     handleClose() {
-      this.cancel()
+      this.cancel();
     },
     // 琛ㄥ崟閲嶇疆
     reset() {
@@ -736,7 +1335,7 @@
         deptName: null,
         consumablesList: [],
         tjStandardList: [],
-        proStatus: "鍚敤",
+        proStatus: "0",
       };
       this.resetForm("form");
     },
@@ -748,14 +1347,49 @@
     /** 閲嶇疆鎸夐挳鎿嶄綔 */
     resetQuery() {
       this.resetForm("queryForm");
-      this.queryParams.deptId = undefined;
+      this.queryParams.proId = undefined;
       this.$refs.tree.setCurrentKey(null);
       this.handleQuery();
     },
 
+    flexColumnWidth(column) {
+      if (!column) {
+        return;
+      }
+      let maxlength = 160; //鍦ㄦ澶勮缃粯璁ゅ搴�
+      if (column == "rwdtypeName") {
+        //鍦ㄦ澶勪负浜嗕繚璇佽〃澶翠笉鎹㈣锛屽彲浠ユ牴鎹〃澶村悕绉伴暱搴﹁缃粯璁ゅ搴�
+        // column1 灏辨槸瀵瑰簲琛ㄦ牸涓殑prop灞炴�у�硷紝姣斿涓婇潰鐨� rwdtypeName
+        maxlength = 160;
+      }
+      for (let i = 0; i < this.projectList.length; i++) {
+        if (this.projectList[i][column]) {
+          let now_temp = this.projectList[i][column] + "";
+          let flexWidth = 0;
+          for (const char of now_temp) {
+            if ((char >= "A" && char <= "Z") || (char >= "a" && char <= "z")) {
+              //鑻辨枃瀛楁瘝 8 鍍忕礌
+              flexWidth += 8;
+            } else if (char >= "\u4e00" && char <= "\u9fa5") {
+              //涓枃鏂囧瓧 15 鍍忕礌
+              flexWidth += 15;
+            } else {
+              //鍏朵粬瀛楃 10 鍍忕礌
+              flexWidth += 10;
+            }
+          }
+          if (flexWidth > maxlength) {
+            maxlength = flexWidth;
+          }
+        }
+      }
+      //el-table涓� cell 鏈夊乏鍙崇殑 padding 涓� 10 鍍忕礌
+      return maxlength + 20 + "px";
+    },
+
     // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {
-      this.ChangeList = selection
+      this.ChangeList = selection;
       this.ids = selection.map((item) => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
@@ -764,9 +1398,6 @@
         this.$refs.tb.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
       }
     },
-
-
-
 
     // 鏂板琛�
     addmembers() {
@@ -835,6 +1466,10 @@
         this.form.tjStandardList.splice(index, 1);
       }
     },
+    handleUpdate1() {
+      this.open = true;
+      this.form = this.xiugaiList;
+    },
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleUpdate(row) {
       this.reset();
@@ -843,11 +1478,14 @@
       const proId = row.proId || this.ids;
       getProject(proId).then((response) => {
         this.form = response.data;
-        if (this.form.proStatus === 0) {
-          this.form.proStatus = "鍚敤";
+        if (this.form.proParentId === "0") {
+          this.showPrise = true;
+          this.showRentPrise = false;
         } else {
-          this.form.proStatus = "鍋滅敤";
+          this.showPrise = false;
+          this.showRentPrise = true;
         }
+        this.form.deptId = Number(this.form.deptId);
         if (this.form.proStandard === 0) {
           this.showPrise = true;
           this.showRentPrise = false;
@@ -855,6 +1493,7 @@
           this.showPrise = false;
           this.showRentPrise = true;
         }
+        this.form.proStatus = this.form.proStatus.toString();
         this.form.consumablesList = response.data.consumablesList;
         this.form.tjStandardList = response.data.tjStandardList;
         if (this.form.tjStandardList != null) {
@@ -895,6 +1534,7 @@
       });
     },
     changeValue(value) {
+      console.log(value)
       // this.form.deptName = value;
       this.form.deptId = value;
     },
@@ -962,14 +1602,11 @@
                   }
                 });
               }
-              if (this.form.proStatus === "鍚敤") {
-                this.form.proStatus = 0;
-              } else {
-                this.form.proStatus = 1;
-              }
+              this.form.lisXmbm = this.form.lisXmbm;
               updateProject(this.form).then((response) => {
                 this.$modal.msgSuccess("淇敼鎴愬姛");
-                this.cancel()
+                this.cancel();
+                this.getList();
               });
             } else {
               if (this.form.proParentId === 0) {
@@ -982,21 +1619,18 @@
                 this.$message.error("璇峰~鍐欑埗椤瑰悕绉版垨绉戝鍚嶇О");
                 this.open = true;
               } else {
-                if (this.form.proStatus === "鍚敤") {
-                  this.form.proStatus = 0;
-                } else {
-                  this.form.proStatus = 1;
-                }
+                this.form.lisXmbm = this.form.lisXmbm;
                 addProject(this.form).then((response) => {
                   this.$modal.msgSuccess("鏂板鎴愬姛");
-                  this.cancel()
+                  this.cancel();
+                  this.getList();
                 });
               }
             }
           }
         });
       } else if (this.key == "Y") {
-        this.form.sfxmId = this.sfxmId
+        this.form.sfxmId = this.sfxmId;
         this.$refs["form"].validate((valid) => {
           if (valid) {
             if (this.form.proId != null) {
@@ -1032,14 +1666,11 @@
                   }
                 });
               }
-              if (this.form.proStatus === "鍚敤") {
-                this.form.proStatus = 0;
-              } else {
-                this.form.proStatus = 1;
-              }
+              this.form.lisXmbm = this.form.lisXmbm;
               updateProject(this.form).then((response) => {
                 this.$modal.msgSuccess("淇敼鎴愬姛");
-                this.cancel()
+                this.cancel();
+                this.getList();
               });
             } else {
               if (this.form.proParentId === 0) {
@@ -1052,31 +1683,27 @@
                 this.$message.error("璇峰~鍐欑埗椤瑰悕绉版垨绉戝鍚嶇О");
                 this.open = true;
               } else {
-                if (this.form.proStatus === "鍚敤") {
-                  this.form.proStatus = 0;
-                } else {
-                  this.form.proStatus = 1;
-                }
+                this.form.lisXmbm = this.form.lisXmbm;
                 addProject(this.form).then((response) => {
                   this.$modal.msgSuccess("鏂板鎴愬姛");
-                  this.cancel()
+                  this.cancel();
+                  this.getList();
                 });
               }
             }
           }
         });
       }
-
     },
 
     // 鏀惰垂椤圭洰纭
     submit() {
-      this.ChangeList.forEach(item => {
-        this.form.proName = item.xmmc
-        this.form.proPrice = item.ckdj
-        this.sfxmId = parseInt(item.id)
-      })
-      this.dialogTableVisible = false
+      this.ChangeList.forEach((item) => {
+        this.form.proName = item.xmmc;
+        this.form.proPrice = item.ckdj;
+        this.sfxmId = parseInt(item.id);
+      });
+      this.dialogTableVisible = false;
     },
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
@@ -1096,7 +1723,7 @@
           this.getList();
           this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
         })
-        .catch(() => { });
+        .catch(() => {});
     },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
@@ -1109,8 +1736,7 @@
       );
     },
   },
-}
-
+};
 </script>
 <style scoped>
 .el-table__header-wrapper .el-checkbox {
@@ -1136,8 +1762,16 @@
   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
+  color: #333 !important;
+}
+.el-scrollbar__bar.is-vertical {
+  opacity: 1;
+  padding-right: 5px;
+  width: 7px;
+}
+.el-scrollbar__wrap {
+  overflow-x: hidden;
 }
 </style>

--
Gitblit v1.8.0