From ac6766c11f8a2b8de903b58c13a8f206fa01dccd Mon Sep 17 00:00:00 2001 From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com> Date: 星期五, 15 三月 2024 17:56:32 +0800 Subject: [PATCH] qxtj --- src/views/hosp/order/index.vue | 621 +++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 497 insertions(+), 124 deletions(-) diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue index 6746f97..8aabe19 100644 --- a/src/views/hosp/order/index.vue +++ b/src/views/hosp/order/index.vue @@ -1,18 +1,48 @@ <template> <div class="app-container"> - <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> + <el-form + :model="queryParams" + ref="queryForm" + size="small" + :inline="true" + v-show="showSearch" + label-width="68px" + > <el-form-item label="濮撳悕" prop="name"> - <el-input ref="inputName" v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" style="width: 120px" clearable - @keyup.enter.native="handleQuery" /> + <el-input + ref="inputName" + v-model="queryParams.name" + placeholder="璇疯緭鍏ュ鍚�" + style="width: 120px" + clearable + @keyup.enter.native="handleQuery" + /> </el-form-item> <el-form-item label="浣撴鍙�" prop="tjNum"> - <el-input ref="inputName" v-model="queryParams.tjNum" placeholder="璇疯緭鍏ヤ綋妫�鍙�" style="width: 170px" clearable - @keyup.enter.native="handleQuery" /> + <el-input + ref="inputName" + v-model="queryParams.tjNum" + placeholder="璇疯緭鍏ヤ綋妫�鍙�" + style="width: 170px" + clearable + @keyup.enter.native="handleQuery" + @blur="hb" + /> </el-form-item> <el-form-item label="鐧昏鏃堕棿" prop="createTimeList"> - <el-date-picker v-model="createTimeList" type="datetimerange" align="right" :picker-options="pickerOptions" - style="width: 300px" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" :default-time="['00:00:00', '23:00:00']" - format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" @change="dateChangebirthday1"> + <el-date-picker + v-model="createTimeList" + type="datetimerange" + align="right" + :picker-options="pickerOptions" + style="width: 300px" + start-placeholder="寮�濮嬫棩鏈�" + end-placeholder="缁撴潫鏃ユ湡" + :default-time="['00:00:00', '23:59:00']" + format="yyyy-MM-dd HH:mm" + value-format="yyyy-MM-dd HH:mm" + @change="dateChangebirthday1" + > </el-date-picker> </el-form-item> <!-- <el-form-item label="鐧昏鏃堕棿" prop="createTime"> @@ -26,68 +56,183 @@ </el-date-picker> </el-form-item> --> <el-form-item label="鎶ュ憡鏃堕棿" prop="reportTimeList"> - <el-date-picker clearable v-model="reportTimeList" @change="dateChangebirthday2" type="daterange" - range-separator="-" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" :picker-options="pickerOptions" - value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鍑烘姤鍛婃椂闂�" style="width: 240px"> + <el-date-picker + clearable + v-model="reportTimeList" + @change="dateChangebirthday2" + type="daterange" + range-separator="-" + start-placeholder="寮�濮嬫棩鏈�" + end-placeholder="缁撴潫鏃ユ湡" + :picker-options="pickerOptions" + value-format="yyyy-MM-dd" + placeholder="璇烽�夋嫨鍑烘姤鍛婃椂闂�" + style="width: 240px" + > </el-date-picker> </el-form-item> <el-form-item> - <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button> - <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button> + <el-button + type="primary" + icon="el-icon-search" + size="mini" + @click="handleQuery" + >鎼滅储</el-button + > + <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" + >閲嶇疆</el-button + > </el-form-item> </el-form> <el-row :gutter="10" class="mb8"> <el-col :span="1.5"> - <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['hosp:order:export']">瀵煎嚭</el-button> + <el-button + type="primary" + icon="el-icon-download" + size="mini" + @click="handleExport" + v-hasPermi="['hosp:order:export']" + >瀵煎嚭</el-button + > </el-col> <el-col :span="1.5"> - <el-button type="primary" size="mini" @click="handleProject1" :disabled="single" - v-hasPermi="['hosp:order:export']">琛ュ綍椤圭洰</el-button> + <el-button + type="primary" + size="mini" + @click="handleProject1" + :disabled="single" + v-hasPermi="['hosp:order:export']" + >琛ュ綍椤圭洰</el-button + > </el-col> <el-col :span="1.5"> - <el-button type="primary" size="mini" @click="handleReport1" :disabled="single" - v-hasPermi="['hosp:order:export']">鎵撳嵃瀵艰瘖鍗�</el-button> + <el-button + type="primary" + size="mini" + @click="handleReport1" + :disabled="single" + v-hasPermi="['hosp:order:export']" + >鎵撳嵃瀵艰瘖鍗�</el-button + > </el-col> <el-col :span="1.5"> - <el-button type="primary" size="mini" @click="handleUpdate1" :disabled="single" - v-hasPermi="['hosp:order:export']">璁㈠崟鏄庣粏</el-button> + <el-button + type="primary" + size="mini" + @click="handleUpdate1" + :disabled="single" + v-hasPermi="['hosp:order:export']" + >璁㈠崟鏄庣粏</el-button + > </el-col> - <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> + <right-toolbar + :showSearch.sync="showSearch" + @queryTable="getList" + ></right-toolbar> </el-row> <template> - <el-table border v-loading="loading" :data="orderList" @selection-change="handleSelectionChange"> - <el-table-column type="selection" width="40px" align="center" fixed="left" /> + <el-table + border + v-loading="loading" + :data="orderList" + @selection-change="handleSelectionChange" + > + <el-table-column + type="selection" + width="40px" + align="center" + fixed="left" + /> <!-- <el-table-column label="涓婚敭id" align="center" prop="orderId" /> --> <!-- <el-table-column label="鐢ㄦ埛id" align="center" prop="userId" /> --> - <el-table-column label="搴忓彿" align="center" prop="newID" width="50px" fixed="left" /> - <el-table-column label="濮撳悕" align="center" prop="tjCustomerName" fixed="left" width="100px" - :show-overflow-tooltip="true" /> - <el-table-column label="鎬у埆" align="center" prop="tjCustomerSex" width="50px" :show-overflow-tooltip="true"> + <el-table-column + label="搴忓彿" + align="center" + prop="newID" + width="50px" + fixed="left" + /> + <el-table-column + label="濮撳悕" + align="center" + prop="tjCustomerName" + fixed="left" + width="100px" + :show-overflow-tooltip="true" + /> + <el-table-column + label="鎬у埆" + align="center" + prop="tjCustomerSex" + width="50px" + :show-overflow-tooltip="true" + > <template slot-scope="scope"> <span v-if="scope.row.tjCustomerSex == '0'">鐢�</span> <span v-if="scope.row.tjCustomerSex == '1'">濂�</span> + <span v-if="scope.row.tjCustomerSex == '2'">鏈煡</span> </template> </el-table-column> - <el-table-column label="骞撮緞" align="center" prop="tjCustomerAge" width="55px" :show-overflow-tooltip="true" /> - <el-table-column label="鐢佃瘽" align="center" prop="tjCustomerPhone" :show-overflow-tooltip="true" width="110px" /> - <el-table-column label="浣撴绫诲瀷" align="center" prop="tjType" width="80px" :show-overflow-tooltip="true"> + <el-table-column + label="骞撮緞" + align="center" + prop="tjCustomerAge" + width="55px" + :show-overflow-tooltip="true" + /> + <el-table-column + label="鐢佃瘽" + align="center" + prop="tjCustomerPhone" + :show-overflow-tooltip="true" + width="110px" + /> + <el-table-column + label="浣撴绫诲瀷" + align="center" + prop="tjType" + width="80px" + :show-overflow-tooltip="true" + > <template slot-scope="scope"> <span v-if="scope.row.tjType == '2'">涓汉</span> <span v-if="scope.row.tjType == '1'">鍥㈤槦</span> </template> </el-table-column> - <el-table-column label="浣撴鍙�" align="center" prop="tjNumber" :show-overflow-tooltip="true" width="160px" /> + <el-table-column + label="浣撴鍙�" + align="center" + prop="tjNumber" + :show-overflow-tooltip="true" + width="160px" + /> <!-- <el-table-column label="娴佹按鍙�" align="center" prop="tjSerialNumber" /> --> - <el-table-column label="鎵�閫夊椁�" align="center" prop="pacName" :show-overflow-tooltip="true" /> - <el-table-column label="鐧昏鏃堕棿" align="center" prop="createTime" width="155px" :show-overflow-tooltip="true"> + <el-table-column + label="鎵�閫夊椁�" + align="center" + prop="pacName" + :show-overflow-tooltip="true" + /> + <el-table-column + label="鐧昏鏃堕棿" + align="center" + prop="createTime" + width="155px" + :show-overflow-tooltip="true" + > <template slot-scope="scope"> <span>{{ parseTime(scope.row.createTime) }}</span> </template> </el-table-column> - <el-table-column label="瀹屾垚鏃堕棿" align="center" prop="finishTime" width="155px" :show-overflow-tooltip="true"> + <el-table-column + label="瀹屾垚鏃堕棿" + align="center" + prop="finishTime" + width="155px" + :show-overflow-tooltip="true" + > <!-- <template slot-scope="scope"> <span>{{ parseTime(scope.row.finishTime) }}</span> </template> --> @@ -97,16 +242,33 @@ <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span> </template> </el-table-column> --> - <el-table-column label="鎶ュ憡鏃堕棿" align="center" prop="reportTime" width="155px" height="10px" - :show-overflow-tooltip="true"> + <el-table-column + label="鎶ュ憡鏃堕棿" + align="center" + prop="reportTime" + width="155px" + height="10px" + :show-overflow-tooltip="true" + > <!-- <template slot-scope="scope"> <span>{{ parseTime(scope.row.reportTime) }}</span> </template> --> </el-table-column> <!-- <el-table-column label="鍒涘缓浜�" align="center" prop="createBy" /> --> <!-- <el-table-column label="鏇存柊浜�" align="center" prop="updateBy" /> --> - <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="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" /> --> @@ -117,13 +279,31 @@ }}</span> </template> </el-table-column> --> - <el-table-column fixed="right" label="鎿嶄綔" align="center" class-name="small-padding fixed-width" height="10px" - width="114px"> + <el-table-column + fixed="right" + label="鎿嶄綔" + align="center" + class-name="small-padding fixed-width" + height="10px" + width="114px" + > <template slot-scope="scope"> - <el-button size="mini" type="text" icon="el-icon-document" @click="handleUpdate(scope.row)" - v-hasPermi="['hosp:order:edit']" title="璁㈠崟娴佹按"></el-button> - <el-button size="mini" type="text" icon="el-icon-edit" @click="handleProject(scope.row)" - v-hasPermi="['hosp:order:edit']" title="琛ュ綍椤圭洰"></el-button> + <el-button + size="mini" + type="text" + icon="el-icon-document" + @click="handleUpdate(scope.row)" + v-hasPermi="['hosp:order:edit']" + title="璁㈠崟娴佹按" + ></el-button> + <el-button + size="mini" + type="text" + icon="el-icon-edit" + @click="handleProject(scope.row)" + v-hasPermi="['hosp:order:edit']" + title="琛ュ綍椤圭洰" + ></el-button> <!-- <el-button type="text" size="mini" class="btn" icon="el-icon-download" title="涓嬭浇瀵艰瘖鍗�" @click=" daoZhenDan, LoadFileImg(scope.row); @@ -150,8 +330,14 @@ @click="viewReport(scope.row)" ></el-button> --> - <el-button type="text" size="mini" class="btn" icon="el-icon-download" title="瀵艰瘖鍗�" - @click="handleReport(scope.row)"></el-button> + <el-button + type="text" + size="mini" + class="btn" + icon="el-icon-download" + title="瀵艰瘖鍗�" + @click="handleReport(scope.row)" + ></el-button> <!-- <button @click="downLoadFileImg(scope.row)">鏌ョ湅鎶ュ憡</button> --> </template> @@ -161,9 +347,16 @@ <div class="pag"> <div class="pag1"> - <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" - :current-page="queryParams.pageNum" :page-sizes="[10, 20, 30, 40]" :page-size="queryParams.pageSize" - layout="total, sizes, prev, pager, next, jumper" :total="total"> + <el-pagination + background + @size-change="handleSizeChange" + @current-change="handleCurrentChange" + :current-page="queryParams.pageNum" + :page-sizes="[10, 20, 30, 40]" + :page-size="queryParams.pageSize" + layout="total, sizes, prev, pager, next, jumper" + :total="total" + > </el-pagination> <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" /> --> @@ -185,27 +378,65 @@ </span> </el-dialog> --> - <el-dialog title="PDF 棰勮" :visible.sync="dialogVisible" :close-on-click-modal="false"> + <el-dialog + title="PDF 棰勮" + :visible.sync="dialogVisible" + :close-on-click-modal="false" + > <div class="main"> - <iframe id="printIframe" :src="url" frameborder="0" style="width: 100%; height: 100%"></iframe> + <iframe + id="printIframe" + :src="url" + frameborder="0" + style="width: 100%; height: 100%" + ></iframe> </div> </el-dialog> - <el-dialog title="瀵艰瘖鍗�" :visible.sync="daoZhenDan" :close-on-click-modal="false"> + <el-dialog + title="瀵艰瘖鍗�" + :visible.sync="daoZhenDan" + :close-on-click-modal="false" + > <div class="main"> - <iframe id="printIframe" :src="url" frameborder="0" style="width: 100%; height: 100%"></iframe> + <iframe + id="printIframe" + :src="url" + frameborder="0" + style="width: 100%; height: 100%" + ></iframe> </div> </el-dialog> <!-- 娣诲姞琛ュ綍椤圭洰 --> - <el-dialog :title="title" :visible.sync="Projectopen" width="980px" style="height: 860px" append-to-body> + <el-dialog + :title="title" + :visible.sync="Projectopen" + width="1200px" + style="height: 860px" + append-to-body + > <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> + <div + style="text-align: center; margin-bottom: 10px; margin-top: 10px" + > + 椤圭洰鍒楄〃 + </div> + <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText"> + </el-input> <div class="tab3"> <div class="outside1"> - <el-tree :data="Treedata" show-checkbox node-key="proId" :props="defaultProps" - @check-change="handleCurrentChecked"> + <el-tree + v-loading="loading" + :data="Treedata" + show-checkbox + node-key="proId" + :props="defaultProps" + @check-change="handleCurrentChecked" + :filter-node-method="filterNode" + ref="tree" + > </el-tree> </div> </div> @@ -227,43 +458,81 @@ <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-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-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-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 + 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="submitPrice" :disabled="confirm" - style="margin-top: 34px">鏀惰垂</el-button> + <el-button + type="primary" + @click="submitPrice" + :disabled="confirm" + style="margin-top: 34px" + >鏀惰垂</el-button + > </el-form-item> </el-form> </div> <div style="text-align: center; margin-bottom: 10px"> 宸查�夐」鐩垪琛� </div> - <div style=" + <div + style=" padding: 0px 6px; border: 1px solid #e6ebf5; max-height: 420px; overflow: auto; - "> + " + > <el-collapse v-model="activeName" accordion> <div v-for="(item, index) in DataList" :key="index"> <el-collapse-item> <template slot="title"> {{ item.proName + "(" + "鍘熶环" + item.proPrice + ")" }} </template> - <el-table :data="item.tjProjectList" border style="width: 100%" height="250"> - <el-table-column prop="proName" label="椤圭洰" width="180"> + <el-table + :data="item.tjProjectList" + border + style="width: 100%" + height="250" + > + <el-table-column + prop="proName" + label="椤圭洰" + width="180" + > </el-table-column> <el-table-column prop="proPrice" label="鍘熶环"> </el-table-column> @@ -275,7 +544,11 @@ <div> <el-collapse-item title="璇烽�夋嫨椤圭洰"> <el-table :data="DataList" border style="width: 100%"> - <el-table-column prop="proName" label="椤圭洰" width="180"> + <el-table-column + prop="proName" + label="椤圭洰" + width="180" + > </el-table-column> <el-table-column prop="ordPrice" label="鍘熶环"> </el-table-column> @@ -291,20 +564,41 @@ </el-dialog> <!-- 娣诲姞琛ュ綍椤圭洰 --> - <el-dialog :title="title" :visible.sync="Projectopen1" width="980px" style="height: 860px" append-to-body> + <el-dialog + :title="title" + :visible.sync="Projectopen1" + width="1200px" + style="height: 860px" + append-to-body + > <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-col :span="8"> + <div + style="text-align: center; margin-bottom: 10px; margin-top: 10px" + > + 椤圭洰鍒楄〃 + </div> + <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText"> + </el-input> <div class="tab3"> <div class="outside1"> - <el-tree :data="Treedata" show-checkbox node-key="proId" :props="defaultProps" - @check-change="handleCurrentChecked"> + <el-tree + class="filter-tree" + v-loading="loading" + :data="Treedata" + show-checkbox + node-key="proId" + :props="defaultProps" + @check-change="handleCurrentChecked" + :filter-node-method="filterNode" + ref="tree" + > </el-tree> </div> </div> </el-col> - <el-col :span="18"> + <el-col :span="15"> <div class="grid-content bg-purple"> <template> <el-form :model="form"> @@ -320,42 +614,76 @@ <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-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-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-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 + 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-button + type="primary" + @click="submitPrice1" + :disabled="confirm" + style="margin-top: 34px" + >鏀惰垂</el-button + > </el-form-item> </el-form> </div> <div style="text-align: center; margin-bottom: 10px"> 宸查�夐」鐩垪琛� </div> - <div style=" + <div + style=" padding: 0px 6px; border: 1px solid #e6ebf5; max-height: 420px; overflow: auto; - "> + " + > <el-collapse v-model="activeName" accordion> <div v-for="(item, index) in DataList" :key="index"> <el-collapse-item> <template slot="title"> {{ item.proName + "(" + "鍘熶环" + item.proPrice + ")" }} </template> - <el-table :data="item.tjProjectList" border style="width: 100%" height="250"> + <el-table + :data="item.tjProjectList" + border + style="width: 100%" + height="250" + > <el-table-column prop="proName" label="椤圭洰" width="180"> </el-table-column> <el-table-column prop="proPrice" label="鍘熶环"> @@ -426,14 +754,13 @@ <script> import { - listOrder, getNumber, - hasReportEnd, hasReport, - gettoPdf, getPdf, getOrderList, + getNewDateList, } from "@/api/hosp/order"; +import moment from "moment"; import { getwater } from "@/api/hosp/customer"; import ViewPdf from "@/components/ViewPdf"; import { projectGetList, getaddtTransition } from "@/api/system/tijian"; @@ -445,6 +772,7 @@ name: "Order", data() { return { + filterText: "", orderIds: "", tjnumbers: "", cusIds: "", @@ -553,9 +881,15 @@ }, }; }, + watch: { + filterText(val) { + this.$refs.tree.filter(val); + }, + }, created() { - this.getNowTime(); - this.getList(); + // this.getNowTime(); + + this.getdate(); }, mounted() { this.$nextTick(() => { @@ -563,37 +897,53 @@ }); }, methods: { + getdate() { + getNewDateList().then((res) => { + if(res.data){ + this.createTimeList = [ + moment(res.data).format("YYYY-MM-DD 00:00:00"), + moment(res.data).format("YYYY-MM-DD 23:59:00") + ]; + this.getList(); + } + + }); + }, + filterNode(value, data) { + if (!value) return true; + return data.proName.indexOf(value) !== -1; + }, // / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡 - getNowTime() { - var curDate = new Date(new Date().setHours(0, 0, 0, 0)).getTime(); - var dayNum = 7 * 24 * 3600 * 1000; - var threeDays = curDate - dayNum; - var sDay = this.getLocalTime(threeDays); - var end = this.getLocalTime(curDate); - this.createTimeList = [sDay, end]; - }, - add0(m) { - return m < 10 ? "0" + m : m; - }, - getLocalTime(nS) { - var time = new Date(nS); - var y = time.getFullYear(); - var m = time.getMonth() + 1; - var d = time.getDate(); - var h = time.getHours(); - var mm = time.getMinutes(); - return ( - y + - "-" + - this.add0(m) + - "-" + - this.add0(d) + - " " + - this.add0(h) + - ":" + - this.add0(mm) - ); - }, + // getNowTime() { + // var curDate = new Date(new Date().setHours(0, 0, 0, 0)).getTime(); + // var dayNum = 7 * 24 * 3600 * 1000; + // var threeDays = curDate - dayNum; + // var sDay = this.getLocalTime(threeDays); + // var end = this.getLocalTime(curDate); + // this.createTimeList = [sDay, end]; + // }, + // add0(m) { + // return m < 10 ? "0" + m : m; + // }, + // getLocalTime(nS) { + // var time = new Date(nS); + // var y = time.getFullYear(); + // var m = time.getMonth() + 1; + // var d = time.getDate(); + // var h = time.getHours(); + // var mm = time.getMinutes(); + // return ( + // y + + // "-" + + // this.add0(m) + + // "-" + + // this.add0(d) + + // " " + + // this.add0(h) + + // ":" + + // this.add0(mm) + // ); + // }, dateChangebirthday1(val) { this.startTime = val; }, @@ -605,6 +955,9 @@ if (this.startTime) { this.queryParams.djbeginTime = this.startTime[0]; this.queryParams.djendTime = this.startTime[1]; + }else{ + this.queryParams.djbeginTime = this.createTimeList[0]; + this.queryParams.djendTime = this.createTimeList[1]; } if (this.startTime1) { this.queryParams.bgbeginTime = this.startTime1[0]; @@ -711,6 +1064,7 @@ }, // 琛ㄥ崟閲嶇疆 reset() { + this.form = { orderId: null, userId: null, @@ -736,6 +1090,11 @@ }; this.resetForm("form"); }, + hb() { + if (this.queryParams.tjNum != undefined) { + this.handleQuery(); + } + }, /** 鎼滅储鎸夐挳鎿嶄綔 */ handleQuery() { this.queryParams.pageNum = 1; @@ -743,6 +1102,9 @@ }, /** 閲嶇疆鎸夐挳鎿嶄綔 */ resetQuery() { + this.startTime = [] + this.startTime1 = [] + this.createTimeList = [] this.resetForm("queryForm"); this.handleQuery(); }, @@ -795,6 +1157,7 @@ // 琛ュ綍椤圭洰 handleProject(row) { + this.loading = true; this.orderId = row.orderId; this.cusId = row.tjCusIdCard; this.userId = row.userId; @@ -812,12 +1175,14 @@ /** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */ projectGetList().then((response) => { this.Treedata = response.data.list; + this.loading = false; }); this.Projectopen = true; this.title = "琛ュ綍椤圭洰"; }, // 琛ュ綍椤圭洰 handleProject1(row) { + this.loading = true; this.orderId = this.ids; this.cusId = this.cusIds; this.userId = this.userIds; @@ -835,6 +1200,7 @@ /** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */ projectGetList().then((response) => { this.Treedata = response.data.list; + this.loading = false; }); this.Projectopen1 = true; this.title = "琛ュ綍椤圭洰"; @@ -870,7 +1236,9 @@ this.list1 = false; this.DataList.forEach((item) => { this.TotalPrice1 = item.proPrice + this.TotalPrice1; - this.proIds.push(item.proId); + item.tjProjectList.forEach((item1) => { + this.proIds.push(item1.proId); + }); }); } }, @@ -1047,6 +1415,11 @@ margin-top: 8px; } +.tab3 { + max-height: 500px; + overflow-y: auto; +} + .outside1 { width: 700px; display: flex; -- Gitblit v1.8.0