From a9929166ee6f4def812519684a739336c7202531 Mon Sep 17 00:00:00 2001 From: qx <1084500556@qq.com> Date: 星期四, 12 六月 2025 16:53:07 +0800 Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb_region --- src/views/hosp/order/index.vue | 1189 ++++++++++++++++++++++++++++++---------------------------- 1 files changed, 616 insertions(+), 573 deletions(-) diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue index 9f61da4..e883655 100644 --- a/src/views/hosp/order/index.vue +++ b/src/views/hosp/order/index.vue @@ -1,174 +1,180 @@ <template> - <div class="app-container"> - <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: 150px" 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: 150px" clearable - @keyup.enter.native="handleQuery" @blur="hb" /> - </el-form-item> - <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" 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"> + <div v-loading="isLoading" element-loading-text="姝e湪鎻愪氦锛岃绋嶅��..." element-loading-spinner="el-icon-loading" + element-loading-background="rgba(255, 255, 255, 0.8)" style="height: 100%; padding: 20px; position: relative;"> + <div class="app-container"> + <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: 150px" 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: 150px" clearable + @keyup.enter.native="handleQuery" @blur="hb" /> + </el-form-item> + <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" 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"> <el-date-picker clearable v-model="queryParams.createTime" type="date" value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鐧昏鏃堕棿"> </el-date-picker> </el-form-item> --> - <!-- <el-form-item label="瀹屾垚鏃堕棿" prop="finishTimeList"> + <!-- <el-form-item label="瀹屾垚鏃堕棿" prop="finishTimeList"> <el-date-picker clearable v-model="queryParams.finishTimeList" 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 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> - </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-form-item> - </el-form> + <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> + </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-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> + <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 type="primary" icon="el-icon-download" size="mini" @click="handleExport" :disabled="singles" - v-hasPermi="['hosp:order:export']">瀵煎嚭</el-button> - </el-col> + <el-row :gutter="10" class="mb8"> + <el-col :span="1.5"> + <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport" :disabled="singles" + v-hasPermi="['hosp:order:export']">瀵煎嚭</el-button> + </el-col> - <el-col :span="1.5"> - <el-button type="primary" size="mini" @click="handleRevoke" :loading="isLoading" - :disabled="single">鎾ら攢绛惧埌</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-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> + + <el-col :span="1.5"> + <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="revokeProject" :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-col> - <el-col :span="1.5"> - <el-button type="primary" size="mini" @click="handleUpdate1" :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> - <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"></right-toolbar> - </el-row> + <el-col :span="1.5"> + <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-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 style="background-color:#E6A23C;color:#fff" + size="mini" @click="handleRevoke" :disabled="single">鎾ら攢绛惧埌</el-button> + </el-col> + <el-col :span="1.5"> + <el-button style="background-color:#E6A23C;color:#fff" size="mini" @click="ForceChexiao" :disabled="single" + v-hasPermi="['qzcx']">寮哄埗鎾ら攢</el-button> + </el-col> + <el-col :span="1.5"> + <el-button style="background-color:#E6A23C;color:#fff" size="mini" @click="ResumeAppointment" :disabled="multiple">鎭㈠棰勭害</el-button> + </el-col> + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> + </el-row> - <template> - <el-table border v-loading="loading" :data="orderList" ref="tableRef" @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="90px" - :show-overflow-tooltip="true" /> - <el-table-column label="韬唤璇佸彿" align="center" prop="tjCusIdCard" fixed="left" width="180px" - :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"> - <template slot-scope="scope"> - <dict-tag :options="dict.type.dict_team" :value="scope.row.tjType" /> - <!-- <span v-if="scope.row.tjType == '2'">涓汉</span> + <template> + <el-table border v-loading="loading" :data="orderList" ref="tableRef" @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="90px" + :show-overflow-tooltip="true" /> + <el-table-column label="韬唤璇佸彿" align="center" prop="tjCusIdCard" fixed="left" width="180px" + :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"> + <template slot-scope="scope"> + <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 label="浣撴鍙�" align="center" prop="tjNumber" :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" 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"> - <!-- <template slot-scope="scope"> + </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="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" 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"> + <!-- <template slot-scope="scope"> <span>{{ parseTime(scope.row.finishTime) }}</span> </template> --> - </el-table-column> - <!-- <el-table-column label="鏇存柊鏃堕棿" align="center" prop="updateTime" width="180"> + </el-table-column> + <!-- <el-table-column label="鏇存柊鏃堕棿" align="center" prop="updateTime" width="180"> <template slot-scope="scope"> <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"> - <!-- <template slot-scope="scope"> + <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 + </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" @@ -176,32 +182,32 @@ :show-overflow-tooltip="true" /> --> - <!-- <el-table-column label="閮ㄩ棬鍚�" align="center" prop="firmDeptName" /> --> + <!-- <el-table-column label="閮ㄩ棬鍚�" align="center" prop="firmDeptName" /> --> - <!-- <el-table-column label="瀹㈡埛鐓х墖" align="center" prop="photo" /> --> - <!-- <el-table-column prop="checkStatus" label="瀹℃牳鐘舵��" width="180"> + <!-- <el-table-column label="瀹㈡埛鐓х墖" align="center" prop="photo" /> --> + <!-- <el-table-column prop="checkStatus" label="瀹℃牳鐘舵��" width="180"> <template slot-scope="scope"> <span>{{ scope.row.checkStatus == "1" ? "宸插鏍�" : "寰呭鏍�" }}</span> </template> </el-table-column> --> - <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 type="text" size="mini" class="btn" icon="el-icon-download" title="涓嬭浇瀵艰瘖鍗�" @click=" + <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 type="text" size="mini" class="btn" icon="el-icon-download" title="涓嬭浇瀵艰瘖鍗�" @click=" daoZhenDan, LoadFileImg(scope.row); "></el-button> --> - <!-- <el-button type="text" size="mini" class="btn" icon="el-icon-view" title="鏌ョ湅鎶ュ憡" @click=" + <!-- <el-button type="text" size="mini" class="btn" icon="el-icon-view" title="鏌ョ湅鎶ュ憡" @click=" dialogVisible, downLoadFileImg(scope.row); "></el-button> --> - <!-- <el-button + <!-- <el-button type="text" size="mini" class="btn" @@ -209,7 +215,7 @@ title="浣撴鎶ュ憡" @click="viewReport(scope.row)" ></el-button> --> - <!-- <el-button + <!-- <el-button type="text" size="mini" class="btn" @@ -219,28 +225,28 @@ @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> - </el-table-column> - </el-table> - </template> + <!-- <button @click="downLoadFileImg(scope.row)">鏌ョ湅鎶ュ憡</button> --> + </template> + </el-table-column> + </el-table> + </template> - <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> - <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" + <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> + <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" /> --> + </div> </div> - </div> - <!-- 璁㈠崟娴佹按瀵硅瘽妗� --> - <!-- <el-dialog title="鎻愮ず" :visible.sync="dialogVisible" width="1500px " > + <!-- 璁㈠崟娴佹按瀵硅瘽妗� --> + <!-- <el-dialog title="鎻愮ず" :visible.sync="dialogVisible" width="1500px " > <el-table :data="tableData" style="width: 100%"> <el-table-column prop="date" label="鏃ユ湡" width="180"> </el-table-column> @@ -254,33 +260,33 @@ </span> </el-dialog> --> - <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> - </div> - </el-dialog> + <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> + </div> + </el-dialog> - <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> - </div> - </el-dialog> + <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> + </div> + </el-dialog> - <!-- 娣诲姞琛ュ綍椤圭洰 --> - <el-dialog :title="title" :visible.sync="Projectopen" 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"> - <!-- <div + <!-- 娣诲姞琛ュ綍椤圭洰 --> + <el-dialog :title="title" :visible.sync="Projectopen" 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"> + <!-- <div style=" text-align: center; margin-bottom: 10px; @@ -289,16 +295,16 @@ > 椤圭洰鍒楄〃 </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"> + <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; @@ -320,15 +326,15 @@ </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 + <!-- <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; @@ -337,17 +343,17 @@ > 椤圭洰鍒楄〃 </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"> + <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; @@ -375,7 +381,7 @@ </div> </div> </el-col> --> - <!-- <el-col :span="11"> + <!-- <el-col :span="11"> <div class="grid-content bg-purple"> <div style=" @@ -423,7 +429,7 @@ </template> </el-table-column> </el-table> --> - <!-- <el-collapse v-model="activeName" accordion v-if="list1"> + <!-- <el-collapse v-model="activeName" accordion v-if="list1"> <div> <el-collapse-item title="璇烽�夋嫨椤圭洰"> <el-table @@ -445,210 +451,210 @@ </el-collapse-item> </div> </el-collapse> --> - <!-- </div> + <!-- </div> </el-col> --> - </el-row> - </div> - </el-tab-pane> - </el-tabs> + </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> + </el-dialog> + + <!-- 娣诲姞琛ュ綍椤圭洰 --> + <el-dialog :title="title" :visible.sync="Projectopen1" 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> - <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-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-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> + <!-- 鍘熶环 --> + <el-form-item label="鍘熶环" style="display: flex"> + <el-input placeholder="鍘熶环" :value="TotalPrice1" disabled style="width: 90px"></el-input> + </el-form-item> - <!-- <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 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" disabled style="width: 90px"></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="鎶樻墸" style="display: flex"> - <el-input style="width: 90px" type="number" v-model="discount" :value="discount"></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="搴斾粯" style="display: flex"> - <el-input placeholder="搴斾粯閲戦" :value="TotalPrice1 * (discount / 10)" style="width: 90px"></el-input> - </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 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" :loading="isSubmit1" @click="submitPrice1" :disabled="confirm"> + 鎻愪氦 + </el-button> + </el-form-item> + </el-form> - <!-- 缁撶畻鏂瑰紡 --> - <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> - - <!-- 娣诲姞琛ュ綍椤圭洰 --> - <el-dialog :title="title" :visible.sync="Projectopen1" 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="heji"> <div class="o"> <el-form :model="form" @@ -729,12 +735,12 @@ </el-form> </div> </div> --> - </el-dialog> + </el-dialog> - <!-- 娣诲姞鎴栦慨鏀逛綋妫�璁板綍瀵硅瘽妗� --> - <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-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%"> <el-table-column prop="proName" label="椤圭洰/鑰楁潗" width="300"> </el-table-column> @@ -769,146 +775,147 @@ </el-table-column> </el-table> </el-tab-pane> --> - <el-tab-pane label="椤圭洰姹囨��" name="second" style="height: 400px"> - <el-table :data="huizongList" style="width: 100%" max-height="200"> - <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: 350px"> - <el-table :data="infoList" style="width: 100%" max-height="330" :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="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-tab-pane label="椤圭洰姹囨��" name="second" style="height: 400px"> + <el-table :data="huizongList" style="width: 100%" max-height="200"> + <el-table-column align="center" type="index" label="搴忓彿" width="50"> </el-table-column> - <el-table-column prop="blje" label="琛ュ綍閲戦" align="center" width="74px"> + <el-table-column align="center" prop="parent_pro_name" label="椤圭洰"> </el-table-column> - <el-table-column prop="bldh" label="琛ュ綍鍗曞彿" align="center" width="155px"> + <el-table-column align="center" prop="ks" label="绉戝"> </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 align="center" prop="price" label="璐圭敤鍚堣"> </el-table-column> </el-table> - </div> - </el-col> + <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: 350px"> + <el-table :data="infoList" style="width: 100%" max-height="330" :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-col :span="10"> - <div class="grid-content bg-purple"> + <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="13"> <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="submitForm">鎾� 閿�</el-button> - <!-- <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> - <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="submitForm">鎾� 閿�</el-button> + <!-- <el-button @click="cancel">鍙� 娑�</el-button> --> + </div> + </el-dialog> - <el-col :span="10"> - <div class="grid-content bg-purple"> + <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> - <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 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> </div> </template> @@ -1357,7 +1364,9 @@ // 寮哄埗鎾ら攢鎸夐挳 ForceChexiao() { + const tjNum = this.tjnumbers; + this.isLoading = true this.$confirm( "鎮ㄦ槸鍚﹂渶瑕佸己鍒舵挙閿�锛熸挙閿�鍚庤浜哄憳鏈浣撴璁板綍涓嶅彲鎭㈠锛�", "纭淇℃伅", @@ -1370,12 +1379,26 @@ ) .then(() => { + getForceChexiao(tjNum).then((res) => { - this.$modal.msgSuccess("鎾ら攢鎴愬姛"); - this.getList(); + + if (res.code == 200) { + this.$modal.msgSuccess("鎾ら攢鎴愬姛"); + this.isLoading = false + this.getList(); + } + + }).catch(() => { + console.log("鍔犺浇澶辫触") + this.isLoading = false; + }).finally(() => { + console.log("鍔犺浇澶辫触") + // 涓嶈鎿嶄綔鎴愬姛杩樻槸澶辫触锛岄兘浼氭墽琛� + this.isLoading = false; }); }) .catch((action) => { + this.isLoading = false if (action === "cancel") { this.$message({ type: "warning", @@ -1403,13 +1426,23 @@ }) .then(() => { huifuyuyuejilu(this.tjNUms).then((res) => { - this.$modal.msgSuccess("鎭㈠鎴愬姛"); - // this.isLoading = false; - this.getList(); + if (res.code == 200) { + this.$modal.msgSuccess("鎭㈠鎴愬姛"); + this.isLoading = false + this.getList(); + } + }).catch(() => { + console.log("鍔犺浇澶辫触") + this.isLoading = false; + }).finally(() => { + console.log("鍔犺浇澶辫触") + // 涓嶈鎿嶄綔鎴愬姛杩樻槸澶辫触锛岄兘浼氭墽琛� + this.isLoading = false; }); }) .catch((action) => { if (action === "cancel") { + this.isLoading = false; this.$message({ type: "warning", message: "宸插彇娑�", @@ -1418,7 +1451,7 @@ }) .finally(() => { // 涓嶈鎿嶄綔鎴愬姛杩樻槸澶辫触锛岄兘浼氭墽琛� - this.isLoading = false; + }); }, @@ -1431,13 +1464,23 @@ }) .then(() => { revokeTjOrderByTjNum(this.tjnumbers).then((res) => { - this.$modal.msgSuccess("鎾ら攢鎴愬姛"); - // this.isLoading = false; - this.getList(); + if (res.code == 200) { + this.$modal.msgSuccess("鎾ら攢鎴愬姛"); + this.isLoading = false + this.getList(); + } + }).catch(() => { + console.log("鍔犺浇澶辫触") + this.isLoading = false; + }).finally(() => { + console.log("鍔犺浇澶辫触") + // 涓嶈鎿嶄綔鎴愬姛杩樻槸澶辫触锛岄兘浼氭墽琛� + this.isLoading = false; }); }) .catch((action) => { if (action === "cancel") { + this.isLoading = false; this.$message({ type: "warning", message: "宸插彇娑�", @@ -1446,7 +1489,7 @@ }) .finally(() => { // 涓嶈鎿嶄綔鎴愬姛杩樻槸澶辫触锛岄兘浼氭墽琛� - this.isLoading = false; + // this.isLoading = false; }); }, /** 鐐瑰嚮鏄剧ず浣撴鎶ュ憡鎶ヨ〃*/ @@ -1637,7 +1680,7 @@ this.ids = selection.map((item) => item.orderId); this.single = selection.length !== 1; - this.singles= selection.length !== 1; + this.singles = selection.length !== 1; this.multiple = !selection.length; if (tjNUms.length > 0) { shijianzhou(tjNUms).then((res) => { -- Gitblit v1.8.0