From ba753bf8afd9e3da6e5cedca2213e44e03636191 Mon Sep 17 00:00:00 2001 From: lkk <364857242@qq.com> Date: 星期四, 17 四月 2025 11:15:18 +0800 Subject: [PATCH] 1 --- src/views/hosp/order/index.vue | 2476 ++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 2,026 insertions(+), 450 deletions(-) diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue index da428a4..cc0e9fa 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,13 +23,70 @@ ref="inputName" v-model="queryParams.tjNum" placeholder="璇疯緭鍏ヤ綋妫�鍙�" - style="width: 170px" + style="width: 150px" clearable @keyup.enter.native="handleQuery" @blur="hb" /> </el-form-item> - <el-form-item label="鐧昏鏃堕棿" prop="createTimeList"> + <el-form-item label="浣撴椤圭洰" prop="xmmc"> + <el-input + ref="inputName" + v-model="queryParams.xmmc" + placeholder="璇疯緭鍏ヤ綋妫�椤圭洰" + style="width: 150px" + clearable + @keyup.enter.native="handleQuery" + /> + </el-form-item> + <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" @@ -85,6 +142,24 @@ </el-form-item> </el-form> + <div v-if="shijianlist.length > 0" style="margin-bottom: 20px"> + {{ findNameByTjnum(shijianlist[shijianlist.length - 1].tjNUm) }} + <el-steps + :space="200" + :active="shijianlist[shijianlist.length - 1].sjz" + finish-status="success" + align-center + > + <el-step title="鏈"></el-step> + <el-step title="鍦ㄦ"></el-step> + <el-step title="宸插畬鎴�"></el-step> + <el-step title="宸插鏍�"></el-step> + <el-step title="鐢熸垚鎶ュ憡"></el-step> + <el-step title="鎶ュ憡鏍告敹"></el-step> + <el-step title="宸叉墦鍗�"></el-step> + </el-steps> + </div> + <el-row :gutter="10" class="mb8"> <el-col :span="1.5"> <el-button @@ -102,6 +177,7 @@ type="primary" size="mini" @click="handleRevoke" + :loading="isLoading" :disabled="single" >鎾ら攢绛惧埌</el-button > @@ -114,6 +190,16 @@ :disabled="single" v-hasPermi="['hosp:order:export']" >琛ュ綍椤圭洰</el-button + > + </el-col> + <el-col :span="1.5"> + <el-button + type="primary" + size="mini" + @click="revokeProject" + :disabled="single" + v-hasPermi="['hosp:order:export']" + >鎾ら攢琛ュ綍</el-button > </el-col> @@ -137,6 +223,35 @@ >璁㈠崟鏄庣粏</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> + <el-col :span="1.5"> + <el-button + type="primary" + size="mini" + @click="ForceChexiao" + :disabled="single" + v-hasPermi="['qzcx']" + >寮哄埗鎾ら攢</el-button + > + </el-col> + <el-col :span="1.5"> + <el-button + type="primary" + size="mini" + @click="ResumeAppointment" + :disabled="multiple" + >鎭㈠棰勭害</el-button + > + </el-col> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" @@ -148,6 +263,7 @@ border v-loading="loading" :data="orderList" + ref="tableRef" @selection-change="handleSelectionChange" > <el-table-column @@ -216,8 +332,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 @@ -227,13 +347,45 @@ :show-overflow-tooltip="true" width="160px" /> + <el-table-column + label="闂ㄨ瘖鍙�" + align="center" + prop="cardId" + :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="鎵�閫夊椁�" align="center" prop="pacName" + :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" @@ -275,19 +427,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" /> --> @@ -434,171 +581,361 @@ 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="6"> + <div class="box"> + <div class="box1"> <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" + <el-tabs + type="border-card" + style="height: 560px; margin: 0 10px; width: 100%" + @tab-click="handleClick" + v-model="activeNames" > - 鏄庣粏椤圭洰鍒楄〃 - </div> - <div class="tab3"> - <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-col> - <el-col :span="11"> - <div class="grid-content bg-purple"> - <div - style="text-align: center; margin-bottom: 10px; margin-top: 10px" - > - 宸查�夐」鐩垪琛� - </div> - <el-table - :data="DataList" - border - style="width: 100%" - height="400" - :span-method="objectSpanMethod" - > - <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-column - label="鎿嶄綔" - align="center" - fixed="right" - class-name="small-padding fixed-width" - width="50px" - > - <template slot-scope="scope"> - <el-button - size="mini" - type="text" - icon="el-icon-delete" - @click="handleDelete(scope.row)" - title="鍒犻櫎" - ></el-button> - </template> - </el-table-column> - </el-table> - <el-collapse v-model="activeName" accordion v-if="list1"> - <div> - <el-collapse-item title="璇烽�夋嫨椤圭洰"> - <el-table :data="DataList" border style="width: 100%"> - <el-table-column prop="proName" label="椤圭洰" width="180"> - </el-table-column> - <el-table-column prop="ordPrice" label="鍘熶环"> - </el-table-column> - </el-table> - </el-collapse-item> + <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-change="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-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> + </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; + 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-change="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; + 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"> + <div class="grid-content bg-purple"> + <div + style=" + text-align: center; + margin-bottom: 10px; + margin-top: 10px; + " + > + 宸查�夐」鐩垪琛� + </div> - <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-table + :data="DataList" + border + style="width: 100%" + height="400" + :span-method="objectSpanMethod" + > + <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-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="submitPrice" - :disabled="confirm" - style="margin-top: 34px" - >鎻愪氦</el-button + </el-table-column> + + <el-table-column + label="鎿嶄綔" + align="center" + fixed="right" + class-name="small-padding fixed-width" + width="50px" > - </el-form-item> - </el-form> - </div> + <template slot-scope="scope"> + <el-button + size="mini" + type="text" + icon="el-icon-delete" + @click="handleDelete(scope.row)" + title="鍒犻櫎" + ></el-button> + </template> + </el-table-column> + </el-table> --> + <!-- <el-collapse v-model="activeName" accordion v-if="list1"> + <div> + <el-collapse-item title="璇烽�夋嫨椤圭洰"> + <el-table + :data="DataList" + border + style="width: 100%" + height="400" + :span-method="objectSpanMethod" + > + <el-table-column + prop="proName" + label="椤圭洰" + width="180" + > + </el-table-column> + <el-table-column prop="ordPrice" label="鍘熶环"> + </el-table-column> + </el-table> + </el-collapse-item> + </div> + </el-collapse> --> + <!-- </div> + </el-col> --> + </el-row> + </div> + </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-col> - </el-row> + <el-table + :data="DataList3" + border + style="width: 100%; table-layout: fixed" + height="560" + :span-method="objectspanmethod" + > + <el-table-column + prop="propinName" + label="妫�鏌ラ」鐩�" + width="200px" + :show-overflow-tooltip="true" + > + </el-table-column> + <el-table-column + prop="proName" + label="鏄庣粏椤圭洰" + width="200px" + :show-overflow-tooltip="true" + > + </el-table-column> + <el-table-column prop="sl" label="鏁伴噺" width="56px"> + </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> + <el-form + :model="form" + inline + style="display: flex; justify-content: space-between; margin-top: 20px" + > + <!-- 浣撴绫诲瀷 --> + <el-form-item label="浣撴绫诲瀷" prop="tjType" style="display: flex"> + <div class="type"> + {{ { 1: "鍥㈤槦", 2: "涓汉", 3: "鍥綋绁�" }[form.tjType] }} + </div> + </el-form-item> + + <!-- 鍘熶环 --> + <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 label="缁撶畻鏂瑰紡" prop="jsType" style="display: flex"> + <el-select + v-model="jsType" + placeholder="璇烽�夋嫨缁撶畻鏂瑰紡" + style="width: 130px" + clearable + > + <el-option + v-for="dict in dict.type.reservation_pay_type" + :key="dict.value" + :label="dict.label" + :value="dict.value" + /> + </el-select> + </el-form-item> + + <!-- 鎻愪氦鎸夐挳 --> + <el-form-item style="display: flex"> + <el-button + type="primary" + :loading="isSubmit1" + @click="submitPrice1" + :disabled="confirm" + > + 鎻愪氦 + </el-button> + </el-form-item> + </el-form> </el-dialog> <!-- 娣诲姞琛ュ綍椤圭洰 --> @@ -608,71 +945,487 @@ width="1100px" style="height: 860px" append-to-body + :close-on-click-modal="false" + > + <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"> + <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-change="handlepackage" + :default-checked-keys="checkedkeys" + :filter-node-method="filterpackage" + ref="treas" + :render-content="renderContents" + > + </el-tree> + </div> + </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"> + <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-change="handleCurrentChecked" + :default-checked-keys="checkedkey" + :filter-node-method="filterNode" + ref="tree" + :render-content="renderContent" + > + </el-tree> + </div> + </el-col> + </el-row> + </div> + </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%; table-layout: fixed" + height="560" + :span-method="objectspanmethod" + > + <el-table-column + prop="propinName" + label="妫�鏌ラ」鐩�" + width="200px" + :show-overflow-tooltip="true" + > + </el-table-column> + <el-table-column + prop="proName" + label="鏄庣粏椤圭洰" + width="200px" + :show-overflow-tooltip="true" + > + </el-table-column> + <el-table-column prop="sl" label="鏁伴噺" width="56px"> + </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> + + <el-form + :model="form" + inline + style="display: flex; justify-content: space-between; margin-top: 20px" + > + <!-- 浣撴绫诲瀷 --> + <el-form-item label="浣撴绫诲瀷" prop="tjType" style="display: flex"> + <div class="type"> + {{ { 1: "鍥㈤槦", 2: "涓汉", 3: "鍥綋绁�" }[form.tjType] }} + </div> + </el-form-item> + + <!-- 鍘熶环 --> + <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 label="缁撶畻鏂瑰紡" prop="jsType" style="display: flex"> + <el-select + v-model="jsType" + placeholder="璇烽�夋嫨缁撶畻鏂瑰紡" + style="width: 130px" + clearable + > + <el-option + v-for="dict in dict.type.reservation_pay_type" + :key="dict.value" + :label="dict.label" + :value="dict.value" + /> + </el-select> + </el-form-item> + + <!-- 鎻愪氦鎸夐挳 --> + <el-form-item style="display: flex"> + <el-button + type="primary" + :loading="isSubmit1" + @click="submitPrice1" + :disabled="confirm" + > + 鎻愪氦 + </el-button> + </el-form-item> + </el-form> + + <!-- <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 label="缁撶畻鏂瑰紡" prop="payType"> + <el-select + v-model="payType" + placeholder="璇烽�夋嫨缁撶畻鏂瑰紡" + style="width: 130px" + clearable + > + <el-option + v-for="dict in dict.type.reservation_pay_type" + :key="dict.value" + :label="dict.label" + :value="dict.value" + /> + </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="1400px" + append-to-body + :close-on-click-modal="false" + class="custom-dialog" + > + <el-tabs v-model="activeName1" type="card"> + <el-tab-pane label="椤圭洰姹囨��" name="second" style="height: 400px"> + <el-table :data="huizongList" style="width: 100%" max-height="350"> + <el-table-column + align="center" + type="index" + label="搴忓彿" + width="50" + ></el-table-column> + <el-table-column + align="center" + prop="parent_pro_name" + label="椤圭洰" + ></el-table-column> + <el-table-column + align="center" + prop="ks" + label="绉戝" + ></el-table-column> + <el-table-column + align="center" + prop="price" + label="璐圭敤鍚堣" + ></el-table-column> + </el-table> + <h3>浠樻璇︽儏</h3> + <el-table :data="bill" style="width: 100%; margin-top: 10px"> + <el-table-column + align="center" + prop="copeWith" + label="搴斾粯" + ></el-table-column> + <el-table-column + align="center" + prop="discount" + label="鎶樻墸" + ></el-table-column> + <el-table-column + align="center" + prop="paidIn" + label="瀹炰粯" + ></el-table-column> + </el-table> + </el-tab-pane> + <el-tab-pane label="鏄庣粏椤圭洰" name="third" style="height: 450px"> + <!-- 绉婚櫎 overflow-y: auto --> + <el-table + :data="infoList" + style="width: 100" + max-height="500" + :span-method="objectSpanMethod1" + > + <el-table-column + align="center" + type="index" + label="搴忓彿" + width="50" + ></el-table-column> + <el-table-column + align="center" + prop="parent_pro_name" + label="鐖堕」" + ></el-table-column> + <el-table-column + align="center" + prop="pro_name" + label="瀛愰」" + ></el-table-column> + <el-table-column + align="center" + prop="danjia" + label="鍗曚环" + ></el-table-column> + <el-table-column + align="center" + prop="num" + label="鏁伴噺" + ></el-table-column> + <el-table-column + align="center" + prop="zongjia" + label="鎬讳环" + ></el-table-column> + <el-table-column + align="center" + prop="time" + label="寮�鍗曟椂闂�" + width="180" + ></el-table-column> + </el-table> + </el-tab-pane> + </el-tabs> + <div slot="footer" class="dialog-footer"> + <el-button @click="cancel">鍙� 娑�</el-button> + </div> + </el-dialog> + + <el-dialog + :title="title1" + :visible.sync="Projectssopen" + 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="6"> + <el-col :span="13"> <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-table + :data="DataLists" + border + style="width: 100%" + height="400" + @selection-change="handleProjectssChange" > - </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-table-column type="selection" width="40" align="center" /> + <el-table-column + type="index" + label="搴忓彿" + align="center" + width="49px" > - </el-tree> - </div> + </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="11"> + + <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="DataList" + :data="DataListss" border style="width: 100%" height="400" - :span-method="objectSpanMethod" + :span-method="objectSpanMethod2" > <el-table-column prop="propinName" label="妫�鏌ラ」鐩�"> </el-table-column> @@ -680,173 +1433,107 @@ </el-table-column> <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px"> </el-table-column> - - - <el-table-column - label="鎿嶄綔" - align="center" - fixed="right" - class-name="small-padding fixed-width" - width="50px" - > - <template slot-scope="scope"> - <el-button - size="mini" - type="text" - icon="el-icon-delete" - @click="handleDelete(scope.row)" - title="鍒犻櫎" - ></el-button> - </template> - </el-table-column> </el-table> - <el-collapse v-model="activeName" accordion v-if="list1"> - <div> - <el-collapse-item title="璇烽�夋嫨椤圭洰"> - <el-table - :data="DataList" - border - style="width: 100%" - height="400" - :span-method="objectSpanMethod" - > - <el-table-column prop="proName" label="椤圭洰" width="180"> - </el-table-column> - <el-table-column prop="ordPrice" label="鍘熶环"> - </el-table-column> - </el-table> - </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 slot="footer" class="dialog-footer"> + <el-button type="primary" @click="submitForm">鎾� 閿�</el-button> + <!-- <el-button @click="cancel">鍙� 娑�</el-button> --> + </div> </el-dialog> - <!-- 娣诲姞鎴栦慨鏀逛綋妫�璁板綍瀵硅瘽妗� --> - <el-dialog :title="title" :visible.sync="open" width="950px" append-to-body> - <el-tabs v-model="activeName1" type="card"> - <el-tab-pane label="璁㈠崟娴佹按" name="first"> - <el-table :data="numberList" style="width: 100%"> - <el-table-column prop="proName" label="椤圭洰/鑰楁潗" width="300"> - </el-table-column> - <el-table-column prop="price" label="鍗曚环" width="300"> - </el-table-column> - <el-table-column prop="count" label="鏁伴噺" width="300"> - </el-table-column> - </el-table> - <el-table :data="bill" style="width: 100%"> - <el-table-column prop="copeWith" label="搴斾粯" width="180"> - </el-table-column> - <el-table-column prop="discount" label="鎶樻墸" width="180"> - </el-table-column> - <el-table-column prop="paidIn" label="瀹炰粯" width="180"> - </el-table-column> - <el-table-column prop="payType" label="浠樻鏂瑰紡" width="180"> - <template slot-scope="scope"> - <span v-if="scope.row.payType == '0'">鐜伴噾鏀粯</span> - <span v-if="scope.row.payType == '1'">鍒峰崱鏀粯</span> - <span v-if="scope.row.payType == '2'">鏀粯瀹濇敮浠�</span> - <span v-if="scope.row.payType == '3'">寰俊鏀粯</span> - <span v-if="scope.row.payType == '4'">浜戦棯浠樻敮浠�</span> - </template> - </el-table-column> - <el-table-column prop="payStasus" label="浠樻鐘舵��" width="180"> - <template slot-scope="scope"> - <span v-if="scope.row.payStasus == '0'">鏈粯娆�</span> - <span v-if="scope.row.payStasus == '1'">宸蹭粯娆�</span> - <span v-if="scope.row.payStasus == '2'">閫�璐�</span> - <span v-if="scope.row.payStasus == '3'">棰勪粯娆�</span> - </template> - </el-table-column> - </el-table> - </el-tab-pane> - <el-tab-pane label="椤圭洰姹囨��" name="second"> - <el-table :data="huizongList" style="width: 100%"> - <el-table-column prop="newID" label="搴忓彿"> </el-table-column> - <el-table-column prop="parent_pro_name" label="椤圭洰"> - </el-table-column> - <el-table-column prop="ks" label="绉戝"> </el-table-column> - <el-table-column prop="price" label="璐圭敤鍚堣"> </el-table-column> - </el-table> - </el-tab-pane> - <el-tab-pane label="鏄庣粏椤圭洰" name="third"> - <el-table :data="infoList" style="width: 100%"> - <el-table-column prop="newID" label="搴忓彿"> </el-table-column> - <el-table-column prop="parent_pro_name" label="鐖堕」"> - </el-table-column> - <el-table-column prop="proName" label="瀛愰」"> </el-table-column> - <el-table-column prop="danjia" label="鍗曚环"> </el-table-column> - <el-table-column prop="num" label="鏁伴噺"> </el-table-column> - <el-table-column prop="zongjia" label="鎬讳环"> </el-table-column> - <el-table-column prop="time" label="寮�鍗曟椂闂�"> </el-table-column> - </el-table> - </el-tab-pane> - </el-tabs> + <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 @click="cancel">鍙� 娑�</el-button> + <el-button type="primary" @click="dayin">鎵� 鍗�</el-button> + <!-- <el-button @click="cancel">鍙� 娑�</el-button> --> </div> </el-dialog> </div> @@ -860,41 +1547,83 @@ getOrderList, getNewDateList, revokeTjOrderByTjNum, + huifuyuyuejilu, getTransitionInfo, + getBlproByTjh, + revokeBlProByBldhAndTjh, + getForceChexiao, } from "@/api/hosp/order"; 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, + getaddtTransition1, } from "@/api/system/tijian"; +import { + SubmitCompany, + getCompany, + queryCompany, + addbatch, +} from "@/api/team/tuanti"; export default { components: { ViewPdf, }, - dicts: ["dict_pay_type"], + dicts: ["dict_pay_type", "dict_team", "reservation_pay_type"], name: "Order", data() { return { - huizongList:[], - infoList:[], - activeName1: "first", + ztList: [ + { name: "鏈", id: 0 }, + { name: "鍦ㄦ", id: 1 }, + { name: "宸插畬鎴�", id: 2 }, + { name: "宸插鏍�", id: 3 }, + { name: "鐢熸垚鎶ュ憡", id: 4 }, + { name: "鎶ュ憡鏍告敹", id: 5 }, + { name: "宸插嚭鎶ュ憡", id: 6 }, + ], + DataList3: [], + bldhid: "", + budadaozhen: false, + isLoading: false, + isSubmit: false, + isSubmit1: false, + huizongList: [], + DataLists: [], + infoList: [], + bldhs: [], + CompanyList: [], + filterage: "", + activeName1: "second", filterText: "", orderIds: "", tjnumbers: "", + Projectssopen: false, + title1: "", cusIds: "", userIds: "", cusIdcard: "", + defaultpackProps: { + children: [], + label: "proName", + }, cusName: "", cusPhone: "", cusSex: "", reportTimeList: "", createTimeList: "", + packagedataList: [], cusId: "", payType: "0", + jsType: "0", + packageList: [], + checkedkeys: [], dialogVisible: false, daoZhenDan: false, Projectopen: false, @@ -902,25 +1631,34 @@ src: "", url: "", flag: true, - bill: null, + bill: [], Treedata: [], + DataListss: [], checkedkey: [], checkedListkey: [], defaultProps: { children: [], label: "proName", }, + defaultProp: { + children: [], + label: "zhmc", + }, TreedataList: [], discount: 10, DataList: [], + shijianlist: [], // 濂楅鎻愪氦鎸夐挳 confirm: false, list1: true, activeName: "1", proIds: [], TotalPrice1: 0, + TotalPrice6: 0, + TotalPrice7: 0, numberList: [], dialogVisible: false, + CheckBox: {}, // 閬僵灞� loading: true, // 閫変腑鏁扮粍 @@ -928,8 +1666,10 @@ dataObj: {}, // 闈炲崟涓鐢� single: true, + activeNames: "first", // 闈炲涓鐢� multiple: true, + tjNUms: [], // 鏄剧ず鎼滅储鏉′欢 showSearch: true, userId: "", @@ -942,8 +1682,10 @@ orderId: "", // 鏄惁鏄剧ず寮瑰嚭灞� open: false, + Datalists: [], // 鏃ユ湡鑼冨洿 datetimerange: [], + marryalls: 0, // 鏌ヨ鍙傛暟 queryParams: { pageNum: 1, @@ -953,6 +1695,9 @@ tjNum: null, bgbeginTime: null, bgendTime: null, + xmmc: null, + tjCompName: "", + dw: null, }, startTime: "", startTime1: "", @@ -995,9 +1740,13 @@ }, }; }, + watch: { filterText(val) { this.$refs.tree.filter(val); + }, + filterage(val) { + this.$refs.treas.filter(val); }, }, created() { @@ -1011,6 +1760,39 @@ }); }, methods: { + findNameByTjnum(tjnum) { + const order = this.orderList.find( + (orderItem) => orderItem.tjNumber === tjnum + ); + return order ? order.tjCustomerName : "鏈壘鍒�"; // 濡傛灉鎵句笉鍒板搴旂殑椤癸紝杩斿洖涓�涓粯璁ゅ�� + }, + // 鎼滅储 + 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) { @@ -1024,9 +1806,10 @@ }, filterNode(value, data) { if (!value) return true; - if(value == data.proName){ + // return data.proName.indexOf(value) !== -1; + if (data.proName.indexOf(value) !== -1) { return data.proName.indexOf(value) !== -1; - }else{ + } else { return data.proEngName.indexOf(value) !== -1; } }, @@ -1069,6 +1852,46 @@ }, /** 鏌ヨ浣撴璁板綍鍒楄〃 */ 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; + + 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]; @@ -1099,6 +1922,9 @@ this.loading = false; }); }, + driver(row) { + return row.pacName == null ? "鏅�氫綋妫�" : row.pacName; + }, /** 鐐瑰嚮鏄剧ず瀵兼鍗曟姤琛�*/ //lige 寮�濮� handleReport(row) { const tjNumber = row.tjNumber; @@ -1113,9 +1939,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) { @@ -1124,17 +1954,50 @@ 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() { - this.$confirm("鎮ㄧ‘璁よ鎾ら攢锛�", "纭淇℃伅", { - distinguishCancelAndClose: true, - confirmButtonText: "纭", - cancelButtonText: "鍙栨秷", - }) + // 寮哄埗鎾ら攢鎸夐挳 + ForceChexiao() { + const tjNum = this.tjnumbers; + this.$confirm( + "鎮ㄦ槸鍚﹂渶瑕佸己鍒舵挙閿�锛熸挙閿�鍚庤浜哄憳鏈浣撴璁板綍涓嶅彲鎭㈠锛�", + "纭淇℃伅", + { + distinguishCancelAndClose: true, + confirmButtonText: "纭", + cancelButtonText: "鍙栨秷", + customClass: "custom-message-box", + } + ) + .then(() => { - revokeTjOrderByTjNum(this.tjnumbers).then((res) => { - this.$modal.msgSuccess(res.msg); + getForceChexiao(tjNum).then((res) => { + this.$modal.msgSuccess("鎾ら攢鎴愬姛"); this.getList(); }); }) @@ -1145,6 +2008,71 @@ message: "宸插彇娑�", }); } + }); + this.$nextTick(() => { + // 纭繚寮规娓叉煋鍚庡簲鐢ㄦ牱寮� + const messageBox = document.querySelector( + ".custom-message-box .el-message-box__message" + ); + if (messageBox) { + messageBox.style.color = "red"; // 閫氳繃 JS 寮哄埗璁剧疆棰滆壊 + } + }); + }, + + ResumeAppointment() { + this.isLoading = true; + this.$confirm("鎮ㄧ‘璁よ鎭㈠棰勭害锛�", "纭淇℃伅", { + distinguishCancelAndClose: true, + confirmButtonText: "纭", + cancelButtonText: "鍙栨秷", + }) + .then(() => { + huifuyuyuejilu(this.tjNUms).then((res) => { + this.$modal.msgSuccess("鎭㈠鎴愬姛"); + // this.isLoading = false; + this.getList(); + }); + }) + .catch((action) => { + if (action === "cancel") { + this.$message({ + type: "warning", + message: "宸插彇娑�", + }); + } + }) + .finally(() => { + // 涓嶈鎿嶄綔鎴愬姛杩樻槸澶辫触锛岄兘浼氭墽琛� + this.isLoading = false; + }); + }, + + handleRevoke() { + this.isLoading = true; + this.$confirm("鎮ㄧ‘璁よ鎾ら攢锛�", "纭淇℃伅", { + distinguishCancelAndClose: true, + confirmButtonText: "纭", + cancelButtonText: "鍙栨秷", + }) + .then(() => { + revokeTjOrderByTjNum(this.tjnumbers).then((res) => { + this.$modal.msgSuccess("鎾ら攢鎴愬姛"); + // this.isLoading = false; + this.getList(); + }); + }) + .catch((action) => { + if (action === "cancel") { + this.$message({ + type: "warning", + message: "宸插彇娑�", + }); + } + }) + .finally(() => { + // 涓嶈鎿嶄綔鎴愬姛杩樻槸澶辫触锛岄兘浼氭墽琛� + this.isLoading = false; }); }, /** 鐐瑰嚮鏄剧ず浣撴鎶ュ憡鎶ヨ〃*/ @@ -1228,6 +2156,7 @@ djendTime: null, bgbeginTime: null, bgendTime: null, + dw: null, }; this.resetForm("form"); }, @@ -1239,7 +2168,55 @@ /** 鎼滅储鎸夐挳鎿嶄綔 */ handleQuery() { this.queryParams.pageNum = 1; - this.getList(); + // this.getList(); + this.sub(); + }, + renderContents(h, { node, data, store }) { + return ( + <span class="custom-tree-node"> + <span>{node.label}</span> + <span>({data.price}鍏�)</span> + </span> + ); + }, + + objectspanmethod({ row, column, rowIndex, columnIndex }) { + let fields = ["propinName"]; + let cellValue = row[column.property]; + if (cellValue && fields.includes(column.property)) { + let prevRow = this.Datalists[rowIndex - 1]; + let nextRow = this.Datalists[rowIndex + 1]; + if (prevRow && prevRow[column.property] === cellValue) { + return { rowspan: 0, colspan: 0 }; + } else { + let countRowspan = 1; + while (nextRow && nextRow[column.property] === cellValue) { + nextRow = this.Datalists[++countRowspan + rowIndex]; + } + + if (countRowspan > 1) { + return { rowspan: countRowspan, colspan: 1 }; + } + } + } + + // if (columnIndex == 3) { + // let rowspan = 0; + // this.DataLists.forEach((element) => { + // if (element.propinName === row.propinName) { + // rowspan++; + // } + // }); + // return [rowspan, 1]; + // } + }, + filterpackage(value, data) { + if (!value) return true; + if (data.zhmc.indexOf(value) !== -1) { + return data.zhmc.indexOf(value) !== -1; + } else { + return data.pym.indexOf(value) !== -1; + } }, /** 閲嶇疆鎸夐挳鎿嶄綔 */ resetQuery() { @@ -1247,10 +2224,24 @@ 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) { + let tjNUms = selection.map((item) => item.tjNumber); + this.tjNUms = selection.map((item) => item.tjNumber); selection.forEach((item) => { this.orderIds = item.orderId; this.tjnumbers = item.tjNumber; @@ -1260,11 +2251,19 @@ this.cusName = item.tjCustomerName; this.cusPhone = item.tjCustomerPhone; 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; + if (tjNUms.length > 0) { + shijianzhou(tjNUms).then((res) => { + this.shijianlist = res.data; + }); + } else { + this.shijianlist = []; + } }, /** 鏂板鎸夐挳鎿嶄綔 */ // handleAdd() { @@ -1280,12 +2279,24 @@ getNumber(tjNumber).then((response) => { // this.form = response.data; this.numberList = response.data.charging; - this.bill = response.data.water; + this.bill = []; + var copeWith = 0; + var paidIn = 0; + var discount = ""; + response.data.water.forEach((item) => { + copeWith += item.copeWith; + paidIn += item.paidIn; + discount = item.discount; + }); + this.bill.push({ + copeWith: copeWith, + paidIn: paidIn, + discount: discount, + }); + this.title = "璁㈠崟娴佹按"; }); getTransitionInfo(tjNumber).then((res) => { - console.log(111); - console.log(res); this.huizongList = res.data.huizong; this.infoList = res.data.info; this.huizongList.forEach((item, index) => { @@ -1309,15 +2320,250 @@ getNumber(tjNumber).then((response) => { // this.form = response.data; this.numberList = response.data.charging; - this.bill = response.data.water; + this.bill = []; + var copeWith = 0; + var paidIn = 0; + var discount = ""; + response.data.water.forEach((item) => { + copeWith += item.copeWith; + paidIn += item.paidIn; + discount = item.discount; + }); + this.bill.push({ + copeWith: copeWith, + paidIn: paidIn, + discount: discount, + }); + this.title = "璁㈠崟娴佹按"; }); + getTransitionInfo(tjNumber).then((res) => { + this.huizongList = res.data.huizong; + this.infoList = res.data.info; + this.huizongList.forEach((item, index) => { + item.newID = + (this.queryParams.pageNum - 1) * this.queryParams.pageSize + + index + + 1; + }); + this.infoList.forEach((item, index) => { + item.newID = + (this.queryParams.pageNum - 1) * this.queryParams.pageSize + + index + + 1; + }); + }); }, + 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.checkedkeys = []; + + this.DataList3 = []; + getZhList().then((response) => { + if (response.data) { + this.packageList = response.data; + } + this.loading = false; + }); + } else { + // this.TotalPrice1 = 0; + this.checkedkeys = []; + // this.DataList = []; + this.Datalists = []; + this.DataList3 = []; + this.getDataList(); + // if (this.marryalls != 0) { + // this.TotalPrice1 += this.marryalls; + // } + } + }, + handlepackage(data, checked, checkedNodes) { + if (checked == true) { + // this.$refs.treas.setCheckedKeys([data.id]); + let datas = { + zhId: data.id, + }; + + getlistByZhId(datas).then((res) => { + this.packagedataList = res.data.tjProjectList; + for (var i = 0; i < this.packagedataList.length; i++) { + let proId = this.packagedataList[i].proId; + getProSonDxList(proId).then((res) => { + this.TreedataList = res.data.list; + this.TreedataList.forEach((item) => { + this.Datalists.push(item); + }); + + // 鍚堝苟 Datalists 鍜� DataList 鍒� DataList3 + this.DataList3 = this.DataList.concat(this.Datalists); + + // 娓呯┖绱姞鍣� + this.marryalls = 0; + this.TotalPrice1 = 0; + + // 閲嶆柊璁$畻浠锋牸 + this.DataList3.forEach((item) => { + console.log(item.proPrice); + this.TotalPrice1 += item.proPrice * item.sl; + this.marryalls += item.proPrice * item.sl; + }); + + // 涓烘瘡涓」鐩坊鍔� propinName + this.Datalists.forEach((item1) => { + this.packagedataList.forEach((item3) => { + if (item1.proParentId == item3.proId) { + item1.propinName = item3.proName; + } + }); + }); + }); + } + }); + } else if (checked == false) { + let datas = { + zhId: data.id, + }; + + this.marryalls = 0; + + // 娓呯┖ Datalists 鍜� DataList3 + this.Datalists = []; + this.DataList3 = [...this.DataList]; // 閲嶆柊璁剧疆 DataList3锛屼粎鍖呭惈鍘熷 DataList + + getlistByZhId(datas).then((res) => { + this.packagedataList = res.data.tjProjectList; + for (var i = 0; i < this.packagedataList.length; i++) { + let proId = this.packagedataList[i].proId; + getProSonDxList(proId).then((res) => { + this.TreedataList = res.data.list; + this.checkedListkey = this.checkedListkey.filter( + (id) => id !== proId + ); + + // 浠� DataList3 涓Щ闄ょ浉鍏崇殑瀛愰」 + this.DataList3 = this.DataList3.filter( + (item) => item.proParentId !== proId + ); + + // 鏇存柊鎬讳环鏍� + this.TotalPrice1 = 0; // 娓呯┖浠锋牸 + this.DataList3.forEach((item) => { + this.TotalPrice1 += item.proPrice; + }); + }); + } + }); + } + }, + + /* handlepackage(data, checked, checkedNodes) { + console.log(checked, 3333); + + if (checked.checkedNodes.length != 0) { + this.$refs.treas.setCheckedKeys([data.id]); + let datas = { + zhId: data.id, + }; + + getlistByZhId(datas).then((res) => { + this.packagedataList = res.data.tjProjectList; + + for (var i = 0; i < this.packagedataList.length; i++) { + let proId = this.packagedataList[i].proId; + getProSonDxList(proId).then((res) => { + 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; + + 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; + } + }); + }); + } + }); + }); + } + }); + } else if (checked.checkedNodes.length == 0) { + } + }, */ renderContent(h, { node, data, store }) { return ( <span class="custom-tree-node"> - 聽 <span>{node.label}</span> + <span>{node.label}</span> <span>({data.proPrice}鍏�)</span> </span> ); @@ -1325,11 +2571,21 @@ // 琛ュ綍椤圭洰 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; + console.log(row, 666); + this.$nextTick(() => { + this.$refs.tableRef.clearSelection(); // 娓呴櫎鎵�鏈夐�変腑 + this.$refs.tableRef.toggleRowSelection(row, true); // 閫変腑褰撳墠琛� + }); + this.customer = { cusIdcard: row.tjCusIdCard, cusName: row.tjCustomerName, @@ -1339,10 +2595,12 @@ if (row.tjType) { this.form.tjType = parseInt(row.tjType); } else { - this.form.tjType = 0; + this.form.tjType = 2; } + this.activeNames = "first"; /** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */ - this.getDataList(); + this.handleClick(); + this.Projectopen = true; this.title = "琛ュ綍椤圭洰"; }, @@ -1350,33 +2608,51 @@ getDataList() { getProParentIdDxList().then((response) => { this.Treedata = response.data.list; - this.checkedkey.push(this.Treedata[0].proId); - let proId = this.Treedata[0].proId; - getProSonDxList(proId).then((res) => { - this.TreedataList = res.data.list; - this.TreedataList.forEach((item) => { - this.checkedListkey.push(item.proId); - this.DataList.push(item); - this.DataList.forEach((item) => { - item.propinName = this.Treedata[0].proName; - }); - }); - this.TotalPrice1 = 0; + // this.checkedkey.push(this.Treedata[0].proId); + // let proId = this.Treedata[0].proId; + // getProSonDxList(proId).then((res) => { + // this.TreedataList = res.data.list; + // this.TreedataList.forEach((item) => { + // this.checkedListkey.push(item.proId); + // this.DataList.push(item); + // this.DataList.forEach((item) => { + // item.propinName = this.Treedata[0].proName; + // }); + // }); + // this.TotalPrice1 = 0; - if (this.DataList.length != 0) { - this.list1 = false; - this.DataList.forEach((item) => { - this.TotalPrice1 = item.proPrice + this.TotalPrice1; - }); - } - }); + // if (this.DataList.length != 0) { + // this.list1 = false; + // this.DataList.forEach((item) => { + // this.TotalPrice1 = item.proPrice + this.TotalPrice1; + // }); + // } + // }); this.loading = false; + }); + }, + revokeProject() { + getBlproByTjh(this.tjnumbers).then((res) => { + if (res.data) { + this.DataLists = res.data; + this.Projectssopen = true; + this.title1 = "鎾ら攢琛ュ綍"; + } else { + this.$message({ + type: "warning ", + message: "璇ュ鎴锋病鏈夎ˉ褰曢」鐩�", + }); + } }); }, // 琛ュ綍椤圭洰 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; @@ -1386,16 +2662,19 @@ cusPhone: this.cusPhone, cusSex: this.cusSex, }; + this.activeNames = "first"; /** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */ - this.getDataList(); + this.handleClick(); + this.Projectopen1 = true; this.title = "琛ュ綍椤圭洰"; }, // 鐐瑰嚮鑾峰彇姣忎釜鏍戣妭鐐� - handleCurrentChecked(data, checked, checkedNodes) { + /* handleCurrentChecked(data, checked, checkedNodes) { this.dataObj = data; - if (checked.checkedNodes.length != 0) { + this.checkedObj = checked; + if (checked == true) { this.$refs.tree.setCheckedKeys([data.proId]); let proId = data.proId; getProSonDxList(proId).then((res) => { @@ -1403,6 +2682,7 @@ this.TreedataList.forEach((item) => { this.checkedListkey.push(item.proId); this.DataList.push(item); + this.DataList3 = this.DataList.concat(this.Datalists); this.spliceData(); this.DataList.forEach((item1) => { if (item1.proParentId == data.proId) { @@ -1411,18 +2691,107 @@ }); }); 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 * item.sl; }); } + // 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) { + } else if (checked == false) { let proId = data.proId; getProSonDxList(proId).then((res) => { this.TreedataList = res.data.list; this.checkedListkey = []; + this.TreedataList.forEach((item) => { + item.disabled = true; + }); + this.DataList3.forEach((item, index) => { + if (item.proParentId == this.dataObj.proId) { + this.DataList3.splice(index, this.TreedataList.length); + } + }); + + // 鎵嬪姩鏇存柊鎬讳环鏍� + this.TotalPrice1 = 0; + this.DataList3.forEach((item, index) => { + this.TotalPrice1 += item.proPrice * item.sl; + }); + }); + } + }, */ + handleCurrentChecked(data, checked, checkedNodes) { + this.dataObj = data; + this.checkedObj = checked; + + if (checked === true) { + // this.$refs.tree.setCheckedKeys([data.proId]); + let proId = data.proId; + getProSonDxList(proId).then((res) => { + this.TreedataList = res.data.list; + + this.TreedataList.forEach((item) => { + // item.disabled = true; + // this.checkedListkey.push(item.proId); + if (!this.checkedListkey.includes(item.proId)) { + this.checkedListkey.push(item.proId); + } + this.Datalists.push(item); + + this.DataList3.push(item); + + this.spliceData(); + this.DataList3.forEach((item1) => { + this.TotalPrice1 += item1.proPrice * item1.sl; + if (item1.proParentId == data.proId) { + item1.propinName = data.proName; + item1.propinPrice = this.dataObj.proPrice; + } + }); + }); + + // 鏇存柊鎬讳环鏍� + this.TotalPrice1 = 0; + this.DataList3.forEach((item) => { + this.TotalPrice1 += item.proPrice * item.sl; + }); + }); + } else if (checked === false) { + // 褰撳彇娑堥�変腑鏃� + let proId = data.proId; + getProSonDxList(proId).then((res) => { + this.TreedataList = res.data.list; + + // 閬嶅巻 TreedataList 骞剁Щ闄ょ浉鍏崇殑瀛愰」 ID + this.TreedataList.forEach((item) => { + this.checkedListkey = this.checkedListkey.filter( + (id) => id !== item.proId + ); + }); + + this.Datalists = this.Datalists.filter( + (item) => item.proParentId !== proId + ); + + // 浠� DataList3 涓Щ闄ょ浉鍏崇殑瀛愰」 + this.DataList3 = this.DataList3.filter( + (item) => item.proParentId !== proId + ); + + // 鏇存柊鎬讳环鏍� + this.TotalPrice1 = 0; + this.DataList3.forEach((item) => { + this.TotalPrice1 += item.proPrice * item.sl; + }); }); } }, @@ -1450,6 +2819,9 @@ this.DataList.forEach((item1) => { this.TotalPrice1 = item1.proPrice + this.TotalPrice1; }); + if (this.marryalls != 0) { + this.TotalPrice1 += this.marryalls; + } } }); } else if (checked == true) { @@ -1462,11 +2834,52 @@ this.spliceData(); this.TotalPrice1 = 0; this.DataList.forEach((item1) => { + console.log(item1.proPrice, 3322); + console.log(this.TotalPrice1, 1122); + this.TotalPrice1 = item1.proPrice + this.TotalPrice1; }); + if (this.marryalls != 0) { + this.TotalPrice1 += this.marryalls; + } } }, - + handleDel(row) { + this.Datalists.forEach((item, index) => { + if (item.proId == row.proId) { + this.Datalists.splice(index, 1); + this.marryalls = 0; + this.Datalists.forEach((item1) => { + this.marryalls += item1.proPrice; + }); + } + }); + 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) { this.DataList.forEach((item, index) => { @@ -1476,13 +2889,16 @@ this.DataList.forEach((item1) => { this.TotalPrice1 = item1.proPrice + this.TotalPrice1; }); + if (this.marryalls != 0) { + this.TotalPrice1 += this.marryalls; + } } }); }, // // 榛樿鎺ュ彈鍥涗釜鍊� { 褰撳墠琛岀殑鍊�, 褰撳墠鍒楃殑鍊�, 琛岀殑涓嬫爣, 鍒楃殑涓嬫爣 } objectSpanMethod({ row, column, rowIndex, columnIndex }) { - console.log(row, column, rowIndex, columnIndex); + // console.log(row, column, rowIndex, columnIndex); let fields = ["propinName"]; let cellValue = row[column.property]; if (cellValue && fields.includes(column.property)) { @@ -1502,11 +2918,59 @@ } }, + objectSpanMethod1({ row, column, rowIndex, columnIndex }) { + // console.log(row, column, rowIndex, columnIndex); + let fields = ["parent_pro_name"]; + let cellValue = row[column.property]; + if (cellValue && fields.includes(column.property)) { + let prevRow = this.infoList[rowIndex - 1]; + let nextRow = this.infoList[rowIndex + 1]; + if (prevRow && prevRow[column.property] === cellValue) { + return { rowspan: 0, colspan: 0 }; + } else { + let countRowspan = 1; + while (nextRow && nextRow[column.property] === cellValue) { + nextRow = this.infoList[++countRowspan + rowIndex]; + } + if (countRowspan > 1) { + return { rowspan: countRowspan, colspan: 1 }; + } + } + } + }, + + objectSpanMethod2({ row, column, rowIndex, columnIndex }) { + // console.log(row, column, rowIndex, columnIndex); + let fields = ["propinName"]; + let cellValue = row[column.property]; + if (cellValue && fields.includes(column.property)) { + let prevRow = this.DataListss[rowIndex - 1]; + let nextRow = this.DataListss[rowIndex + 1]; + if (prevRow && prevRow[column.property] === cellValue) { + return { rowspan: 0, colspan: 0 }; + } else { + let countRowspan = 1; + while (nextRow && nextRow[column.property] === cellValue) { + nextRow = this.DataListss[++countRowspan + rowIndex]; + } + if (countRowspan > 1) { + return { rowspan: countRowspan, colspan: 1 }; + } + } + } + }, + // 鏀惰垂鎸夐挳 submitPrice() { this.proIds = []; + this.isSubmit = true; if (this.DataList.length != 0) { this.DataList.forEach((item) => { + this.proIds.push(item.proId); + }); + } + if (this.Datalists.length != 0) { + this.Datalists.forEach((item) => { this.proIds.push(item.proId); }); } @@ -1516,6 +2980,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); @@ -1531,6 +2999,7 @@ payType: this.payType, }; getwater(data).then((res) => { + this.isSubmit = false; this.$modal.msgSuccess("鎻愪氦鎴愬姛"); this.mobanId = res.data.mobanId; this.waterId = res.data.waterId; @@ -1546,8 +3015,14 @@ // 鏀惰垂鎸夐挳 submitPrice1() { this.proIds = []; + this.isSubmit1 = true; if (this.DataList.length != 0) { this.DataList.forEach((item) => { + this.proIds.push(item.proId); + }); + } + if (this.Datalists.length != 0) { + this.Datalists.forEach((item) => { this.proIds.push(item.proId); }); } @@ -1555,8 +3030,13 @@ cusId: this.cusIds, proIds: this.proIds, }; - getaddtTransition(data).then((response) => { + getaddtTransition1(data).then((response) => { + console.log(123456789); + 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); @@ -1567,10 +3047,12 @@ discount, copeWith, tjType, + payStasus: this.jsType, orderId: this.orderIds, tjProIds: this.proIds, payType: this.payType, }; + getwater(data).then((res) => { this.$modal.msgSuccess("鎻愪氦鎴愬姛"); this.mobanId = res.data.mobanId; @@ -1580,31 +3062,58 @@ const params = { viewNum, tjnumber }; this.$tab.openPage("鏀舵灏忕エ", "/report/charge", params); this.Projectopen1 = false; + this.Projectopen = false; + this.isSubmit1 = false; }); } + this.isSubmit1 = false; + }); + }, + + handleProjectssChange(selection) { + this.DataListss = []; + this.selection = []; + + this.bldhs = selection.map((item) => item.bldh); + selection.forEach((item) => { + item.projectList.forEach((item1) => { + item1.children.forEach((item2) => { + this.DataListss.push(item2); + if (this.DataListss.length != 0) { + this.DataListss.forEach((item) => { + if (item.proParentId == item1.proId) + item.propinName = item1.proName; + }); + } + }); + }); }); }, /** 鎻愪氦鎸夐挳 */ - // submitForm() { - // this.$refs["form"].validate(valid => { - // if (valid) { - // if (this.form.orderId != null) { - // updateOrder(this.form).then(response => { - // this.$modal.msgSuccess("淇敼鎴愬姛"); - // this.open = false; - // this.getList(); - // }); - // } else { - // addOrder(this.form).then(response => { - // this.$modal.msgSuccess("鏂板鎴愬姛"); - // this.open = false; - // this.getList(); - // }); - // } - // } - // }); - // }, + submitForm() { + this.$confirm(" 鏄惁鎾ら攢璇ヨˉ褰曢」鐩�?", "鎻愮ず", { + confirmButtonText: "鏄�", + cancelButtonText: "鍚�", + type: "warning", + }) + .then(() => { + let data = { + tjh: this.tjnumbers, + bldhs: this.bldhs, + }; + revokeBlProByBldhAndTjh(data).then((res) => { + this.Projectssopen = false; + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "宸插彇娑堟挙閿�", + }); + this.Projectssopen = false; + }); + }, /** 瀵煎嚭鎸夐挳鎿嶄綔 */ handleExport() { @@ -1619,7 +3128,27 @@ }, }; </script> -<style lang="scss"> +<style lang="scss" scoped> +.custom-dialog { + /* 鑷畾涔夊脊鍑烘鐨勬渶灏忛珮搴� */ + min-height: 600px; /* 浠庨粯璁ら珮搴﹀鍔犲埌 600px锛屽彲浠ユ牴鎹渶瑕佽皟鏁� */ +} + +/* 璋冩暣 el-tabs 鐨勫唴瀹瑰尯鍩熼珮搴� */ +::v-deep .el-tabs__content { + min-height: 500px; /* 纭繚閫夐」鍗″唴瀹瑰尯鍩熸湁瓒冲楂樺害 */ +} + +/* 璋冩暣瀵硅瘽妗嗙殑涓讳綋閮ㄥ垎 */ +::v-deep .el-dialog__body { + padding: 20px; +} + +/* 鍙�夛細璋冩暣 footer 鐨勬牱寮� */ +.dialog-footer { + padding: 10px 20px; + text-align: right; +} .pag { width: 100%; display: flex; @@ -1670,15 +3199,29 @@ // .el-dialog__body { // padding: 20px; // } - +::v-deep .el-message-box__message { + color: red !important; /* 寮哄埗璁剧疆棰滆壊涓虹孩鑹� */ +} +// .custom-message-box .el-message-box__message { +// color: red !important; /* 璁剧疆鏂囧瓧涓虹孩鑹� */ +// } +.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; } @@ -1688,4 +3231,37 @@ 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; +} + +::v-deep .el-step__title.is-process { + color: rgb(24, 144, 255); +} +::v-deep .el-step__head.is-process { + color: rgb(24, 144, 255); + border-color: rgb(24, 144, 255); +} +.shijian { + display: flex; + align-items: flex-start; +} </style> -- Gitblit v1.8.0