From c7b33db117fd2893d7d1c93bf5d46e87d33e44d0 Mon Sep 17 00:00:00 2001 From: lkk <364857242@qq.com> Date: 星期一, 16 十二月 2024 16:08:51 +0800 Subject: [PATCH] 初审结果查询 --- src/views/hosp/order/index.vue | 1091 +++++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 817 insertions(+), 274 deletions(-) diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue index 9cdd148..940c2db 100644 --- a/src/views/hosp/order/index.vue +++ b/src/views/hosp/order/index.vue @@ -13,7 +13,7 @@ ref="inputName" v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" - style="width: 120px" + style="width: 150px" clearable @keyup.enter.native="handleQuery" /> @@ -23,7 +23,7 @@ ref="inputName" v-model="queryParams.tjNum" placeholder="璇疯緭鍏ヤ綋妫�鍙�" - style="width: 170px" + style="width: 150px" clearable @keyup.enter.native="handleQuery" @blur="hb" @@ -34,12 +34,60 @@ ref="inputName" v-model="queryParams.xmmc" placeholder="璇疯緭鍏ヤ綋妫�椤圭洰" - style="width: 120px" + style="width: 150px" clearable @keyup.enter.native="handleQuery" /> </el-form-item> - <el-form-item label="鐧昏鏃堕棿" prop="createTimeList"> + <el-form-item + label="鍗曚綅鍚嶇О" + prop="tjCompName" + style="margin-left: 20px;margin-right: 500px;" + > + <el-select + :remote-method="getRemoteData" + v-model="queryParams.tjCompName" + value-key="drugManufacturerId" + style="width: 200px" + remote + filterable + placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" + clearable + @change="searchSelect" + + > + <el-option + v-for="dict in CompanyList" + :key="dict.drugManufacturerId" + :label="dict.cnName" + :value="dict" + /> + </el-select> + </el-form-item> + <el-form-item + label="鐘舵��" + prop="zt" + > + <el-select + :remote-method="getRemoteData" + v-model="queryParams.zt" + style="width: 150px" + remote + filterable + placeholder="璇烽�夋嫨鐘舵��" + clearable + @change="searchSelect" + + > + <el-option + v-for="item in ztList" + :key="item.id" + :label="item.name" + :value="item.id" + /> + </el-select> + </el-form-item> + <el-form-item label="鐧昏鏃堕棿" prop="createTimeList" style="margin-right: 107px;" > <el-date-picker v-model="createTimeList" type="datetimerange" @@ -94,7 +142,20 @@ > </el-form-item> </el-form> - + <!-- <div class="timeline-wrapper"> + <el-timeline :reverse="false" class="horizontal-timeline"> + <el-timeline-item + v-for="(item, index) in timelineData" + :key="index" + :timestamp="item.timestamp" + :position="index % 2 === 0 ? 'left' : 'right'"> + <el-card :body-style="{ padding: '20px' }"> + <h3>{{ item.title }}</h3> + <p>{{ item.description }}</p> + </el-card> + </el-timeline-item> + </el-timeline> + </div> --> <el-row :gutter="10" class="mb8"> <el-col :span="1.5"> <el-button @@ -155,6 +216,16 @@ :disabled="single" v-hasPermi="['hosp:order:export']" >璁㈠崟鏄庣粏</el-button + > + </el-col> + <el-col :span="1.5"> + <el-button + type="primary" + size="mini" + @click="budadzd" + :disabled="single" + v-hasPermi="['hosp:order:export']" + >鎵撳嵃琛ュ綍鍗�</el-button > </el-col> <right-toolbar @@ -236,8 +307,12 @@ :show-overflow-tooltip="true" > <template slot-scope="scope"> - <span v-if="scope.row.tjType == '2'">涓汉</span> - <span v-if="scope.row.tjType == '1'">鍥㈤槦</span> + <dict-tag + :options="dict.type.dict_team" + :value="scope.row.tjType" + /> + <!-- <span v-if="scope.row.tjType == '2'">涓汉</span> + <span v-if="scope.row.tjType == '1'">鍥㈤槦</span> --> </template> </el-table-column> <el-table-column @@ -254,6 +329,18 @@ :show-overflow-tooltip="true" width="160px" /> + <el-table-column + label="鍗曚綅鍚嶇О" + align="center" + prop="dictCompName" + :show-overflow-tooltip="true" + /> + <el-table-column + label="鐘舵��" + align="center" + prop="zt" + :show-overflow-tooltip="true" + /> <!-- <el-table-column label="娴佹按鍙�" align="center" prop="tjSerialNumber" /> --> <el-table-column label="鎵�閫夊椁�" @@ -262,6 +349,18 @@ :formatter="driver" :show-overflow-tooltip="true" /> + <el-table-column + label="瀵艰瘖鎵撳嵃娆℃暟" + align="center" + prop="dycs" + width="110px" + :formatter="driver" + :show-overflow-tooltip="true" + > + <template slot-scope="scope"> + {{ scope.row.dycs === null ? 0 : scope.row.dycs }} + </template> + </el-table-column> <el-table-column label="鐧昏鏃堕棿" align="center" @@ -303,19 +402,14 @@ </el-table-column> <!-- <el-table-column label="鍒涘缓浜�" align="center" prop="createBy" /> --> <!-- <el-table-column label="鏇存柊浜�" align="center" prop="updateBy" /> --> - <el-table-column + <!-- <el-table-column label="鍗曚綅宸ュ彿" align="center" prop="firmWorkId" width="100px" :show-overflow-tooltip="true" - /> - <el-table-column - label="鍗曚綅鍚嶇О" - align="center" - prop="dictCompName" - :show-overflow-tooltip="true" - /> + /> --> + <!-- <el-table-column label="閮ㄩ棬鍚�" align="center" prop="firmDeptName" /> --> <!-- <el-table-column label="瀹㈡埛鐓х墖" align="center" prop="photo" /> --> @@ -571,7 +665,7 @@ </el-table-column> </el-table> - <h3 style="font-weight: 600">鍚堣锛歿{ marryalls }}鍏�</h3> + <!-- <h3 style="font-weight: 600">鍚堣锛歿{ marryalls }}鍏�</h3> --> </div> </el-col> </el-row> @@ -696,10 +790,14 @@ <template> <el-form :model="form"> <el-form-item label="浣撴绫诲瀷" prop="tjType"> - <el-radio-group v-model="form.tjType"> + <div class="type"> + {{ { 1: "鍥㈤槦", 2: "涓汉", 3: "鍥綋绁�" }[form.tjType] }} + </div> + + <!-- <el-radio-group v-model="form.tjType"> <el-radio :label="1">鍥㈤槦</el-radio> <el-radio :label="2">涓汉</el-radio> - </el-radio-group> + </el-radio-group> --> </el-form-item> </el-form> </template> @@ -734,6 +832,7 @@ style="width: 120px" v-model="payType" placeholder="璇烽�夋嫨浠樻绫诲瀷" + @change="onPayTypeChange" > <el-option v-for="dict in dict.type.dict_pay_type" @@ -770,17 +869,85 @@ append-to-body :close-on-click-modal="false" > - <el-tabs - type="border-card" - style="height: 640px; margin: 0 10px; width: 100%" - @tab-click="handleClick" - v-model="activeNames" - > - <el-tab-pane label="缁勫悎" name="first"> - <div class="tab8"> - <el-row :gutter="20" style="width: 100%"> - <el-col :span="6"> - <div + <div class="box"> + <div class="box1"> + <div + style="text-align: center; margin-bottom: 10px; margin-top: 10px" + > + 椤圭洰閫夋嫨 + </div> + <el-tabs + type="border-card" + style="height: 560px; margin: 0 10px; width: 100%" + @tab-click="handleClick" + v-model="activeNames" + > + <el-tab-pane label="缁勫悎" name="first"> + <div class="tab8"> + <el-row :gutter="20" style="width: 100%"> + <el-col :span="22"> + <!-- <div + style=" + text-align: center; + margin-bottom: 10px; + margin-top: 10px; + " + > + 椤圭洰鍒楄〃 + </div> --> + <el-input + placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" + v-model="filterage" + > + </el-input> + <div class="tab3"> + <el-tree + class="filter-tree" + v-loading="loading" + :data="packageList" + :props="defaultProp" + show-checkbox + node-key="id" + @check="handlepackage" + :default-checked-keys="checkedkeys" + :filter-node-method="filterpackage" + ref="treas" + :render-content="renderContents" + > + </el-tree> + </div> + </el-col> + <!-- <el-col :span="11"> + <div + style=" + text-align: center; + margin-bottom: 10px; + margin-top: 10px; + " + > + 鏄庣粏椤圭洰鍒楄〃 + </div> + <div class="tab3"> + <el-tree + class="filter-tree" + v-loading="loading" + :data="packagedataList" + node-key="proId" + :props="defaultpackProps" + :render-content="renderContent" + > + </el-tree> + </div> + </el-col> --> + <!-- <el-col :span="11"> </el-col> --> + </el-row> + </div> + </el-tab-pane> + <el-tab-pane label="鍗曢」" name="third"> + <div class="tab8"> + <el-row type="flex" class="row-bg" justify="space-around"> + <el-col :span="22"> + <!-- <div style=" text-align: center; margin-bottom: 10px; @@ -788,27 +955,30 @@ " > 椤圭洰鍒楄〃 - </div> - <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterage"> - </el-input> - <div class="tab3"> - <el-tree - class="filter-tree" - v-loading="loading" - :data="packageList" - :props="defaultProp" - show-checkbox - node-key="id" - @check="handlepackage" - :default-checked-keys="checkedkeys" - :filter-node-method="filterpackage" - ref="treas" - :render-content="renderContents" - > - </el-tree> - </div> - </el-col> - <el-col :span="6"> + </div> --> + <el-input + placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" + v-model="filterText" + > + </el-input> + <div class="tab3"> + <el-tree + class="filter-tree" + v-loading="loading" + :data="Treedata" + :props="defaultProps" + show-checkbox + node-key="proId" + @check="handleCurrentChecked" + :default-checked-keys="checkedkey" + :filter-node-method="filterNode" + ref="tree" + :render-content="renderContent" + > + </el-tree> + </div> + </el-col> + <!-- <el-col :span="11"> <div style=" text-align: center; @@ -819,130 +989,24 @@ 鏄庣粏椤圭洰鍒楄〃 </div> <div class="tab3"> - <el-tree - class="filter-tree" - v-loading="loading" - :data="packagedataList" - node-key="proId" - :props="defaultpackProps" - :render-content="renderContent" - > - </el-tree> - </div> - </el-col> - <el-col :span="11"> - <div class="grid-content bg-purple"> - <div - style=" - text-align: center; - margin-bottom: 10px; - margin-top: 10px; - " - > - 宸查�夐」鐩垪琛� + <div class="outside1"> + <el-tree + class="filter-tree" + v-loading="loading" + :data="TreedataList" + node-key="proId" + :props="defaultProps" + :filter-node-method="filterNode" + show-checkbox + @check-change="handleCurrentChecked1" + :default-checked-keys="checkedListkey" + :render-content="renderContent" + > + </el-tree> </div> - <el-table - :data="Datalists" - border - style="width: 100%" - height="400" - :span-method="objectspanmethod" - > - <el-table-column prop="propinName" label="妫�鏌ラ」鐩�"> - </el-table-column> - <el-table-column - prop="proName" - label="鏄庣粏椤圭洰" - width="260px" - > - </el-table-column> - <el-table-column prop="proPrice" label="鍘熶环" width="56px"> - </el-table-column> - - <el-table-column - label="鎿嶄綔" - align="center" - class-name="small-padding fixed-width" - width="50px" - > - <template slot-scope="scope"> - <el-button - size="mini" - type="text" - icon="el-icon-delete" - @click="handleDel(scope.row)" - title="鍒犻櫎" - ></el-button> - </template> - </el-table-column> - </el-table> - - <h3 style="font-weight: 600">鍚堣锛歿{ marryalls }}鍏�</h3> </div> - </el-col> - </el-row> - </div> - </el-tab-pane> - <el-tab-pane label="鍗曢」" name="third"> - <el-row type="flex" class="row-bg" justify="space-around"> - <el-col :span="6"> - <div - style=" - text-align: center; - margin-bottom: 10px; - margin-top: 10px; - " - > - 椤圭洰鍒楄〃 - </div> - <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText"> - </el-input> - <div class="tab3"> - <el-tree - class="filter-tree" - v-loading="loading" - :data="Treedata" - :props="defaultProps" - show-checkbox - node-key="proId" - @check="handleCurrentChecked" - :default-checked-keys="checkedkey" - :filter-node-method="filterNode" - ref="tree" - :render-content="renderContent" - > - </el-tree> - </div> - </el-col> - <el-col :span="5"> - <div - style=" - text-align: center; - margin-bottom: 10px; - margin-top: 10px; - " - > - 鏄庣粏椤圭洰鍒楄〃 - </div> - <div class="tab3"> - <div class="outside1"> - <el-tree - class="filter-tree" - v-loading="loading" - :data="TreedataList" - node-key="proId" - :props="defaultProps" - :filter-node-method="filterNode" - show-checkbox - @check-change="handleCurrentChecked1" - :default-checked-keys="checkedListkey" - :render-content="renderContent" - > - </el-tree> - </div> - </div> - </el-col> - <el-col :span="11"> + </el-col> --> + <!-- <el-col :span="11"> <div class="grid-content bg-purple"> <div style=" @@ -989,8 +1053,8 @@ ></el-button> </template> </el-table-column> - </el-table> - <!-- <el-collapse v-model="activeName" accordion v-if="list1"> + </el-table> --> + <!-- <el-collapse v-model="activeName" accordion v-if="list1"> <div> <el-collapse-item title="璇烽�夋嫨椤圭洰"> <el-table @@ -1012,77 +1076,130 @@ </el-collapse-item> </div> </el-collapse> --> - - <template> - <el-form :model="form"> - <el-form-item label="浣撴绫诲瀷" prop="tjType"> - <el-radio-group v-model="form.tjType"> - <el-radio :label="1">鍥㈤槦</el-radio> - <el-radio :label="2">涓汉</el-radio> - </el-radio-group> - </el-form-item> - </el-form> - </template> - - <div class="outside"> - <el-form :inline="true" class="outside1"> - <el-form-item label="鍘熶环"> - <el-input - placeholder="鍘熶环" - :value="TotalPrice1" - disabled - style="width: 90px" - ></el-input> - </el-form-item> - <el-form-item label="鎶樻墸璁惧畾"> - <el-input - style="width: 90px" - type="number" - v-model="discount" - :value="discount" - ></el-input> - </el-form-item> - <el-form-item label="搴斾粯閲戦"> - <el-input - placeholder="搴斾粯閲戦" - :value="TotalPrice1 * (discount / 10)" - style="width: 90px" - ></el-input> - </el-form-item> - <el-form-item label="浠樻绫诲瀷" prop="payType"> - <el-select - style="width: 120px" - v-model="payType" - placeholder="璇烽�夋嫨浠樻绫诲瀷" - > - <el-option - v-for="dict in dict.type.dict_pay_type" - :key="dict.value" - :label="dict.label" - :value="dict.value" - ></el-option> - </el-select> - </el-form-item> - <el-form-item> - <el-button - type="primary" - @click="submitPrice1" - :disabled="confirm" - style="margin-top: 34px" - >鎻愪氦</el-button - > - </el-form-item> - </el-form> - </div> + <!-- </div> + </el-col> --> + </el-row> </div> - </el-col> - </el-row> - </el-tab-pane> - </el-tabs> + </el-tab-pane> + </el-tabs> + </div> + + <div class="grid-content bg-purple"> + <div style="text-align: center; margin-bottom: 10px; margin-top: 9px"> + 宸查�夐」鐩垪琛� + </div> + <el-table + :data="DataList3" + border + style="width: 100%" + height="560" + :span-method="objectspanmethod" + > + <el-table-column prop="propinName" label="妫�鏌ラ」鐩�"> + </el-table-column> + <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px"> + </el-table-column> + <el-table-column prop="proPrice" label="鍘熶环" width="56px"> + </el-table-column> + + <el-table-column + label="鎿嶄綔" + align="center" + class-name="small-padding fixed-width" + width="50px" + > + <template slot-scope="scope"> + <el-button + size="mini" + type="text" + icon="el-icon-delete" + @click="handleDel(scope.row)" + title="鍒犻櫎" + ></el-button> + </template> + </el-table-column> + </el-table> + + <!-- <h3 style="font-weight: 600">鍚堣锛歿{ marryalls }}鍏�</h3> --> + </div> + </div> + + <div class="heji"> + <div class="o"> + <el-form + :model="form" + :inline="true" + style="display: flex; align-items: center" + > + <el-form-item label="浣撴绫诲瀷" prop="tjType"> + <div class="type"> + {{ { 1: "鍥㈤槦", 2: "涓汉", 3: "鍥綋绁�" }[form.tjType] }} + </div> + </el-form-item> + </el-form> + </div> + + <div class="outsides"> + <el-form :inline="true" class="outside2" label-width="80px"> + <el-form-item label="鍘熶环" style="display: flex"> + <el-input + placeholder="鍘熶环" + :value="TotalPrice1" + disabled + style="width: 90px" + ></el-input> + </el-form-item> + <el-form-item label="鎶樻墸璁惧畾" style="display: flex"> + <el-input + style="width: 90px" + type="number" + v-model="discount" + :value="discount" + ></el-input> + </el-form-item> + <el-form-item label="搴斾粯閲戦" style="display: flex"> + <el-input + placeholder="搴斾粯閲戦" + :value="TotalPrice1 * (discount / 10)" + style="width: 90px" + ></el-input> + </el-form-item> + <el-form-item label="浠樻绫诲瀷" prop="payType" style="display: flex"> + <el-select + style="width: 120px" + v-model="payType" + placeholder="璇烽�夋嫨浠樻绫诲瀷" + @change="onPayTypeChange" + > + <el-option + v-for="dict in dict.type.dict_pay_type" + :key="dict.value" + :label="dict.label" + :value="dict.value" + ></el-option> + </el-select> + </el-form-item> + <el-form-item style="display: flex"> + <el-button + type="primary" + @click="submitPrice1" + :disabled="confirm" + >鎻愪氦</el-button + > + </el-form-item> + </el-form> + </div> + </div> </el-dialog> <!-- 娣诲姞鎴栦慨鏀逛綋妫�璁板綍瀵硅瘽妗� --> - <el-dialog :title="title" :visible.sync="open" width="950px" append-to-body :close-on-click-modal="false"> + <el-dialog + :title="title" + :visible.sync="open" + width="950px" + append-to-body + :close-on-click-modal="false" + > <el-tabs v-model="activeName1" type="card"> <!-- <el-tab-pane label="璁㈠崟娴佹按" name="first"> <el-table :data="numberList" style="width: 100%"> @@ -1123,7 +1240,7 @@ <el-table :data="huizongList" style="width: 100%" max-height="200"> <el-table-column align="center" - type="index" + type="index" label="搴忓彿" width="50" > @@ -1277,6 +1394,100 @@ <!-- <el-button @click="cancel">鍙� 娑�</el-button> --> </div> </el-dialog> + + <el-dialog + :title="title1" + :visible.sync="budadaozhen" + width="1100px" + style="height: 860px" + append-to-body + :close-on-click-modal="false" + > + <el-row type="flex" class="row-bg" justify="space-around"> + <el-col :span="13"> + <div + style="text-align: center; margin-bottom: 10px; margin-top: 10px" + > + 琛ュ綍鍒楄〃 + </div> + + <div class="tab3"> + <el-table + :data="DataLists" + border + style="width: 100%" + height="400" + @selection-change="handleProjectssChange" + > + <el-table-column type="selection" width="40" align="center" /> + <el-table-column + type="index" + label="搴忓彿" + align="center" + width="49px" + > + </el-table-column> + <el-table-column + prop="blje" + label="琛ュ綍閲戦" + align="center" + width="74px" + > + </el-table-column> + <el-table-column + prop="bldh" + label="琛ュ綍鍗曞彿" + align="center" + width="155px" + > + </el-table-column> + <el-table-column + prop="blsj" + label="琛ュ綍鏃堕棿" + align="center" + width="156px" + > + </el-table-column> + <el-table-column + prop="blrmc" + label="琛ュ綍浜�" + align="center" + width="96px" + > + </el-table-column> + </el-table> + </div> + </el-col> + + <el-col :span="10"> + <div class="grid-content bg-purple"> + <div + style="text-align: center; margin-bottom: 10px; margin-top: 10px" + > + 琛ュ綍椤圭洰 + </div> + <el-table + :data="DataListss" + border + style="width: 100%" + height="400" + :span-method="objectSpanMethod2" + > + <el-table-column prop="propinName" label="妫�鏌ラ」鐩�"> + </el-table-column> + <el-table-column prop="proPrice" label="鍘熶环" width="56px"> + </el-table-column> + <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px"> + </el-table-column> + </el-table> + </div> + </el-col> + </el-row> + <div slot="footer" class="dialog-footer"> + <el-button type="primary" @click="dayin">鎵� 鍗�</el-button> + <!-- <el-button @click="cancel">鍙� 娑�</el-button> --> + </div> + </el-dialog> </div> </template> @@ -1295,25 +1506,49 @@ import moment from "moment"; import { getZhList, getlistByZhId } from "@/api/system/package"; import { getwater } from "@/api/hosp/customer"; +import { getInfo } from "@/api/login"; import ViewPdf from "@/components/ViewPdf"; import { - projectGetList, + shijianzhou, getaddtTransition, getProParentIdDxList, getProSonDxList, } from "@/api/system/tijian"; +import { + SubmitCompany, + getCompany, + queryCompany, + addbatch, +} from "@/api/team/tuanti"; +import { createLogger } from "vuex"; export default { components: { ViewPdf, }, - dicts: ["dict_pay_type"], + dicts: ["dict_pay_type", "dict_team"], name: "Order", data() { return { + ztList: [ + {name:'鏈',id: 0},{name:'鍦ㄦ',id: 1},{name:'宸插畬鎴�',id: 2},{name:'宸插鏍�',id: 3},{name:'鐢熸垚鎶ュ憡',id: 4},{name:'鎶ュ憡鏍告敹',id: 5},{name:'宸插嚭鎶ュ憡',id: 6}, + ], + timelineData: [ + { timestamp: '2024-01-01', title: '鏈', description: 'This is event 1 description' }, + { timestamp: '2024-01-05', title: '鍦ㄦ', description: 'This is event 2 description' }, + { timestamp: '2024-01-10', title: '宸插畬鎴�', description: 'This is event 3 description' }, + { timestamp: '2024-01-15', title: '宸插鏍�', description: 'This is event 4 description' }, + { timestamp: '2024-01-15', title: '鐢熸垚鎶ュ憡', description: 'This is event 4 description' }, + { timestamp: '2024-01-15', title: '鎶ュ憡鏍告敹', description: 'This is event 4 description' }, + { timestamp: '2024-01-15', title: '宸插嚭鎶ュ憡', description: 'This is event 4 description' }, + ], + DataList3: [], + bldhid: "", + budadaozhen: false, huizongList: [], DataLists: [], infoList: [], bldhs: [], + CompanyList: [], filterage: "", activeName1: "second", filterText: "", @@ -1361,14 +1596,18 @@ TreedataList: [], discount: 10, DataList: [], + tjNUms: [], // 濂楅鎻愪氦鎸夐挳 confirm: false, list1: true, activeName: "1", proIds: [], TotalPrice1: 0, + TotalPrice6: 0, + TotalPrice7: 0, numberList: [], dialogVisible: false, + CheckBox: {}, // 閬僵灞� loading: true, // 閫変腑鏁扮粍 @@ -1404,7 +1643,9 @@ tjNum: null, bgbeginTime: null, bgendTime: null, - xmmc:null, + xmmc: null, + tjCompName:'', + dw:null }, startTime: "", startTime1: "", @@ -1447,6 +1688,7 @@ }, }; }, + watch: { filterText(val) { this.$refs.tree.filter(val); @@ -1466,6 +1708,34 @@ }); }, methods: { + // 鎼滅储 + getRemoteData(query) { + if (query) { + let compName = query; + queryCompany(compName).then((response) => { + this.CompanyList = response.data; + this.CompanyList.forEach((item) => { + this.queryParams = item; + }); + }); + } + }, + // 閫夋鏁版嵁 + searchSelect(val) { + this.CheckBox = val; + this.queryParams.dw = this.CheckBox.cnName; + console.log(this.CheckBox,9999); + + }, + onPayTypeChange() { + if (this.payType === "6" && this.form.tjType !== 3) { + this.cannotSelectPayType = true; + this.$message.warning("璇ヤ粯娆剧被鍨嬪湪姝や綋妫�绫诲瀷涓嬩笉鍏佽閫夋嫨锛�"); + this.payType = this.dict.type.dict_pay_type[0]?.value || null; + } else { + this.cannotSelectPayType = false; + } + }, getdate() { getNewDateList().then((res) => { if (res.data) { @@ -1525,6 +1795,47 @@ }, /** 鏌ヨ浣撴璁板綍鍒楄〃 */ getList() { + this.queryParams.compId = this.CheckBox.drugManufacturerId; + if (this.startTime) { + this.queryParams.djbeginTime = this.startTime[0]; + this.queryParams.djendTime = this.startTime[1]; + } else if (this.createTimeList) { + this.queryParams.djbeginTime = this.createTimeList[0]; + this.queryParams.djendTime = this.createTimeList[1]; + } else if (this.createTimeList == null) { + this.queryParams.djbeginTime = null; + this.queryParams.djendTime = null; + } + if (this.startTime1) { + this.queryParams.bgbeginTime = this.startTime1[0]; + this.queryParams.bgendTime = this.startTime1[1]; + } + + this.loading = true; + getOrderList(this.queryParams).then((response) => { + this.orderList = response.data.list; + if (this.orderList) { + this.orderList.forEach((item, index) => { + item.newID = + (this.queryParams.pageNum - 1) * this.queryParams.pageSize + + index + + 1; + }); + } + this.total = response.data.total; + this.loading = false; + }); + // 鑾峰彇鍗曚綅淇℃伅闆嗗悎 + getCompany(this.queryParams).then((response) => { + this.CompanyList = response.data; + console.log( this.CompanyList,555); + + this.loading = false; + }); + }, + + sub() { + this.queryParams.compId = this.CheckBox.drugManufacturerId; if (this.startTime) { this.queryParams.djbeginTime = this.startTime[0]; this.queryParams.djendTime = this.startTime[1]; @@ -1572,9 +1883,13 @@ }); }, /** 鐐瑰嚮鏄剧ず瀵兼鍗曟姤琛�*/ //lige 寮�濮� - handleReport1(row) { + /* handleReport1(row) { const tjNumber = this.tjnumbers; const viewNum = "792931586196398080"; + getInfo().then(((res)=>{ + console.log(res,123); + + })) const params = { viewNum, tjNumber }; hasReport(tjNumber).then((res) => { if (res == 1) { @@ -1583,6 +1898,31 @@ this.$message.error("璇ョ敤鎴锋殏鏃犻」鐩紒"); } }); + }, */ + handleReport1(row) { + const tjNumber = this.tjnumbers; + const viewNum = "792931586196398080"; + // 鍏堣皟鐢� getInfo 鑾峰彇 userId + getInfo() + .then((res) => { + console.log(res, 1111); + + const dqdlr = res.user.userId; // 鑾峰彇 userId + console.log("User ID:", dqdlr); + const params = { viewNum, tjNumber, dqdlr }; // 灏� userId 鍔犲叆 params + + // 鍐嶈皟鐢� hasReport 妫�鏌ユ姤鍛婄姸鎬� + hasReport(tjNumber).then((reportRes) => { + if (reportRes === 1) { + this.$tab.openPage("瀵艰瘖鍗�", "/report/breDailyReport", params); + } else { + this.$message.error("璇ョ敤鎴锋殏鏃犻」鐩紒"); + } + }); + }) + .catch(() => { + this.$message.error("鏃犳硶鑾峰彇鐢ㄦ埛淇℃伅锛�"); + }); }, handleRevoke() { @@ -1593,7 +1933,7 @@ }) .then(() => { revokeTjOrderByTjNum(this.tjnumbers).then((res) => { - this.$modal.msgSuccess(res.msg); + this.$modal.msgSuccess("鎾ら攢鎴愬姛"); this.getList(); }); }) @@ -1687,6 +2027,7 @@ djendTime: null, bgbeginTime: null, bgendTime: null, + dw: null }; this.resetForm("form"); }, @@ -1698,7 +2039,8 @@ /** 鎼滅储鎸夐挳鎿嶄綔 */ handleQuery() { this.queryParams.pageNum = 1; - this.getList(); + // this.getList(); + this.sub(); }, renderContents(h, { node, data, store }) { return ( @@ -1753,10 +2095,23 @@ this.startTime1 = []; this.createTimeList = []; this.resetForm("queryForm"); + this.queryParams = { + pageNum: 1, + pageSize: 10, + djbeginTime: null, + djendTime: null, + tjNum: null, + bgbeginTime: null, + bgendTime: null, + xmmc: null, + tjCompName:'', + dw:null + } this.handleQuery(); }, // 澶氶�夋閫変腑鏁版嵁 handleSelectionChange(selection) { + this.tjNUms = selection.map(item => item.tjNumber); selection.forEach((item) => { this.orderIds = item.orderId; this.tjnumbers = item.tjNumber; @@ -1768,10 +2123,15 @@ this.cusSex = item.tjCustomerSex; this.form.tjType = parseInt(item.tjType); }); + this.ids = selection.map((item) => item.orderId); - // this.tjNumbers = selection.map((item) => item.tjNumber); this.single = selection.length !== 1; this.multiple = !selection.length; + shijianzhou({ + tjNUms: this.tjNUms + }).then((res) => { + console.log(res) + }) }, /** 鏂板鎸夐挳鎿嶄綔 */ // handleAdd() { @@ -1843,7 +2203,6 @@ discount: discount, }); - console.log(this.bill); this.title = "璁㈠崟娴佹按"; }); getTransitionInfo(tjNumber).then((res) => { @@ -1863,11 +2222,65 @@ }); }); }, + budadzd() { + this.bldhs = []; + this.bldhid = ""; + getBlproByTjh(this.tjnumbers).then((res) => { + if (res.data) { + this.DataLists = res.data; + this.budadaozhen = true; + this.title1 = "琛ユ墦瀵艰瘖鍗�"; + } else { + this.$message({ + type: "warning ", + message: "璇ュ鎴锋病鏈夎ˉ褰曢」鐩�", + }); + } + }); + }, + dayin() { + // this.bldhs = []; + console.log(this.bldhs); + this.bldhid.toString(this.bldhs); + this.bldhs.forEach((item) => { + console.log(item, 666); + this.bldhid += item + ","; + }); + // this.bldhid = this.bldhs.toString() + console.log(this.bldhid); + const tjNumber = this.tjnumbers; + const viewNum = "983185234038140928"; + const jxbz = this.bldhid; + // const params = { viewNum, tjNumber, jxbz }; + // console.log(params); + getInfo().then((res) => { + console.log(res, 1111); + const dqdlr = res.user.userId; // 鑾峰彇 userId + const params = { viewNum, tjNumber, jxbz, dqdlr }; + + hasReport(tjNumber).then((res) => { + if (res == 1) { + this.$tab.openPage("瀵艰瘖鍗�", "/report/budabreDailyReport", params); + this.budadaozhen = false; + } else { + this.$message.error("璇ョ敤鎴锋殏鏃犻」鐩紒"); + } + }); + }); + /* hasReport(tjNumber).then((res) => { + if (res == 1) { + this.$tab.openPage("瀵艰瘖鍗�", "/report/budabreDailyReport", params); + this.budadaozhen = false; + } else { + this.$message.error("璇ョ敤鎴锋殏鏃犻」鐩紒"); + } + }); */ + }, handleClick(tab, event) { if (this.activeNames == "first") { - this.marryalls = 0; - this.Datalists = []; + // this.marryalls = 0; + // this.Datalists = []; this.checkedkeys = []; getZhList().then((response) => { if (response.data) { @@ -1876,14 +2289,13 @@ this.loading = false; }); } else { - console.log(111) - this.TotalPrice1 = 0; - this.checkedkey =[] - this.DataList = [] + // this.TotalPrice1 = 0; + this.checkedkey = []; + // this.DataList = []; this.getDataList(); - if (this.marryalls != 0) { - this.TotalPrice1 += this.marryalls; - } + // if (this.marryalls != 0) { + // this.TotalPrice1 += this.marryalls; + // } } }, @@ -1901,10 +2313,20 @@ this.TreedataList = res.data.list; this.TreedataList.forEach((item) => { this.Datalists.push(item); + this.DataList3 = this.DataList.concat(this.Datalists); if (this.Datalists.length >= 1) { this.marryalls = 0; this.Datalists.forEach((item1) => { this.marryalls += item1.proPrice; + // this.TotalPrice1 = this.marryalls; + this.TotalPrice1 = 0; + console.log(this.DataList3, 9999999999); + if (this.DataList3.length != 0) { + this.DataList3.forEach((item) => { + console.log(item.proPrice); + this.TotalPrice1 += item.proPrice; + }); + } this.packagedataList.forEach((item3) => { if (item1.proParentId == item3.proId) { item1.propinName = item3.proName; @@ -1931,8 +2353,12 @@ // 琛ュ綍椤圭洰 handleProject(row) { + this.payType = "0"; this.loading = true; this.DataList = []; + this.DataList3 = []; + this.Datalists = []; + this.TotalPrice1 = 0; this.orderId = row.orderId; this.cusId = row.tjCusIdCard; this.userId = row.userId; @@ -1950,7 +2376,7 @@ this.activeNames = "first"; /** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */ this.handleClick(); - + this.Projectopen = true; this.title = "琛ュ綍椤圭洰"; }, @@ -1997,8 +2423,12 @@ }, // 琛ュ綍椤圭洰 handleProject1() { + this.payType = "0"; this.loading = true; this.DataList = []; + this.DataList3 = []; + this.Datalists = []; + this.TotalPrice1 = 0; this.orderId = this.ids; this.cusId = this.cusIds; this.userId = this.userIds; @@ -2011,7 +2441,7 @@ this.activeNames = "first"; /** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */ this.handleClick(); - + this.Projectopen1 = true; this.title = "琛ュ綍椤圭洰"; }, @@ -2027,6 +2457,8 @@ this.TreedataList.forEach((item) => { this.checkedListkey.push(item.proId); this.DataList.push(item); + this.DataList3 = this.DataList.concat(this.Datalists); + console.log(this.DataList, 77777); this.spliceData(); this.DataList.forEach((item1) => { if (item1.proParentId == data.proId) { @@ -2035,15 +2467,21 @@ }); }); this.TotalPrice1 = 0; - if (this.DataList.length != 0) { - this.list1 = false; - this.DataList.forEach((item) => { - this.TotalPrice1 = item.proPrice + this.TotalPrice1; + if (this.DataList3.length != 0) { + this.DataList3.forEach((item) => { + this.TotalPrice1 += item.proPrice; }); - if (this.marryalls != 0) { - this.TotalPrice1 += this.marryalls; - } } + // this.TotalPrice1 = 0; + // if (this.DataList.length != 0) { + // this.list1 = false; + // this.DataList.forEach((item) => { + // this.TotalPrice1 = item.proPrice + this.TotalPrice1; + // }); + // if (this.marryalls != 0) { + // this.TotalPrice1 += this.marryalls; + // } + // } }); } else if (checked.checkedNodes.length == 0) { let proId = data.proId; @@ -2078,12 +2516,13 @@ this.TotalPrice1 = item1.proPrice + this.TotalPrice1; }); if (this.marryalls != 0) { - this.TotalPrice1 += this.marryalls; - } + this.TotalPrice1 += this.marryalls; + } } }); } else if (checked == true) { this.DataList.push(data); + console.log(this.DataList, 6666); this.DataList.forEach((item1) => { if (item1.proParentId == this.dataObj.proId) { item1.propinName = this.dataObj.proName; @@ -2109,6 +2548,31 @@ }); } }); + this.DataList3.forEach((item, index) => { + if (item.proId == row.proId) { + this.DataList3.splice(index, 1); + this.marryalls = 0; + this.DataList3.forEach((item1) => { + this.marryalls += item1.proPrice; + }); + } + }); + this.DataList.forEach((item, index) => { + if (item.proId == row.proId) { + this.DataList.splice(index, 1); + this.TotalPrice1 = 0; + this.DataList.forEach((item1) => { + this.TotalPrice1 = item1.proPrice + this.TotalPrice1; + }); + if (this.marryalls != 0) { + this.TotalPrice1 += this.marryalls; + } + } + }); + this.TotalPrice1 = 0; + this.DataList3.forEach((item) => { + this.TotalPrice1 += item.proPrice; + }); }, /** 鍒犻櫎鎸夐挳鎿嶄綔 */ handleDelete(row) { @@ -2120,8 +2584,8 @@ this.TotalPrice1 = item1.proPrice + this.TotalPrice1; }); if (this.marryalls != 0) { - this.TotalPrice1 += this.marryalls; - } + this.TotalPrice1 += this.marryalls; + } } }); }, @@ -2209,6 +2673,10 @@ }; getaddtTransition(data).then((response) => { if (response.code === 200) { + this.DataList = []; + this.DataList3 = []; + this.DataLists = []; + this.TotalPrice1 = 0; let tjType = this.form.tjType; let copeWith = this.TotalPrice1; let paidIn = copeWith * (this.discount / 10); @@ -2255,6 +2723,9 @@ }; getaddtTransition(data).then((response) => { if (response.code === 200) { + // this.DataList3 = []; + // this.DataList = []; + // this.DataList3 = []; let tjType = this.form.tjType; let copeWith = this.TotalPrice1; let paidIn = copeWith * (this.discount / 10); @@ -2285,6 +2756,8 @@ handleProjectssChange(selection) { this.DataListss = []; + this.selection = []; + this.bldhs = selection.map((item) => item.bldh); selection.forEach((item) => { item.projectList.forEach((item1) => { @@ -2390,15 +2863,23 @@ // .el-dialog__body { // padding: 20px; // } - +.o { + margin-top: 8px; +} .outside { width: 500px; display: flex; margin-top: 8px; } +.outsides { + width: 500px; + display: flex; + // margin-top: 12px; + // margin-right: 40%; +} .tab3 { - max-height: 500px; + max-height: 420px; overflow-y: auto; border: 1px solid #d9d9d9; } @@ -2408,4 +2889,66 @@ display: flex; margin-top: 8px; } +.outside2 { + width: 500px; + display: flex; + margin-top: 8px; +} +.heji { + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: center; + margin-top: 10px; +} +.box { + display: flex; + justify-content: space-between; +} +.box1 { + width: 50%; + display: flex; + flex-direction: column; +} +.timeline-wrapper { + overflow-x: auto; + padding: 20px; + width: 100%; +} + +.horizontal-timeline { + display: flex; + align-items: center; + justify-content: flex-start; + flex-wrap: nowrap; + padding: 20px 0; + width: 100%; +} + +.el-timeline-item { + display: flex; + flex-direction: column; + align-items: center; + margin: 0 20px; +} + +.el-timeline-item .el-card { + width: 150px; + border-radius: 10px; +} + +.el-timeline-item .el-timeline-item-tail { + display: none; +} + +.el-timeline-item .el-timeline-item-dot { + position: absolute; + top: 10px; + left: 50%; + transform: translateX(-50%); + width: 12px; + height: 12px; + background-color: #409EFF; + border-radius: 50%; +} </style> -- Gitblit v1.8.0