From 288842f04e72d34fca6948ad1891c8460feb9774 Mon Sep 17 00:00:00 2001 From: wwl <xchao828@163.com> Date: 星期五, 10 一月 2025 17:53:51 +0800 Subject: [PATCH] 倒推 --- src/views/system/tijian/index.vue | 1287 ++++++++--------------------------------- src/views/system/comp/index.vue | 263 +++++++- src/views/system/comp/12334.vue | 222 ------ 3 files changed, 514 insertions(+), 1,258 deletions(-) diff --git a/src/views/system/comp/12.vue b/src/views/system/comp/12334.vue similarity index 84% rename from src/views/system/comp/12.vue rename to src/views/system/comp/12334.vue index 63ae2dd..af48456 100644 --- a/src/views/system/comp/12.vue +++ b/src/views/system/comp/12334.vue @@ -45,43 +45,15 @@ <el-table-column label="鑱旂郴浜�" align="center" prop="contactPerson" :show-overflow-tooltip="true" width="90px" /> <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="contactPhone" :show-overflow-tooltip="true" /> <el-table-column label="娉ㄥ唽鍦板潃" align="center" prop="registerAddress" :show-overflow-tooltip="true" /> - <!-- <el-table-column label="浼佷笟绫诲瀷" align="center" prop="typeOfEnterprise" :show-overflow-tooltip="true"> - <template slot-scope="scope"> - <dict-tag :options="dict.type.dict_comp_type" :value="scope.row.typeOfEnterprise"/> - </template> -</el-table-column> --> + <el-table-column label="琛屾斂鍖哄垝" align="center" prop="areaName" :show-overflow-tooltip="true" /> <el-table-column label="閫氳鍦板潃" align="center" prop="mailingAddress" :show-overflow-tooltip="true" /> <el-table-column label="閭" align="center" prop="email" :show-overflow-tooltip="true" /> <el-table-column label="寮�鎴烽摱琛�" align="center" prop="bankAccount" :show-overflow-tooltip="true" /> <el-table-column label="閾惰璐﹀彿" align="center" prop="countNum" :show-overflow-tooltip="true" /> - <!-- <el-table-column label="GMP鍙戣瘉鏃ユ湡" align="center" prop="gmpissueDate" width="180"> - <template slot-scope="scope"> - <span>{{ parseTime(scope.row.gmpissueDate, '{y}-{m}-{d}') }}</span> - </template> - </el-table-column> --> - <!-- <el-table-column label="缁忚惀璁稿彲璇佸彿" align="center" prop="businessLicenseNumber" /> --> - <!-- <el-table-column label="GMP鏈夋晥鎴鏃ユ湡" align="center" prop="gmpDeadlineDate" width="110px" :show-overflow-tooltip="true"> - <template slot-scope="scope"> - <span>{{ parseTime(scope.row.gmpDeadlineDate, '{y}-{m}-{d}') }}</span> - </template> - </el-table-column> --> - <!-- <el-table-column label="GMP寤剁画鏃ユ湡" align="center" prop="gmpDelayDate" width="180"> - <template slot-scope="scope"> - <span>{{ parseTime(scope.row.gmpDelayDate, '{y}-{m}-{d}') }}</span> - </template> - </el-table-column> --> - <!-- <el-table-column label="GMP璇佷功鍥剧墖(base64缂栫爜)" align="center" prop="gmpPhoto" width="100"> - <template slot-scope="scope"> - <image-preview :src="scope.row.gmpPhoto" :width="50" :height="50"/> - </template> - </el-table-column> --> + <el-table-column label="澶囨敞" align="center" prop="remark" :show-overflow-tooltip="true" /> - <!-- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180"> - <template slot-scope="scope"> - <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span> - </template> - </el-table-column> --> + <el-table-column label="淇敼浜�" align="center" prop="updateBy" :show-overflow-tooltip="true" width="100px" /> <el-table-column label="淇敼鏃堕棿" align="center" prop="updateTime" width="100px" :show-overflow-tooltip="true"> <template slot-scope="scope"> @@ -89,16 +61,7 @@ </template> </el-table-column> <el-table-column label="鎺掑簭" align="center" prop="orderNum" :show-overflow-tooltip="true" width="55px" /> - <!-- <el-table-column label="鏁版嵁鐘舵��(PT10.00.004)" align="center" prop="effective"> - <template slot-scope="scope"> - <dict-tag :options="dict.type.dict_data_status" :value="scope.row.effective"/> - </template> - </el-table-column> --> - <!-- <el-table-column label="鏈夋晥鏃堕棿" align="center" prop="validTime" width="180"> - <template slot-scope="scope"> - <span>{{ parseTime(scope.row.validTime, '{y}-{m}-{d}') }}</span> - </template> - </el-table-column> --> + <el-table-column fixed="right" label="鎿嶄綔" align="center" class-name="small-padding fixed-width" width="70px"> <template slot-scope="scope"> <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" @@ -337,11 +300,11 @@ </el-form-item> <el-form-item label="浼樻儬"> <el-input-number ref="inputNumber" style="width: 150px" v-model="youhui" :precision="2" :step="0.1" - :min="0" @change="numberChange"></el-input-number> + :min="0" @change="numberChange"></el-input-number> </el-form-item> <el-form-item label="鐜颁环"> <el-input ref="inputName" v-model="queryParams.xianprice" placeholder="鍚堣" clearable - style="width: 140px" @input="changeXianjia" @blur="numberChangeXianPrice(youhui, youhui)" /> + style="width: 140px" /> </el-form-item> <el-form-item> <el-button icon="el-icon-refresh" size="mini" @click="resetQuerys">閲嶇疆</el-button> @@ -428,7 +391,7 @@ </el-table-column> </el-table> <div style="font-size: 16px;margin-top: 10px;">椤圭洰鎬绘潯鏁帮細<span style="font-weight: 700;margin-right: 5px;">{{ - newpacName.length }}</span>鏉�</div> + newpacName.length }}</span>鏉�</div> </el-col> <el-col :span="8" :xs="24"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="46px" @@ -459,8 +422,8 @@ <el-col :span="2" :xs="24"> <div style="margin: 240% 16%"> <el-button type="primary" size="medium " icon="el-icon-back" - style="writing-mode: vertical-rl; text-align: center;letter-spacing: 10px;" @click="resetright">纭� - 璁�</el-button> + style="writing-mode: vertical-rl; text-align: center;letter-spacing: 10px;" + @click="resetright">纭� 璁�</el-button> </div> </el-col> <el-col :span="8" :xs="24"> @@ -512,9 +475,6 @@ <el-input v-model="form.faxNumber" placeholder="璇疯緭鍏ヤ紶鐪�" /> </el-form-item> - <!-- <el-form-item label="缂栫爜" prop="code"> - <el-input v-model="form.code" placeholder="璇疯緭鍏ョ紪鐮�" /> - </el-form-item> --> <el-form-item label="娉ㄥ唽鍦板潃" prop="registerAddress"> <el-input v-model="form.registerAddress" placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�" style="width: 1157px" /> @@ -541,87 +501,12 @@ <el-form-item label="琛屾斂鍖哄垝鍚嶇О" prop="areaName"> <el-input v-model="form.areaName" placeholder="璇疯緭鍏ヨ鏀垮尯鍒掑悕绉�" /> </el-form-item> - <!-- <el-form-item label="浼佷笟绫诲瀷" prop="typeOfEnterprise"> - <el-select v-model="form.typeOfEnterprise" placeholder="璇烽�夋嫨浼佷笟绫诲瀷"> - <el-option - v-for="dict in dict.type.dict_comp_type" - :key="dict.value" - :label="dict.label" -:value="dict.value" - ></el-option> - </el-select> - </el-form-item> --> - <!-- <el-form-item label="琛屾斂鍖哄垝id" prop="areaid"> - <el-input v-model="form.areaid" placeholder="璇疯緭鍏ヨ鏀垮尯鍒抜d" /> - </el-form-item> --> - <!-- <el-form-item label="GMP璇佷功缂栧彿" prop="gmpNo"> - <el-input v-model="form.gmpNo" placeholder="璇疯緭鍏MP璇佷功缂栧彿" /> - </el-form-item> --> - <!-- <el-form-item label="GMP鍙戣瘉鏃ユ湡" prop="gmpissueDate"> - <el-date-picker clearable - v-model="form.gmpissueDate" - type="date" - value-format="yyyy-MM-dd" - placeholder="璇烽�夋嫨GMP鍙戣瘉鏃ユ湡"> - </el-date-picker> - </el-form-item> --> - <!-- <el-form-item label="缁忚惀璁稿彲璇佸彿" prop="businessLicenseNumber"> - <el-input v-model="form.businessLicenseNumber" placeholder="璇疯緭鍏ョ粡钀ヨ鍙瘉鍙�" /> - </el-form-item> --> - <!-- <el-form-item label="GMP鏈夋晥鎴鏃ユ湡" prop="gmpDeadlineDate"> - <el-date-picker clearable - v-model="form.gmpDeadlineDate" - type="date" - value-format="yyyy-MM-dd" - placeholder="璇烽�夋嫨GMP鏈夋晥鎴鏃ユ湡"> - </el-date-picker> - </el-form-item> --> - <!-- <el-form-item label="GMP璁よ瘉鑼冨洿" prop="gmpRange"> - <el-input v-model="form.gmpRange" placeholder="璇疯緭鍏MP璁よ瘉鑼冨洿" /> - </el-form-item> --> - <!-- <el-form-item label="GMP寤剁画鑼冨洿" prop="gmpDelayRange"> - <el-input v-model="form.gmpDelayRange" placeholder="璇疯緭鍏MP寤剁画鑼冨洿" /> - </el-form-item> --> - <!-- <el-form-item label="GMP寤剁画鏃ユ湡" prop="gmpDelayDate"> - <el-date-picker clearable - v-model="form.gmpDelayDate" - type="date" - value-format="yyyy-MM-dd" - placeholder="璇烽�夋嫨GMP寤剁画鏃ユ湡"> - </el-date-picker> - </el-form-item> --> - <!-- <el-form-item label="GMP璇佷功鍥剧墖(base64缂栫爜)"> - <image-upload v-model="form.gmpPhoto"/> - </el-form-item> --> - <!-- <el-form-item label="鎺掑簭" prop="orderNum"> - <el-input v-model="form.orderNum" placeholder="璇疯緭鍏ユ帓搴�" /> - </el-form-item> --> - <!-- <el-form-item label="鏁版嵁鐘舵��(PT10.00.004)" prop="effective"> - <el-select v-model="form.effective" placeholder="璇烽�夋嫨鏁版嵁鐘舵��(PT10.00.004)"> - <el-option - v-for="dict in dict.type.dict_data_status" - :key="dict.value" - :label="dict.label" -:value="dict.value" - ></el-option> - </el-select> - </el-form-item> --> - <!-- <el-form-item label="鎷奸煶" prop="spell"> - <el-input v-model="form.spell" placeholder="璇疯緭鍏ユ嫾闊�" /> - </el-form-item> --> - <!-- <el-form-item label="鏈夋晥鏃堕棿" prop="validTime"> - <el-date-picker clearable v-model="form.validTime" type="date" value-format="yyyy-MM-dd" - placeholder="璇烽�夋嫨鏈夋晥鏃堕棿"> - </el-date-picker> - </el-form-item><br> --> <el-form-item label="澶囨敞" prop="remark"> <el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" :rows="2" label-width="400px" style="width: 830px" resize="none"></el-input> </el-form-item> - <!-- <el-form-item label="浜旂瑪绠�鐮�" prop="wbm"> - <el-input v-model="form.wbm" placeholder="璇疯緭鍏ヤ簲绗旂畝鐮�" /> - </el-form-item> --> + </el-form> <div slot="footer" class="dialog-footer"> <el-button type="primary" @click="submitForm">纭� 瀹�</el-button> @@ -766,31 +651,7 @@ contactPhone: [ { required: true, validator: checkPhoneNum, trigger: "blur" }, ], - // taxNumber: [ - // { required: true, validator: checkPhoneNum, trigger: "blur" }, - // ], - // legalPerson: [ - // { required: true, validator: checkPhoneNum, trigger: "blur" }, - // ], - // registerAddress: [ - // { required: true, validator: checkPhoneNum, trigger: "blur" }, - // ], - // bankAccount: [ - // { required: true, validator: checkPhoneNum, trigger: "blur" }, - // ], - // countNum: [ - // { required: true, validator: checkPhoneNum, trigger: "blur" }, - // ], - // principal: [ - // { required: true, validator: checkPhoneNum, trigger: "blur" }, - // ], - // faxNumber: [ - // { required: true, validator: checkPhoneNum, trigger: "blur" }, - // ], - // mailingAddress: [ - // { required: true, validator: checkPhoneNum, trigger: "blur" }, - // ], - // email: [{ required: true, validator: checkPhoneNum, trigger: "blur" }], + }, }; }, @@ -804,13 +665,6 @@ this.getList(); }, methods: { - changeXianjia() { - // 鍘熷鎶樻墸鐜囪绠� - - - this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10 - - }, validateDiscount(row) { if (row.limits > 10) { row.limits = 10; // 寮哄埗灏嗗�艰缃负鏈�澶у�� @@ -916,7 +770,7 @@ this.handleQuery(); }, resetQuerys() { - this.OnenewpacName = [], + this.OnenewpacName = [], this.queryParams.price = 0, this.queryParams.xianprice = 0, this.youhui = 0 @@ -945,18 +799,7 @@ this.GroupUpdate(); } - /* if (this.selectionList.length) { - // 濡傛灉绗竴涓〃鏍兼湁閫変腑椤癸紝閫変腑绗簩涓〃鏍煎搴旂殑鏁版嵁 - const selectedDeptId = this.selectionList[0].id; // 鍋囪姣忎釜椤规湁涓�涓敮涓�鐨� id - const correspondingGroups = this.groupingList.filter( - (group) => group.deptId === selectedDeptId - ); - this.groupList = correspondingGroups; - } else { - // 濡傛灉娌℃湁閫変腑浠讳綍椤癸紝娓呯┖绗簩涓〃鏍肩殑閫変腑椤� - this.groupList = []; - this.$refs.tbs.clearSelection(); - } */ + }, /** 鏂板鎸夐挳鎿嶄綔 */ handleAdd() { @@ -1013,7 +856,7 @@ return sum.plus(new Big(item.ysPrice || '0')); }, new Big(0)); }) - // ---------------------------------------------------------- + }) .catch(() => { @@ -1021,44 +864,7 @@ }); }, - numberChangeXianPrice(currentValue, oldValue) { - this.$confirm("纭畾淇敼鎵�鏈夊瓙椤圭殑鎶樻墸鍚楋紵", "鎻愮ず", { - confirmButtonText: "纭畾", - cancelButtonText: "鍙栨秷", - type: "warning", - }) - .then(() => { - this.youhui = currentValue; - if (this.youhui < this.getInfodis) { - this.youhui = this.getInfodis; - } - let totalYsprice = new Big(0); // 鍒濆鍖栨�� ysprice - - this.OnenewpacName.forEach((item) => { - item.limits = this.youhui; - const proPrice = new Big(item.proPrice); - const limits = new Big(item.limits); - const result = proPrice.times(limits.div(10)); // ordPrice * (discount / 10) - item.ysPrice = result.toNumber(); - totalYsprice = totalYsprice.plus(new Big(item.ysPrice)); - }); - - // 璁$畻瀹屾墍鏈� ysPrice 鍚庤繘琛岃皟鏁� - if (totalYsprice.toNumber() !== this.queryParams.xianprice) { - const diff = this.queryParams.xianprice - totalYsprice.toNumber(); - if (this.OnenewpacName.length > 0) { - const lastItem = this.OnenewpacName[this.OnenewpacName.length - 1]; - lastItem.ysPrice += diff; - // 璋冩暣鍚庢洿鏂� queryParams.xianprice - this.queryParams.xianprice = totalYsprice.plus(diff).toNumber(); - } - } - }) - .catch(() => { - this.youhui = oldValue; - }); - }, changegroupingName() { if (this.selectionList.length <= 0) { this.$modal.msgError("璇峰厛閫変腑閮ㄩ棬鎴栨坊鍔犳柊鐨勯儴闂�"); diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue index af48456..e835cee 100644 --- a/src/views/system/comp/index.vue +++ b/src/views/system/comp/index.vue @@ -45,15 +45,43 @@ <el-table-column label="鑱旂郴浜�" align="center" prop="contactPerson" :show-overflow-tooltip="true" width="90px" /> <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="contactPhone" :show-overflow-tooltip="true" /> <el-table-column label="娉ㄥ唽鍦板潃" align="center" prop="registerAddress" :show-overflow-tooltip="true" /> - + <!-- <el-table-column label="浼佷笟绫诲瀷" align="center" prop="typeOfEnterprise" :show-overflow-tooltip="true"> + <template slot-scope="scope"> + <dict-tag :options="dict.type.dict_comp_type" :value="scope.row.typeOfEnterprise"/> + </template> +</el-table-column> --> <el-table-column label="琛屾斂鍖哄垝" align="center" prop="areaName" :show-overflow-tooltip="true" /> <el-table-column label="閫氳鍦板潃" align="center" prop="mailingAddress" :show-overflow-tooltip="true" /> <el-table-column label="閭" align="center" prop="email" :show-overflow-tooltip="true" /> <el-table-column label="寮�鎴烽摱琛�" align="center" prop="bankAccount" :show-overflow-tooltip="true" /> <el-table-column label="閾惰璐﹀彿" align="center" prop="countNum" :show-overflow-tooltip="true" /> - + <!-- <el-table-column label="GMP鍙戣瘉鏃ユ湡" align="center" prop="gmpissueDate" width="180"> + <template slot-scope="scope"> + <span>{{ parseTime(scope.row.gmpissueDate, '{y}-{m}-{d}') }}</span> + </template> + </el-table-column> --> + <!-- <el-table-column label="缁忚惀璁稿彲璇佸彿" align="center" prop="businessLicenseNumber" /> --> + <!-- <el-table-column label="GMP鏈夋晥鎴鏃ユ湡" align="center" prop="gmpDeadlineDate" width="110px" :show-overflow-tooltip="true"> + <template slot-scope="scope"> + <span>{{ parseTime(scope.row.gmpDeadlineDate, '{y}-{m}-{d}') }}</span> + </template> + </el-table-column> --> + <!-- <el-table-column label="GMP寤剁画鏃ユ湡" align="center" prop="gmpDelayDate" width="180"> + <template slot-scope="scope"> + <span>{{ parseTime(scope.row.gmpDelayDate, '{y}-{m}-{d}') }}</span> + </template> + </el-table-column> --> + <!-- <el-table-column label="GMP璇佷功鍥剧墖(base64缂栫爜)" align="center" prop="gmpPhoto" width="100"> + <template slot-scope="scope"> + <image-preview :src="scope.row.gmpPhoto" :width="50" :height="50"/> + </template> + </el-table-column> --> <el-table-column label="澶囨敞" align="center" prop="remark" :show-overflow-tooltip="true" /> - + <!-- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180"> + <template slot-scope="scope"> + <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span> + </template> + </el-table-column> --> <el-table-column label="淇敼浜�" align="center" prop="updateBy" :show-overflow-tooltip="true" width="100px" /> <el-table-column label="淇敼鏃堕棿" align="center" prop="updateTime" width="100px" :show-overflow-tooltip="true"> <template slot-scope="scope"> @@ -61,7 +89,16 @@ </template> </el-table-column> <el-table-column label="鎺掑簭" align="center" prop="orderNum" :show-overflow-tooltip="true" width="55px" /> - + <!-- <el-table-column label="鏁版嵁鐘舵��(PT10.00.004)" align="center" prop="effective"> + <template slot-scope="scope"> + <dict-tag :options="dict.type.dict_data_status" :value="scope.row.effective"/> + </template> + </el-table-column> --> + <!-- <el-table-column label="鏈夋晥鏃堕棿" align="center" prop="validTime" width="180"> + <template slot-scope="scope"> + <span>{{ parseTime(scope.row.validTime, '{y}-{m}-{d}') }}</span> + </template> + </el-table-column> --> <el-table-column fixed="right" label="鎿嶄綔" align="center" class-name="small-padding fixed-width" width="70px"> <template slot-scope="scope"> <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" @@ -299,31 +336,31 @@ <el-input ref="inputName" v-model="queryParams.price" placeholder="鍚堣" clearable style="width: 140px" /> </el-form-item> <el-form-item label="浼樻儬"> - <el-input-number ref="inputNumber" style="width: 150px" v-model="youhui" :precision="2" :step="0.1" - :min="0" @change="numberChange"></el-input-number> + <el-input-number ref="inputNumber" style="width: 150px" v-model="youhui" :precision="1" :step="0.1" + :min="0" :max="20" @change="debounceNumberChange" :debounce="3000"></el-input-number> </el-form-item> <el-form-item label="鐜颁环"> <el-input ref="inputName" v-model="queryParams.xianprice" placeholder="鍚堣" clearable - style="width: 140px" /> + style="width: 140px" @input="changeXianjia" @blur="numberChangeXianPrice(youhui, youhui)" /> </el-form-item> <el-form-item> <el-button icon="el-icon-refresh" size="mini" @click="resetQuerys">閲嶇疆</el-button> </el-form-item> </el-form> <el-table border v-loading="loading" :data="OnenewpacName" :row-class-name="tableRowClassName" height="478"> - <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" width="486"> + <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" width="410"> <template slot-scope="scope"> {{ scope.row.proName }} </template> </el-table-column> <el-table-column label="鍘熶环" align="center" prop="proPrice" width="85"></el-table-column> - <el-table-column label="鎶樻墸" width="85"> + <el-table-column label="鎶樻墸" width="151"> <template slot-scope="scope"> <!-- 鍙緭鍏ョ函鏁板瓧鎶樻墸 --> - <el-input v-model.number="scope.row.limits" @input="validateDiscount(scope.row)" placeholder="杈撳叆鎶樻墸" - size="small" type="number" min="0" step="1" max="10"> - </el-input> + <el-input-number v-model.number="scope.row.limits" + placeholder="杈撳叆鎶樻墸" size="small" type="number" :min="0" :step="0.1" :precision="1" :max="20"> + </el-input-number> </template> </el-table-column> <el-table-column label="鐜颁环" align="center" prop="ysPrice" width="85"></el-table-column> @@ -391,7 +428,7 @@ </el-table-column> </el-table> <div style="font-size: 16px;margin-top: 10px;">椤圭洰鎬绘潯鏁帮細<span style="font-weight: 700;margin-right: 5px;">{{ - newpacName.length }}</span>鏉�</div> + newpacName.length }}</span>鏉�</div> </el-col> <el-col :span="8" :xs="24"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="46px" @@ -422,8 +459,8 @@ <el-col :span="2" :xs="24"> <div style="margin: 240% 16%"> <el-button type="primary" size="medium " icon="el-icon-back" - style="writing-mode: vertical-rl; text-align: center;letter-spacing: 10px;" - @click="resetright">纭� 璁�</el-button> + style="writing-mode: vertical-rl; text-align: center;letter-spacing: 10px;" @click="resetright">纭� + 璁�</el-button> </div> </el-col> <el-col :span="8" :xs="24"> @@ -475,6 +512,9 @@ <el-input v-model="form.faxNumber" placeholder="璇疯緭鍏ヤ紶鐪�" /> </el-form-item> + <!-- <el-form-item label="缂栫爜" prop="code"> + <el-input v-model="form.code" placeholder="璇疯緭鍏ョ紪鐮�" /> + </el-form-item> --> <el-form-item label="娉ㄥ唽鍦板潃" prop="registerAddress"> <el-input v-model="form.registerAddress" placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�" style="width: 1157px" /> @@ -501,12 +541,87 @@ <el-form-item label="琛屾斂鍖哄垝鍚嶇О" prop="areaName"> <el-input v-model="form.areaName" placeholder="璇疯緭鍏ヨ鏀垮尯鍒掑悕绉�" /> </el-form-item> + <!-- <el-form-item label="浼佷笟绫诲瀷" prop="typeOfEnterprise"> + <el-select v-model="form.typeOfEnterprise" placeholder="璇烽�夋嫨浼佷笟绫诲瀷"> + <el-option + v-for="dict in dict.type.dict_comp_type" + :key="dict.value" + :label="dict.label" +:value="dict.value" + ></el-option> + </el-select> + </el-form-item> --> + <!-- <el-form-item label="琛屾斂鍖哄垝id" prop="areaid"> + <el-input v-model="form.areaid" placeholder="璇疯緭鍏ヨ鏀垮尯鍒抜d" /> + </el-form-item> --> + <!-- <el-form-item label="GMP璇佷功缂栧彿" prop="gmpNo"> + <el-input v-model="form.gmpNo" placeholder="璇疯緭鍏MP璇佷功缂栧彿" /> + </el-form-item> --> + <!-- <el-form-item label="GMP鍙戣瘉鏃ユ湡" prop="gmpissueDate"> + <el-date-picker clearable + v-model="form.gmpissueDate" + type="date" + value-format="yyyy-MM-dd" + placeholder="璇烽�夋嫨GMP鍙戣瘉鏃ユ湡"> + </el-date-picker> + </el-form-item> --> + <!-- <el-form-item label="缁忚惀璁稿彲璇佸彿" prop="businessLicenseNumber"> + <el-input v-model="form.businessLicenseNumber" placeholder="璇疯緭鍏ョ粡钀ヨ鍙瘉鍙�" /> + </el-form-item> --> + <!-- <el-form-item label="GMP鏈夋晥鎴鏃ユ湡" prop="gmpDeadlineDate"> + <el-date-picker clearable + v-model="form.gmpDeadlineDate" + type="date" + value-format="yyyy-MM-dd" + placeholder="璇烽�夋嫨GMP鏈夋晥鎴鏃ユ湡"> + </el-date-picker> + </el-form-item> --> + <!-- <el-form-item label="GMP璁よ瘉鑼冨洿" prop="gmpRange"> + <el-input v-model="form.gmpRange" placeholder="璇疯緭鍏MP璁よ瘉鑼冨洿" /> + </el-form-item> --> + <!-- <el-form-item label="GMP寤剁画鑼冨洿" prop="gmpDelayRange"> + <el-input v-model="form.gmpDelayRange" placeholder="璇疯緭鍏MP寤剁画鑼冨洿" /> + </el-form-item> --> + <!-- <el-form-item label="GMP寤剁画鏃ユ湡" prop="gmpDelayDate"> + <el-date-picker clearable + v-model="form.gmpDelayDate" + type="date" + value-format="yyyy-MM-dd" + placeholder="璇烽�夋嫨GMP寤剁画鏃ユ湡"> + </el-date-picker> + </el-form-item> --> + <!-- <el-form-item label="GMP璇佷功鍥剧墖(base64缂栫爜)"> + <image-upload v-model="form.gmpPhoto"/> + </el-form-item> --> + <!-- <el-form-item label="鎺掑簭" prop="orderNum"> + <el-input v-model="form.orderNum" placeholder="璇疯緭鍏ユ帓搴�" /> + </el-form-item> --> + <!-- <el-form-item label="鏁版嵁鐘舵��(PT10.00.004)" prop="effective"> + <el-select v-model="form.effective" placeholder="璇烽�夋嫨鏁版嵁鐘舵��(PT10.00.004)"> + <el-option + v-for="dict in dict.type.dict_data_status" + :key="dict.value" + :label="dict.label" +:value="dict.value" + ></el-option> + </el-select> + </el-form-item> --> + <!-- <el-form-item label="鎷奸煶" prop="spell"> + <el-input v-model="form.spell" placeholder="璇疯緭鍏ユ嫾闊�" /> + </el-form-item> --> + <!-- <el-form-item label="鏈夋晥鏃堕棿" prop="validTime"> + <el-date-picker clearable v-model="form.validTime" type="date" value-format="yyyy-MM-dd" + placeholder="璇烽�夋嫨鏈夋晥鏃堕棿"> + </el-date-picker> + </el-form-item><br> --> <el-form-item label="澶囨敞" prop="remark"> <el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" :rows="2" label-width="400px" style="width: 830px" resize="none"></el-input> </el-form-item> - + <!-- <el-form-item label="浜旂瑪绠�鐮�" prop="wbm"> + <el-input v-model="form.wbm" placeholder="璇疯緭鍏ヤ簲绗旂畝鐮�" /> + </el-form-item> --> </el-form> <div slot="footer" class="dialog-footer"> <el-button type="primary" @click="submitForm">纭� 瀹�</el-button> @@ -651,7 +766,31 @@ contactPhone: [ { required: true, validator: checkPhoneNum, trigger: "blur" }, ], - + // taxNumber: [ + // { required: true, validator: checkPhoneNum, trigger: "blur" }, + // ], + // legalPerson: [ + // { required: true, validator: checkPhoneNum, trigger: "blur" }, + // ], + // registerAddress: [ + // { required: true, validator: checkPhoneNum, trigger: "blur" }, + // ], + // bankAccount: [ + // { required: true, validator: checkPhoneNum, trigger: "blur" }, + // ], + // countNum: [ + // { required: true, validator: checkPhoneNum, trigger: "blur" }, + // ], + // principal: [ + // { required: true, validator: checkPhoneNum, trigger: "blur" }, + // ], + // faxNumber: [ + // { required: true, validator: checkPhoneNum, trigger: "blur" }, + // ], + // mailingAddress: [ + // { required: true, validator: checkPhoneNum, trigger: "blur" }, + // ], + // email: [{ required: true, validator: checkPhoneNum, trigger: "blur" }], }, }; }, @@ -665,24 +804,30 @@ this.getList(); }, methods: { - validateDiscount(row) { - if (row.limits > 10) { - row.limits = 10; // 寮哄埗灏嗗�艰缃负鏈�澶у�� - } else if (row.limits < 0) { - row.limits = 0; // 寮哄埗灏嗗�艰缃负鏈�灏忓�� + debounceNumberChange(currentValue, oldValue) { + clearTimeout(this.debounceTimer); + this.debounceTimer = setTimeout(() => { + this.numberChange(currentValue, oldValue); + }, 300); + }, + changeXianjia() { + // 鍘熷鎶樻墸鐜囪绠� + + + if (this.queryParams.price !== 0) { + this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10; } - this.updateProPrice(row); // 鏇存柊浠锋牸鎴栧叾浠栭�昏緫 + }, updateProPrice(row) { - const proPrice = new Big(row.proPrice); const limits = new Big(row.limits); const result = proPrice.times(limits.div(10)); // ordPrice * (discount / 10) row.ysPrice = result.toNumber(); - this.queryParams.xianprice = this.OnenewpacName.reduce((sum, item) => { - return sum.plus(new Big(item.ysPrice || '0')); - }, new Big(0)).toNumber(); + // this.queryParams.xianprice = this.OnenewpacName.reduce((sum, item) => { + // return sum.plus(new Big(item.ysPrice || '0')); + // }, new Big(0)).toNumber(); this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10 }, getList() { @@ -770,7 +915,7 @@ this.handleQuery(); }, resetQuerys() { - this.OnenewpacName = [], + this.OnenewpacName = [], this.queryParams.price = 0, this.queryParams.xianprice = 0, this.youhui = 0 @@ -799,7 +944,18 @@ this.GroupUpdate(); } - + /* if (this.selectionList.length) { + // 濡傛灉绗竴涓〃鏍兼湁閫変腑椤癸紝閫変腑绗簩涓〃鏍煎搴旂殑鏁版嵁 + const selectedDeptId = this.selectionList[0].id; // 鍋囪姣忎釜椤规湁涓�涓敮涓�鐨� id + const correspondingGroups = this.groupingList.filter( + (group) => group.deptId === selectedDeptId + ); + this.groupList = correspondingGroups; + } else { + // 濡傛灉娌℃湁閫変腑浠讳綍椤癸紝娓呯┖绗簩涓〃鏍肩殑閫変腑椤� + this.groupList = []; + this.$refs.tbs.clearSelection(); + } */ }, /** 鏂板鎸夐挳鎿嶄綔 */ handleAdd() { @@ -852,11 +1008,12 @@ const limits = new Big(item.limits); const result = proPrice.times(limits.div(10)); // ordPrice * (discount / 10) item.ysPrice = result.toNumber(); + console.log("numberChange") this.queryParams.xianprice = this.OnenewpacName.reduce((sum, item) => { return sum.plus(new Big(item.ysPrice || '0')); }, new Big(0)); }) - + // ---------------------------------------------------------- }) .catch(() => { @@ -864,6 +1021,50 @@ }); }, + numberChangeXianPrice(currentValue, oldValue) { + this.$confirm("纭畾淇敼鎵�鏈夊瓙椤圭殑鎶樻墸鍚楋紵", "鎻愮ず", { + confirmButtonText: "纭畾", + cancelButtonText: "鍙栨秷", + type: "warning", + }) + .then(() => { + // 纭繚淇敼鎶樻墸鐨勫�� + this.youhui = currentValue; + // 濡傛灉鎶樻墸灏忎簬鏈�灏忔姌鎵e�硷紝淇鎶樻墸 + if (this.youhui < this.getInfodis) { + this.youhui = this.getInfodis; + } + let totalYsprice = new Big(0); // 鍒濆鍖栨�� ysprice + // 閬嶅巻姣忎釜椤圭洰锛屾洿鏂版瘡涓瓙椤圭殑浠锋牸 + this.OnenewpacName.forEach((item) => { + item.limits = this.youhui; + const proPrice = new Big(item.proPrice); + const limits = new Big(item.limits); + const result = proPrice.times(limits.div(10)); // ordPrice * (discount / 10) + item.ysPrice = result.toNumber(); + totalYsprice = totalYsprice.plus(new Big(item.ysPrice)); + }); + // 濡傛灉鎬荤殑 ysPrice 鍜屾煡璇㈠弬鏁颁腑鐨� xianprice 涓嶄竴鑷达紝杩涜璋冩暣 + if (!totalYsprice.eq(this.queryParams.xianprice)) { + const diff = new Big(this.queryParams.xianprice).minus(totalYsprice); + // 濡傛灉 OnenewpacName 鏁扮粍涓嶄负绌猴紝璋冩暣鏈�鍚庝竴椤圭殑 ysPrice + if (this.OnenewpacName.length > 0) { + const lastItem = this.OnenewpacName[this.OnenewpacName.length - 1]; + const newYsPrice = new Big(lastItem.ysPrice).plus(diff).toNumber(); + // 浣跨敤 splice 鏇挎崲鏈�鍚庝竴椤癸紝纭繚鏇存柊瑙﹀彂瑙嗗浘鏇存柊 + console.log("hhh"); + + this.$set(this.OnenewpacName[this.OnenewpacName.length - 1], 'ysPrice', newYsPrice); + + } + } + }) + .catch(() => { + // 濡傛灉鍙栨秷淇敼锛屾仮澶嶅師鏈夌殑浼樻儬鍊� + this.youhui = oldValue; + }); + }, + changegroupingName() { if (this.selectionList.length <= 0) { @@ -984,7 +1185,7 @@ const existingItem = this.OnenewpacName.find(existing => existing.proId === item.proId); if (!existingItem) { newItemsToAdd.push(item); // 濡傛灉涓嶅瓨鍦ㄧ浉鍚岄」鐩紝鍒欐坊鍔犲埌鏂版暟缁� - this.updateProPrice(item); // 鏇存柊鍗曚釜椤圭洰鐨勪环鏍� + this.updateProPrice(item); } }); diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue index f164347..7ab21ed 100644 --- a/src/views/system/tijian/index.vue +++ b/src/views/system/tijian/index.vue @@ -1,18 +1,7 @@ <template> <div class="app-container"> - <el-dialog - :title="title" - :visible.sync="open1" - width="1000px" - append-to-body - > - <el-form - ref="form1" - :model="form1" - :rules="rules1" - label-width="100px" - :inline="true" - > + <el-dialog :title="title" :visible.sync="open1" width="1000px" append-to-body> + <el-form ref="form1" :model="form1" :rules="rules1" label-width="100px" :inline="true"> <el-form-item label="鍗曚綅鍚嶇О" prop="cnName"> <el-input v-model="form1.cnName" placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" /> </el-form-item> @@ -29,16 +18,10 @@ <el-input v-model="form1.legalPerson" placeholder="璇疯緭鍏ユ硶浜�" /> </el-form-item> <el-form-item label="娉ㄥ唽鍦板潃" prop="registerAddress"> - <el-input - v-model="form1.registerAddress" - placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�" - /> + <el-input v-model="form1.registerAddress" placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�" /> </el-form-item> <el-form-item label="閫氳鍦板潃" prop="mailingAddress"> - <el-input - v-model="form1.mailingAddress" - placeholder="璇疯緭鍏ラ�氳鍦板潃" - /> + <el-input v-model="form1.mailingAddress" placeholder="璇疯緭鍏ラ�氳鍦板潃" /> </el-form-item> <el-form-item label="寮�鎴烽摱琛�" prop="bankAccount"> <el-input v-model="form1.bankAccount" placeholder="璇疯緭鍏ュ紑鎴烽摱琛�" /> @@ -65,25 +48,12 @@ <el-input v-model="form1.orderNum" placeholder="璇疯緭鍏ユ帓搴�" /> </el-form-item> <el-form-item label="鏈夋晥鏃堕棿" prop="validTime"> - <el-date-picker - clearable - v-model="form1.validTime" - type="date" - value-format="yyyy-MM-dd" - placeholder="璇烽�夋嫨鏈夋晥鏃堕棿" - > - </el-date-picker> </el-form-item - ><br /> + <el-date-picker clearable v-model="form1.validTime" type="date" value-format="yyyy-MM-dd" + placeholder="璇烽�夋嫨鏈夋晥鏃堕棿"> + </el-date-picker> </el-form-item><br /> <el-form-item label="澶囨敞" prop="remark"> - <el-input - v-model="form1.remark" - type="textarea" - placeholder="璇疯緭鍏ュ唴瀹�" - :rows="2" - label-width="400px" - style="width: 830px" - resize="none" - ></el-input> + <el-input v-model="form1.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" :rows="2" label-width="400px" + style="width: 830px" resize="none"></el-input> </el-form-item> </el-form> <div slot="footer" class="dialog-footer2"> @@ -94,159 +64,90 @@ <el-row :gutter="20"> <el-col :span="17"> <div class="grid-content bg-purple"> - <el-form - :inline="true" - ref="form" - :model="form" - :rules="rules" - :label-position="labelPosition" - label-width="106px" - v-show="top" - > + <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition" + label-width="106px" v-show="top"> <el-form-item label="鍖垮悕" prop="isNow"> - <el-select - v-model="isNow" - placeholder="鏄惁鍖垮悕" - @change="freezing(isNow)" - > - <el-option - v-for="dict in dictType" - :key="dict.value" - :label="dict.label" - :value="dict.value" - ></el-option> + <el-select v-model="isNow" placeholder="鏄惁鍖垮悕" @change="freezing(isNow)"> + <el-option v-for="dict in dictType" :key="dict.value" :label="dict.label" + :value="dict.value"></el-option> </el-select> </el-form-item> - <el-form-item - label="濮撳悕" - prop="cusName" - :rules="[ - { - required: true, - validator: (rule, value, callback) => { - if (!form.cusName) { - callback(''); - } else if (form.cusName) { - callback(); - } - }, - trigger: 'blur', + <el-form-item label="濮撳悕" prop="cusName" :rules="[ + { + required: true, + validator: (rule, value, callback) => { + if (!form.cusName) { + callback(''); + } else if (form.cusName) { + callback(); + } }, - ]" - > - <span - slot="label" - style="display: inline-block; border-bottom: 2px solid blue" - @click="openname" - > + trigger: 'blur', + }, + ]"> + <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="openname"> 濮撳悕 </span> - <el-input - v-model="form.cusName" - placeholder="璇疯緭鍏ュ鍚�" - :disabled="isDisabled" - /> + <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled" /> </el-form-item> <el-form-item label="璇佷欢绫诲瀷" prop="idType"> - <el-select - :disabled="isDisabled" - v-model="form.idType" - placeholder="璇烽�夋嫨璇佷欢绫诲瀷" - > - <el-option - v-for="dict in dict.type.dict_user_cardtype" - :key="dict.value" - :label="dict.label" - :value="dict.value" - ></el-option> + <el-select :disabled="isDisabled" v-model="form.idType" placeholder="璇烽�夋嫨璇佷欢绫诲瀷"> + <el-option v-for="dict in dict.type.dict_user_cardtype" :key="dict.value" :label="dict.label" + :value="dict.value"></el-option> </el-select> </el-form-item> <el-form-item label="姘戞棌" prop="cusNational"> - <el-select - filterable - :disabled="isDisabled" - v-model="form.cusNational" - placeholder="璇烽�夋嫨姘戞棌" - > - <el-option - v-for="dict in dict.type.dict_user_national" - :key="dict.value" - :label="dict.label" - :value="dict.value" - ></el-option> + <el-select filterable :disabled="isDisabled" v-model="form.cusNational" placeholder="璇烽�夋嫨姘戞棌"> + <el-option v-for="dict in dict.type.dict_user_national" :key="dict.value" :label="dict.label" + :value="dict.value"></el-option> </el-select> </el-form-item> - <el-form-item - label="鎬у埆" - prop="cusSex" - :rules="[ - { - required: true, - validator: (rule, value, callback) => { - if (!form.cusSex && showHidden.has_sex === 'Y') { - callback(''); - } else if (showHidden.has_sex === 'N') { - callback(); - } else if (form.cusSex && showHidden.has_sex === 'Y') { - callback(); - } - }, - trigger: 'blur', + <el-form-item label="鎬у埆" prop="cusSex" :rules="[ + { + required: true, + validator: (rule, value, callback) => { + if (!form.cusSex && showHidden.has_sex === 'Y') { + callback(''); + } else if (showHidden.has_sex === 'N') { + callback(); + } else if (form.cusSex && showHidden.has_sex === 'Y') { + callback(); + } }, - ]" - > - <el-select - :disabled="isDisabled" - v-model="form.cusSex" - placeholder="鎬у埆" - > - <el-option - v-for="dict in dict.type.sys_user_sex" - :key="dict.value" - :label="dict.label" - :value="parseInt(dict.value)" - ></el-option> + trigger: 'blur', + }, + ]"> + <el-select :disabled="isDisabled" v-model="form.cusSex" placeholder="鎬у埆"> + <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label" + :value="parseInt(dict.value)"></el-option> </el-select> </el-form-item> - <el-form-item - label="璇佷欢鍙风爜" - prop="cusIdcard" - :rules="[ - { - required: true, - validator: (rule, value, callback) => { - if (!form.cusIdcard && showHidden.has_idcard === 'Y') { - callback(''); - } else if (showHidden.has_idcard === 'N') { - callback(); - } else if ( - form.cusIdcard && - showHidden.has_idcard === 'Y' - ) { - callback(); - } - }, - trigger: 'blur', + <el-form-item label="璇佷欢鍙风爜" prop="cusIdcard" :rules="[ + { + required: true, + validator: (rule, value, callback) => { + if (!form.cusIdcard && showHidden.has_idcard === 'Y') { + callback(''); + } else if (showHidden.has_idcard === 'N') { + callback(); + } else if ( + form.cusIdcard && + showHidden.has_idcard === 'Y' + ) { + callback(); + } }, - ]" - > - <span - slot="label" - style="display: inline-block; border-bottom: 2px solid blue" - @click="handleQuery" - > + trigger: 'blur', + }, + ]"> + <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="handleQuery"> 璇佷欢鍙风爜 </span> - <el-input - :disabled="isDisabled" - v-model="form.cusIdcard" - placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" - @input="inputChange" - /> + <el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" @input="inputChange" /> <!-- <i style=" font-size: 1rem; position: absolute; @@ -257,100 +158,52 @@ </el-form-item> <el-form-item label="濠氬Щ" prop="cusMarryStatus"> - <el-select - :disabled="isDisabled" - v-model="form.cusMarryStatus" - placeholder="濠氬Щ鐘跺喌" - > - <el-option - v-for="dict in dict.type.dict_user_marry" - :key="dict.value" - :label="dict.label" - :value="dict.value" - ></el-option> + <el-select :disabled="isDisabled" v-model="form.cusMarryStatus" placeholder="濠氬Щ鐘跺喌"> + <el-option v-for="dict in dict.type.dict_user_marry" :key="dict.value" :label="dict.label" + :value="dict.value"></el-option> </el-select> </el-form-item> - <el-form-item - label="鐢佃瘽" - prop="cusPhone" - :rules="[ - { - required: true, - validator: (rule, value, callback) => { - if (!form.cusPhone && showHidden.is_phone === 'Y') { - callback(''); - } else if (showHidden.is_phone === 'N') { - callback(); - } else if (form.cusPhone && showHidden.is_phone === 'Y') { - callback(); - } - }, - trigger: 'blur', + <el-form-item label="鐢佃瘽" prop="cusPhone" :rules="[ + { + required: true, + validator: (rule, value, callback) => { + if (!form.cusPhone && showHidden.is_phone === 'Y') { + callback(''); + } else if (showHidden.is_phone === 'N') { + callback(); + } else if (form.cusPhone && showHidden.is_phone === 'Y') { + callback(); + } }, - ]" - > - <el-input - v-model="form.cusPhone" - placeholder="璇疯緭鍏ヨ仈绯荤數璇�" - :disabled="isDisabled" - /> + trigger: 'blur', + }, + ]"> + <el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" :disabled="isDisabled" /> </el-form-item> <el-form-item label="鍑虹敓鏃ユ湡" prop="cusBrithday"> - <el-date-picker - :disabled="isDisabled" - clearable - v-model="form.cusBrithday" - type="date" - value-format="yyyy-MM-dd" - placeholder="璇烽�夋嫨鍑虹敓鏃ユ湡" - style="width: 93%" - > + <el-date-picker :disabled="isDisabled" clearable v-model="form.cusBrithday" type="date" + value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鍑虹敓鏃ユ湡" style="width: 93%"> </el-date-picker> </el-form-item> <el-form-item label="鑱屼笟" prop="career"> - <el-select - filterable - :disabled="isDisabled" - v-model="form.career" - placeholder="璇疯緭鍏ヨ亴涓�" - > - <el-option - v-for="dict in dict.type.dict_job" - :key="dict.value" - :label="dict.label" - :value="dict.value" - ></el-option> + <el-select filterable :disabled="isDisabled" v-model="form.career" placeholder="璇疯緭鍏ヨ亴涓�"> + <el-option v-for="dict in dict.type.dict_job" :key="dict.value" :label="dict.label" + :value="dict.value"></el-option> </el-select> </el-form-item> <el-form-item label="閭" prop="cusEmail"> - <el-input - v-model="form.cusEmail" - placeholder="璇疯緭鍏ラ偖绠�" - :disabled="isDisabled" - /> + <el-input v-model="form.cusEmail" placeholder="璇疯緭鍏ラ偖绠�" :disabled="isDisabled" /> </el-form-item> <el-form-item label="骞撮緞" prop="age"> - <el-input - v-model="form.age" - :disabled="isDisabled" - style="width: 30%" - /> - <el-select - :disabled="isDisabled" - v-model="form.ageUnit" - style="width: 20%" - > - <el-option - v-for="dict in dict.type.dict_ageunit" - :key="dict.value" - :label="dict.label" - :value="dict.value" - ></el-option> + <el-input v-model="form.age" :disabled="isDisabled" style="width: 30%" /> + <el-select :disabled="isDisabled" v-model="form.ageUnit" style="width: 20%"> + <el-option v-for="dict in dict.type.dict_ageunit" :key="dict.value" :label="dict.label" + :value="dict.value"></el-option> </el-select> </el-form-item> @@ -358,68 +211,33 @@ </el-form-item> --> </el-form> - <el-form - :inline="true" - ref="form" - :model="form" - :rules="rules" - :label-position="labelPosition" - label-width="106px" - v-show="top" - > + <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition" + label-width="106px" v-show="top"> <el-form-item label="浠嬬粛浜�" prop="cusIntroduce"> - <el-input - :disabled="isDisabled" - v-model="form.cusIntroduce" - placeholder="璇疯緭鍏ヤ粙缁嶄汉" - /> + <el-input :disabled="isDisabled" v-model="form.cusIntroduce" placeholder="璇疯緭鍏ヤ粙缁嶄汉" /> </el-form-item> <el-form-item label="鏂囧寲绋嬪害" prop="wenHua" label-width="93px"> - <el-input - :disabled="isDisabled" - v-model="form.wenHua" - placeholder="璇疯緭鍏ユ枃鍖栫▼搴�" - /> + <el-input :disabled="isDisabled" v-model="form.wenHua" placeholder="璇疯緭鍏ユ枃鍖栫▼搴�" /> </el-form-item> </el-form> - <el-form - ref="form" - :model="form" - :rules="rules" - :label-position="labelPosition" - label-width="106px" - v-show="top" - > + <el-form ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="106px" + v-show="top"> <el-row :gutter="21"> <el-col :span="19"> <el-form-item label="鎴峰彛鍦板潃" prop="addr"> - <el-input - v-model="form.addr" - placeholder="璇疯緭鍏ユ埛鍙e湴鍧�" - :disabled="isDisabled" - /> + <el-input v-model="form.addr" placeholder="璇疯緭鍏ユ埛鍙e湴鍧�" :disabled="isDisabled" /> </el-form-item> </el-col> </el-row> </el-form> - <el-form - ref="form" - :model="form" - :rules="rules" - :label-position="labelPosition" - label-width="106px" - v-show="top" - > + <el-form ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="106px" + v-show="top"> <el-row :gutter="21"> <el-col :span="19"> <el-form-item label="鐜颁綇鍦板潃" prop="cusAddr"> - <el-input - v-model="form.cusAddr" - placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃" - :disabled="isDisabled" - /> + <el-input v-model="form.cusAddr" placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃" :disabled="isDisabled" /> </el-form-item> </el-col> </el-row> @@ -428,35 +246,11 @@ <el-row v-show="top"> <el-col :span="19"> <div style="float: right; margin-bottom: 10px"> - <el-button - v-show="lishi" - type="primary" - @click="cope" - size="mini" - >涓�閿鍒�</el-button - > - <el-button - type="primary" - @click="inputChanges" - v-show="lishi" - size="mini" - :disabled="confirm" - >鍘嗗彶浣撴璁板綍</el-button - > - <el-button - :disabled="isDisabled" - type="primary" - size="mini" - @click="submitForm" - >鐧昏</el-button - > - <el-button - icon="el-icon-refresh" - size="mini" - @click="resetQuery" - @queryTable="getList" - >閲嶇疆</el-button - > + <el-button v-show="lishi" type="primary" @click="cope" size="mini">涓�閿鍒�</el-button> + <el-button type="primary" @click="inputChanges" v-show="lishi" size="mini" + :disabled="confirm">鍘嗗彶浣撴璁板綍</el-button> + <el-button :disabled="isDisabled" type="primary" size="mini" @click="submitForm">鐧昏</el-button> + <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" @queryTable="getList">閲嶇疆</el-button> </div> </el-col> </el-row> @@ -464,140 +258,50 @@ </el-col> <el-col :span="7" v-show="top"> <div class="content" v-show="showHidden.mall_hasPhoto == 'Y'"> - <div - v-show="hide" - style="border: 1px dashed #dcdfe6; width: 180px; height: 180px" - > + <div v-show="hide" style="border: 1px dashed #dcdfe6; width: 180px; height: 180px"> <img v-if="imageUrl" :src="imageUrl" class="avatar" /> </div> <div v-if="imgSrc" class="img_bg_camera"> - <img - style=" + <img style=" width: 200px; height: 200px; margin-left: -20px; margin-top: 90px; padding-top: 1px; - " - :src="imgSrc" - alt="" - class="tx_img" - /> + " :src="imgSrc" alt="" class="tx_img" /> </div> - <video - v-show="hides" - id="videoCamera" - :width="videoWidth" - :height="videoHeight" - autoplay - style="margin-top: 1px" - ></video> - <canvas - style="display: none" - id="canvasCamera" - :width="videoWidth" - :height="videoHeight" - ></canvas> + <video v-show="hides" id="videoCamera" :width="videoWidth" :height="videoHeight" autoplay + style="margin-top: 1px"></video> + <canvas style="display: none" id="canvasCamera" :width="videoWidth" :height="videoHeight"></canvas> <div class="camera_outer" style="margin-top: 10px"> - <el-button type="primary" plain size="mini" @click="getCompetence()" - >鎵撳紑鎽勫儚澶�</el-button - > - <el-button type="primary" plain size="mini" @click="setImage()" - >鎷嶇収</el-button - > + <el-button type="primary" plain size="mini" @click="getCompetence()">鎵撳紑鎽勫儚澶�</el-button> + <el-button type="primary" plain size="mini" @click="setImage()">鎷嶇収</el-button> <br /> </div> </div> </el-col> </el-row> - <el-dialog - title="閫夋嫨濂楅" - :visible.sync="taocan" - width="70%" - height="700px" - :close-on-click-modal="false" - > - <el-tabs - type="border-card" - style="height: 560px; margin: 0 10px; width: 100%" - v-model="activeNames" - @tab-click="handleClick" - > + <el-dialog title="閫夋嫨濂楅" :visible.sync="taocan" width="70%" height="700px" :close-on-click-modal="false"> + <el-tabs type="border-card" style="height: 560px; margin: 0 10px; width: 100%" v-model="activeNames" + @tab-click="handleClick"> <el-tab-pane label="濂楅" name="first"> - <el-form - :model="queryParam" - ref="queryForm" - size="small" - :inline="true" - v-if="showSearch" - label-width="auto" - > + <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" v-if="showSearch" label-width="auto"> <el-form-item label="濂楅鍚嶇О" prop="pacName"> - <el-input - v-model="queryParam.pacName" - placeholder="璇疯緭鍏ュ椁愬悕绉�" - clearable - @keyup.enter.native="handle" - /> + <el-input v-model="queryParam.pacName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable @keyup.enter.native="handle" /> </el-form-item> <el-form-item> - <el-button - type="primary" - icon="el-icon-search" - size="mini" - @click="handle" - >鏌ヨ</el-button - > + <el-button type="primary" icon="el-icon-search" size="mini" @click="handle">鏌ヨ</el-button> </el-form-item> </el-form> <div class="tab4"> - <div - class="grid-content bg-purple" - style="margin-left: 5px; width: 98%" - > - <el-table - v-loading="loading" - element-loading-text="姝e湪鍔犺浇涓�..." - element-loading-spinner="el-icon-loading" - border - :data="newpacName" - @selection-change="handleSelectionChange" - height="450px" - ref="tb" - > - <el-table-column - type="selection" - width="40px" - align="center" - label="閫夋嫨" - /> - <el-table-column - label="濂楅鍚嶇О" - align="center" - prop="pacName" - width="120px" - /> - <el-table-column - label="濂楅浠锋牸" - align="center" - prop="price" - width="120px" - /> - <el-table-column - label="濂楅鏄庣粏" - align="center" - prop="allProName" - :show-overflow-tooltip="true" - /> - <!-- :selectable="checkSelectable" --> - <!-- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width"> - <template slot-scope="scope"> - <el-button size="mini" type="text" icon="el-icon-circle-check" @click="handleSeach(scope.row)" - v-hasPermi="['system:package:Seach']">濂楅璇︽儏 - </el-button> - </template> -</el-table-column> --> + <div class="grid-content bg-purple" style="margin-left: 5px; width: 98%"> + <el-table v-loading="loading" element-loading-text="姝e湪鍔犺浇涓�..." element-loading-spinner="el-icon-loading" + border :data="newpacName" @selection-change="handleSelectionChange" height="450px" ref="tb"> + <el-table-column type="selection" width="40px" align="center" label="閫夋嫨" /> + <el-table-column label="濂楅鍚嶇О" align="center" prop="pacName" width="120px" /> + <el-table-column label="濂楅浠锋牸" align="center" prop="price" width="120px" /> + <el-table-column label="濂楅鏄庣粏" align="center" prop="allProName" :show-overflow-tooltip="true" /> </el-table> </div> </div> @@ -606,103 +310,59 @@ <!-- <div class="tab3"> --> <el-row :gutter="20" style="width: 100%"> <el-col :span="6"> - <div - style=" + <div style=" text-align: center; margin-bottom: 10px; margin-top: 10px; - " - > + "> 椤圭洰鍒楄〃 </div> <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterage"> </el-input> <div class="tab3"> - <el-tree - class="filter-tree" - v-loading="loading" - :data="packageList" - :props="defaultProp" - show-checkbox - node-key="id" - @check="handlepackage" - :default-checked-keys="checkedkeys" - :filter-node-method="filterpackage" - ref="treas" - :render-content="renderContents" - > + <el-tree class="filter-tree" v-loading="loading" :data="packageList" :props="defaultProp" show-checkbox + node-key="id" @check="handlepackage" :default-checked-keys="checkedkeys" + :filter-node-method="filterpackage" ref="treas" :render-content="renderContents"> </el-tree> </div> </el-col> <el-col :span="6"> - <div - style=" + <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" - :filter-node-method="filterpackage" - @check-change="handlePackageChecked" - :default-checked-keys="checkedListkey1" - :render-content="renderContent" - > + <el-tree class="filter-tree" v-loading="loading" :data="packagedataList" node-key="proId" + :props="defaultpackProps" :filter-node-method="filterpackage" @check-change="handlePackageChecked" + :default-checked-keys="checkedListkey1" :render-content="renderContent"> </el-tree> </div> </el-col> <el-col :span="11"> <div class="grid-content bg-purple"> - <div - style=" + <div style=" text-align: center; margin-bottom: 10px; margin-top: 10px; - " - > + "> 宸查�夐」鐩垪琛� </div> - <el-table - :data="DataLists" - border - style="width: 100%" - height="400" - :span-method="objectspanmethod" - > + <el-table :data="DataLists" border style="width: 100%" height="400" :span-method="objectspanmethod"> <el-table-column prop="propinName" label="妫�鏌ラ」鐩�"> </el-table-column> - <el-table-column - prop="proName" - label="鏄庣粏椤圭洰" - width="260px" - > + <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px"> </el-table-column> <el-table-column prop="proPrice" label="鍘熶环" width="56px"> </el-table-column> - <el-table-column - label="鎿嶄綔" - align="center" - fixed="right" - class-name="small-padding fixed-width" - width="50px" - > + <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="handleDel(scope.row)" - title="鍒犻櫎" - ></el-button> + <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDel(scope.row)" + title="鍒犻櫎"></el-button> </template> </el-table-column> </el-table> @@ -715,122 +375,62 @@ </el-tab-pane> <el-tab-pane label="鍗曢」" name="second"> <div class="tab8"> - <!-- <div class="tab7"> - <v-tree-transfer - :treeData="treedataList" - :defaultProps="{ children: 'tjProjectList', label: 'proName' }" - :defaultKeys="defaultKeys" - @changeKeys="changeCategoryKeys" - :key="datekey" - ></v-tree-transfer> --> - <!-- <el-tree :data="data" show-checkbox node-key="proId" :props="defaultProps" :default-checked-keys="treeList" - @check-change="handleCurrentChecked"> - </el-tree> --> - <!-- </div> --> <el-row :gutter="20"> <el-col :span="6"> - <div - style=" + <div style=" text-align: center; margin-bottom: 10px; margin-top: 10px; - " - > + "> 椤圭洰鍒楄〃 </div> <!-- @input="gaibian" --> <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 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="6"> - <div - style=" + <div style=" text-align: center; margin-bottom: 10px; margin-top: 10px; - " - > + "> 鏄庣粏椤圭洰鍒楄〃 </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 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=" + <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 :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 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" - > + <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> + <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" + title="鍒犻櫎"></el-button> </template> </el-table-column> </el-table> @@ -851,197 +451,80 @@ <el-col :span="15"> <div class="grid-content bg-purple"> <template> - <el-form - :model="form" - :inline="true" - label-width="75px" - style="margin-left: 20px; width: 900px" - > + <el-form :model="form" :inline="true" label-width="75px" style="margin-left: 20px; width: 900px"> <el-form-item label="濮撳悕" prop="cusName"> <span slot="label"> 濮撳悕 </span> - <el-input - v-model="form.cusName" - placeholder="璇疯緭鍏ュ鍚�" - :disabled="isDisabled" - /> + <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled" /> </el-form-item> <el-form-item label="鎬у埆" prop="cusSex"> - <el-select - :disabled="isDisabled" - v-model="form.cusSex" - placeholder="鎬у埆" - style="width: 150px" - > - <el-option - v-for="dict in dict.type.sys_user_sex" - :key="dict.value" - :label="dict.label" - :value="parseInt(dict.value)" - ></el-option> + <el-select :disabled="isDisabled" v-model="form.cusSex" placeholder="鎬у埆" style="width: 150px"> + <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label" + :value="parseInt(dict.value)"></el-option> </el-select> </el-form-item> <el-form-item label="璇佷欢鍙风爜" prop="cusIdcard"> <span slot="label"> 璇佷欢鍙风爜 </span> - <el-input - :disabled="isDisabled" - v-model="form.cusIdcard" - placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" - @input="inputChange" - /> + <el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" @input="inputChange" /> </el-form-item> <el-form-item label="鍗曚綅鍚嶇О" prop="firmName"> - <el-select - v-model="form.firmName" - remote - default-first-option - allow-create - filterable - style="width: 200px" - placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" - clearable - @change="idFn1" - @clear="clear" - > - <el-option - v-for="dict in CompanyList" - :key="dict.cnName" - :label="dict.cnName" - :value="dict.cnName" - /> + <el-select v-model="form.firmName" remote default-first-option allow-create filterable + style="width: 200px" placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @change="idFn1" @clear="clear"> + <el-option v-for="dict in CompanyList" :key="dict.cnName" :label="dict.cnName" :value="dict.cnName" /> </el-select> </el-form-item> <el-form-item label="鍗曚綅閮ㄩ棬" prop="firmDeptName"> - <el-input - v-model="form.firmDeptName" - style="width: 150px" - placeholder="璇疯緭鍏ュ崟浣嶉儴闂�" - @input="inputChange" - /> + <el-input v-model="form.firmDeptName" style="width: 150px" placeholder="璇疯緭鍏ュ崟浣嶉儴闂�" @input="inputChange" /> </el-form-item> <el-form-item label="浣撴绫诲瀷"> <el-select v-model="form.tjType" placeholder="璇烽�夋嫨浣撴绫诲瀷"> - <el-option - v-for="dict in dict.type.dict_team" - :key="dict.value" - :label="dict.label" - :value="dict.value" - :disabled="!form.firmId && dict.value === '1'" - ></el-option> + <el-option v-for="dict in dict.type.dict_team" :key="dict.value" :label="dict.label" + :value="dict.value" :disabled="!form.firmId && dict.value === '1'"></el-option> </el-select> </el-form-item> <el-form-item label="浣撴绫诲埆"> - <el-select - style="width: 200px" - v-model="tjCategory" - placeholder="璇烽�夋嫨浣撴绫诲埆" - > - <el-option - v-for="dict in dict.type.dict_tjtype" - :key="dict.value" - :label="dict.label" - :value="dict.value" - ></el-option> + <el-select style="width: 200px" v-model="tjCategory" placeholder="璇烽�夋嫨浣撴绫诲埆"> + <el-option v-for="dict in dict.type.dict_tjtype" :key="dict.value" :label="dict.label" + :value="dict.value"></el-option> </el-select> <!-- <el-input v-model="form.category" placeholder="璇疯緭鍏ヤ綋妫�绫诲埆" /> --> </el-form-item> <el-form-item label="搴旀敹閲戦"> - <el-input - placeholder="搴旀敹閲戦" - v-model="TotalPrice1" - disabled - style="width: 150px" - ></el-input> + <el-input placeholder="搴旀敹閲戦" v-model="TotalPrice1" disabled style="width: 150px"></el-input> </el-form-item> <el-form-item label="浼樻儬"> <!-- {{ discount }} --> - <el-input-number - ref="inputNumber" - style="width: 150px" - v-model="discount" - :precision="2" - :step="0.1" - :max="10" - :min="0" - @change="numberChange" - :disabled="isfalse" - ></el-input-number> + <el-input-number ref="inputNumber" style="width: 150px" v-model="discount" :precision="1" :step="0.1" + :max="10" :min="0" @change="numberChange" :disabled="isfalse"></el-input-number> </el-form-item> <el-form-item label="瀹炴敹閲戦"> - <el-input - placeholder="瀹炴敹閲戦" - v-model="TotalPrice" - style="width: 206px" - ></el-input> + <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 206px"></el-input> </el-form-item> <br /> <el-form-item style="margin-left: 149px"> - <el-button - type="primary" - @click="Package" - size="mini" - style="margin-right: 20px" - >閫夋嫨濂楅</el-button - > - <el-button - type="primary" - @click="resetpackage" - size="mini" - style="margin-right: 20px" - >閲嶇疆濂楅</el-button - > - <el-button - type="primary" - @click="submitPrice" - :loading="loadingSubmit" - :disabled="confirm || loadingSubmit" - v-if="showHidden.has_charge == 'N'" - size="mini" - >绛惧埌鐧昏</el-button - > - <el-button - type="primary" - @click="submitCheckinfee" - :disabled="confirm" - v-if="showHidden.has_charge == 'Y'" - size="mini" - >鐧昏鏀惰垂</el-button - > + <el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">閫夋嫨濂楅</el-button> + <el-button type="primary" @click="resetpackage" size="mini" style="margin-right: 20px">閲嶇疆濂楅</el-button> + <el-button type="primary" @click="submitPrice" :loading="loadingSubmit" + :disabled="confirm || loadingSubmit" v-if="showHidden.has_charge == 'N'" size="mini">绛惧埌鐧昏</el-button> + <el-button type="primary" @click="submitCheckinfee" :disabled="confirm" + v-if="showHidden.has_charge == 'Y'" size="mini">鐧昏鏀惰垂</el-button> </el-form-item> <!-- </el-form> --> <!-- </div> --> </el-form> </template> - <el-dialog - title="閭瘎" - :visible.sync="malldisble" - :close-on-click-modal="false" - > - <el-form - :model="addAddress" - :rules="rules" - label-width="78px" - style="margin-left: 7px" - > + <el-dialog title="閭瘎" :visible.sync="malldisble" :close-on-click-modal="false"> + <el-form :model="addAddress" :rules="rules" label-width="78px" style="margin-left: 7px"> <el-form-item label="濮撳悕"> - <el-input - placeholder="濮撳悕" - v-model="addAddress.getUser" - ></el-input> + <el-input placeholder="濮撳悕" v-model="addAddress.getUser"></el-input> </el-form-item> <el-form-item label="鐢佃瘽"> - <el-input - placeholder="鐢佃瘽" - v-model="addAddress.phone" - ></el-input> + <el-input placeholder="鐢佃瘽" v-model="addAddress.phone"></el-input> </el-form-item> <el-form-item label="鍦板潃"> - <el-input - placeholder="鍦板潃" - v-model="addAddress.address" - ></el-input> + <el-input placeholder="鍦板潃" v-model="addAddress.address"></el-input> </el-form-item> </el-form> <div slot="footer" class="dialog-footer"> @@ -1050,44 +533,36 @@ </div> </el-dialog> - <div - style=" + <div style=" display: flex; align-items: center; justify-content: flex-start; width: 100%; - " - > - <div - style=" + "> + <div style=" white-space: nowrap; overflow: hidden; text-overflow: ellipsis; margin-left: 46px; font-size: 16px; margin-right: 20px; - " - > + "> <span v-if="this.tableData1[0]">{{ this.tableData1[0].pacName || "" }}</span> - 宸查�夐」鐩潯鏁帮細<span - style="font-weight: 700; color: red; margin-right: 5px" - >{{ this.tableData1.length || 0 }}</span - >鏉� + 宸查�夐」鐩潯鏁帮細<span style="font-weight: 700; color: red; margin-right: 5px">{{ this.tableData1.length || 0 + }}</span>鏉� </div> 宸查�夐」鐩垪琛� </div> - <div - style=" + <div style=" padding: 0px 6px; border: 1px solid #e6ebf5; max-height: 650%; overflow: auto; width: 916px; margin-left: 35px; - " - > + "> <el-table :data="tableData1" border style="width: 100%"> <el-table-column prop="proName" label="椤圭洰" width="180"> </el-table-column> @@ -1095,10 +570,7 @@ <template slot-scope="scope"> <template v-if="isAll(scope.row.proType)"> 鍏ㄩ儴 </template> <template v-else> - <dict-tag - :options="dict.type.sys_user_sex" - :value="scope.row.proType" - /> + <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.proType" /> </template> </template> </el-table-column> @@ -1108,27 +580,16 @@ <el-table-column label="鎶樻墸"> <template slot-scope="scope"> <!-- 鍙緭鍏ョ函鏁板瓧鎶樻墸 --> - <el-input - v-model.number="scope.row.discount" - @input="validateDiscount(scope.row)" - placeholder="杈撳叆鎶樻墸" - size="small" - type="number" - min="0" - step="1" - max="10" - > - </el-input> + <el-input-number v-model.number="scope.row.discount" @input="validateDiscount(scope.row)" + placeholder="杈撳叆鎶樻墸" size="small" type="number" :precision="1" :step="0.1" :max="10" :min="0"> + </el-input-number> </template> </el-table-column> <el-table-column prop="nowPrice" label="瀹炴敹閲戦"> </el-table-column> <el-table-column prop="proCheckMethod" label="鏄惁绌鸿吂"> <template slot-scope="scope"> - <dict-tag - :options="dict.type.sys_yes_no" - :value="scope.row.proCheckMethod" - /> + <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.proCheckMethod" /> </template> </el-table-column> <!-- <el-table-column prop="proCheckMethod" label="鍏垂"> @@ -1140,13 +601,7 @@ </el-table-column> --> <el-table-column label="鎿嶄綔" align="center" width="80px"> <template slot-scope="scope"> - <el-button - size="mini" - type="text" - icon="el-icon-delete" - @click="handleDelete1(scope.row)" - title="鍒犻櫎" - > + <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete1(scope.row)" title="鍒犻櫎"> </el-button> </template> </el-table-column> @@ -1156,163 +611,63 @@ </el-col> </el-row> - <el-dialog - title="瀵兼鍗曢瑙�" - :visible.sync="dialogVisibles" - :close-on-click-modal="false" - > + <el-dialog title="瀵兼鍗曢瑙�" :visible.sync="dialogVisibles" :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="charge" width="59%" height="700px"> <div> - <el-table - id="sig" - v-loading="loading" - :data="feeitems" - @selection-change="handleSelect" - tooltip-effect="dark" - ref="multipleTable" - border - > + <el-table id="sig" v-loading="loading" :data="feeitems" @selection-change="handleSelect" tooltip-effect="dark" + ref="multipleTable" border> <el-table-column type="selection" width="55" align="center" /> - <el-table-column - label="濮撳悕" - align="center" - prop="tjName" - width="100px" - /> + <el-table-column label="濮撳悕" align="center" prop="tjName" width="100px" /> <el-table-column label="鎬у埆" align="center" prop="sex" width="90px"> <template slot-scope="scope"> - <dict-tag - :options="dict.type.sys_user_sex" - :value="scope.row.sex" - /> + <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" /> </template> </el-table-column> - <el-table-column - label="韬唤璇�" - align="center" - prop="idCard" - width="150px" - :show-overflow-tooltip="true" - ></el-table-column> - <el-table-column - label="鎵嬫満鍙�" - align="center" - prop="tjPhone" - width="120px" - :show-overflow-tooltip="true" - ></el-table-column> - <el-table-column - label="浣撴鍙�" - align="center" - prop="tjNumber" - width="160px" - /> - <el-table-column - label="鐧昏鏃堕棿" - align="center" - prop="tjFlowingWater.createTime" - :show-overflow-tooltip="true" - ></el-table-column> - <el-table-column - label="鍗曚綅鍚嶇О" - align="center" - prop="tjComp" - ></el-table-column> - <el-table-column - label="浣撴绫诲瀷" - align="center" - prop="tjType" - width="80px" - > + <el-table-column label="韬唤璇�" align="center" prop="idCard" width="150px" + :show-overflow-tooltip="true"></el-table-column> + <el-table-column label="鎵嬫満鍙�" align="center" prop="tjPhone" width="120px" + :show-overflow-tooltip="true"></el-table-column> + <el-table-column label="浣撴鍙�" align="center" prop="tjNumber" width="160px" /> + <el-table-column label="鐧昏鏃堕棿" align="center" prop="tjFlowingWater.createTime" + :show-overflow-tooltip="true"></el-table-column> + <el-table-column label="鍗曚綅鍚嶇О" align="center" prop="tjComp"></el-table-column> + <el-table-column label="浣撴绫诲瀷" align="center" prop="tjType" width="80px"> <template slot-scope="scope"> - <dict-tag - :options="dict.type.dict_team" - :value="scope.row.tjType" - /> + <dict-tag :options="dict.type.dict_team" :value="scope.row.tjType" /> </template> </el-table-column> - <el-table-column - label="璁㈠崟娴佹按鍙�" - align="center" - prop="tjFlowingWater.waterId" - width="200px" - /> - <el-table-column - label="鏀惰垂鍛�" - align="center" - prop="tjFlowingWater.updateBy" - width="100px" - /> + <el-table-column label="璁㈠崟娴佹按鍙�" align="center" prop="tjFlowingWater.waterId" width="200px" /> + <el-table-column label="鏀惰垂鍛�" align="center" prop="tjFlowingWater.updateBy" width="100px" /> </el-table> <el-row :gutter="10" class="mb8"> <el-col :span="20"> - <el-form - :inline="true" - :model="formInline" - class="demo-form-inline" - style="margin: 12px 6px" - > + <el-form :inline="true" :model="formInline" class="demo-form-inline" style="margin: 12px 6px"> <el-form-item label="搴旀敹閲戦"> - <el-input - style="width: 86px" - :value="formInline.price + '.00'" - placeholder="閲戦" - :disabled="true" - ></el-input> + <el-input style="width: 86px" :value="formInline.price + '.00'" placeholder="閲戦" + :disabled="true"></el-input> </el-form-item> <el-form-item label="浼樻儬"> - <el-input-number - style="width: 140px" - v-model="discount" - :precision="2" - :step="0.1" - :max="10" - :min="0" - @change="numberChange" - :disabled="isfalse" - ></el-input-number> + <el-input-number style="width: 140px" v-model="discount" :precision="1" :step="0.1" :max="10" :min="0" + @change="numberChange" :disabled="isfalse"></el-input-number> </el-form-item> <el-form-item label="瀹炴敹閲戦"> - <el-input - v-model="formInline.paidIn" - placeholder="瀹炰粯" - style="width: 94px" - > + <el-input v-model="formInline.paidIn" placeholder="瀹炰粯" style="width: 94px"> </el-input> </el-form-item> <el-form-item label="浠樻绫诲瀷" prop="payType"> - <el-select - style="width: 120px" - v-model="formInline.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="formInline.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 - style="margin-left: 15px" - type="primary" - size="mini" - @click="SubmitEvent" - >鏀惰垂</el-button - > + <el-button style="margin-left: 15px" type="primary" size="mini" @click="SubmitEvent">鏀惰垂</el-button> </el-form-item> </el-form> </el-col> @@ -1326,24 +681,15 @@ </el-table> </div> </el-dialog> - <el-dialog - title="鎻愮ず" - :visible.sync="cardreader" - width="30%" - :close-on-press-escape="false" - :close-on-click-modal="false" - > + <el-dialog title="鎻愮ず" :visible.sync="cardreader" width="30%" :close-on-press-escape="false" + :close-on-click-modal="false"> <template> <el-radio-group v-model="cardreaderradio" @input="changeradio"> <el-radio :label="3">韬唤璇�</el-radio> <el-radio :label="6">鍋ュ悍鐮�</el-radio> </el-radio-group> <div style="margin-top: 10px" v-show="cardreaderradio == 6"> - <el-input - v-model="inputSSS" - ref="tableHeadFilterInp" - placeholder="璇疯緭鍏ュ唴瀹�" - ></el-input> + <el-input v-model="inputSSS" ref="tableHeadFilterInp" placeholder="璇疯緭鍏ュ唴瀹�"></el-input> </div> </template> <span slot="footer" class="dialog-footer"> @@ -1352,11 +698,7 @@ </span> </el-dialog> <div style="position: absolute; bottom: 100px; width: 360px; display: none"> - <div - id="printBill" - style="width: 280px; font-size: 1px" - ref="printContent" - > + <div id="printBill" style="width: 280px; font-size: 1px" ref="printContent"> <div style="font-size: 1px"> <div style="text-align: center"> <h3>{{ hospName }}灏忕エ</h3> @@ -1727,9 +1069,10 @@ // this.getData(); }, - mounted() {}, + mounted() { }, methods: { + clear() { this.form.firmId = ""; }, @@ -1763,7 +1106,7 @@ }); this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); }) - .catch(() => {}); + .catch(() => { }); }, validateDiscount(row) { if (row.discount > 10) { @@ -1943,8 +1286,8 @@ d.getFullYear() - birthdays.getFullYear() - (d.getMonth() < birthdays.getMonth() || - (d.getMonth() == birthdays.getMonth() && - d.getDate() < birthdays.getDate()) + (d.getMonth() == birthdays.getMonth() && + d.getDate() < birthdays.getDate()) ? 1 : 0); this.form.cusSex = sex; @@ -2101,7 +1444,7 @@ _this.thisVideo.play(); }; }) - .catch((err) => {}); + .catch((err) => { }); }, // 缁樺埗鍥剧墖锛堟媿鐓у姛鑳斤級 @@ -2130,41 +1473,18 @@ this.srcUrl = response.url; }); }, - // base64杞枃浠� - // dataURLtoFile(image, filename) { - // var arr = image.split(","); - // var mime = arr[0].match(/:(.*?);/)[1]; - // var bstr = atob(arr[1]); - // var n = bstr.length; - // var u8arr = new Uint8Array(n); - // while (n--) { - // u8arr[n] = bstr.charCodeAt(n); - // } - // return new File([u8arr], filename, { type: mime }); - // }, - // 鍏抽棴鎽勫儚澶� - - // stopNavigator() { - // this.thisVideo.srcObject.getTracks()[0].stop(); - // this.beat = false; - // }, handleClose(done) { this.$confirm("纭鍏抽棴锛�") .then((_) => { done(); }) - .catch((_) => {}); + .catch((_) => { }); }, /** 鏌ヨ淇℃伅鍒楄〃 */ getList() { - // listCustomer(this.queryParams).then((response) => { - // this.customerList = response.rows; - // this.total = response.total; - // this.loading = false; - // }); getInfo().then((response) => { this.getInfodis = response.user.discount; if (this.getInfodis === null) { @@ -2221,8 +1541,6 @@ }, /** 閲嶇疆鎸夐挳鎿嶄綔 */ resetQuery() { - // this.resetForm("form"); - // this.form = {}; if (this.confirm === true) { this.$tab.refreshPage(); } else { @@ -2237,7 +1555,7 @@ pacId: "", proIds: [], }; - getaddtTransition(data).then((response) => {}); + getaddtTransition(data).then((response) => { }); this.$tab.refreshPage(); }); } else { @@ -2263,13 +1581,12 @@ item.discount = this.discount; const ordPrice = new Big(item.ordPrice); const discount = new Big(item.discount); - const result = ordPrice.times(discount.div(10)); // ordPrice * (discount / 10) + const result = ordPrice.times(discount.div(10)) item.nowPrice = result.toNumber(); this.TotalPrice = this.tableData1.reduce((sum, item) => { return sum.plus(new Big(item.nowPrice || "0")); }, new Big(0)); }); - // ---------------------------------------------------------- }) .catch(() => { this.discount = oldValue; @@ -2510,8 +1827,8 @@ d.getFullYear() - birthdays.getFullYear() - (d.getMonth() < birthdays.getMonth() || - (d.getMonth() == birthdays.getMonth() && - d.getDate() < birthdays.getDate()) + (d.getMonth() == birthdays.getMonth() && + d.getDate() < birthdays.getDate()) ? 1 : 0); _this.form.age = age; // 璧嬪�艰绠楃殑骞撮緞 @@ -2524,15 +1841,7 @@ } } else { this.$message.warning("璇锋斁缃韩浠借瘉鍚庡啀鐐瑰嚮璇诲彇"); - } /* if (resultObj.resultFlag == "-1") { - if (resultObj.errorMsg == "绔彛鎵撳紑澶辫触") { - //alert("璇诲崱鍣ㄦ湭杩炴帴"); - } else { - //alert(resultObj.errorMsg); - } - } else if (resultObj.resultFlag == "-2") { - //alert(resultObj.errorMsg); - } */ + } }, // TODO 浠ヤ笅浠g爜鍙兘鏄尘宸濅娇鐢ㄧ殑 jingChuanHandlerWebSocketResult(resultObj) { @@ -2666,8 +1975,8 @@ d.getFullYear() - birthdays.getFullYear() - (d.getMonth() < birthdays.getMonth() || - (d.getMonth() == birthdays.getMonth() && - d.getDate() < birthdays.getDate()) + (d.getMonth() == birthdays.getMonth() && + d.getDate() < birthdays.getDate()) ? 1 : 0); @@ -2684,23 +1993,9 @@ alert("璇锋鏌ヨ鍗″櫒杩炴帴鏄惁姝e父"); }; } else { - // if (_this.inputSSS.indexOf(":1") != -1) { - - // var str1 = _this.inputSSS.indexOf(":1"); - // var result1 = _this.inputSSS.substring(0, str1); - - // var str2 = _this.inputSSS.indexOf(":1"); - // var result2 = _this.inputSSS.substring( - // str2 + 2, - // _this.inputSSS.length - // ); - - // _this.inputSSS = result1 + result2; - // } _this.inputSSS = _this.inputSSS.replace(":1", ""); var websocket = null; var url = this.valueUrls; - // var url = 'ws://'+ getIp() +':6789/websocket' if ("WebSocket" in window) { websocket = new WebSocket(url); } else if ("MozWebSocket" in window) { @@ -2782,8 +2077,8 @@ d.getFullYear() - birthdays.getFullYear() - (d.getMonth() < birthdays.getMonth() || - (d.getMonth() == birthdays.getMonth() && - d.getDate() < birthdays.getDate()) + (d.getMonth() == birthdays.getMonth() && + d.getDate() < birthdays.getDate()) ? 1 : 0); @@ -2873,52 +2168,6 @@ } }, - // 鐐瑰嚮澶氶�夋鑾峰彇閫変腑鏁版嵁 - // handleSelectionChange(selection, row) { - // this.tableData = selection; - // if (selection.length > 1) { - // let del_row = selection.shift(); - // this.$refs.tb.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑 - // } - // this.single = selection.length !== 1; - // this.multiple = !selection.length; - // this.tableData.forEach((item) => { - // this.fData = item.tjProjectList; - // }); - // if (selection[0]) { - // this.DataList = []; - // this.data = JSON.parse(JSON.stringify(this.dXData)); - // if (selection[0].tjProjectList) { - // selection[0].tjProjectList.forEach((selectionitem) => { - // this.treedataList.forEach((item) => { - // if (selectionitem.proName == item.proName) { - // item.disabled = true; - // item.tjProjectList = []; - // } - // if (item.tjProjectList) { - // item.tjProjectList.forEach((item1) => { - // if (selectionitem.proName == item1.proName) { - // item1.disabled = true; - // item1.tjProjectList = []; - // } - // if (item1.tjProjectList) { - // item1.tjProjectList.forEach((item2) => { - // if (selectionitem.proName == item2.proName) { - // item2.disabled = true; - // item2.tjProjectList = []; - // } - // }); - // } - // }); - // } - // }); - // }); - // } - // } else { - // this.treedataList = JSON.parse(JSON.stringify(this.dXData)); - // return; - // } - // }, resetpackage() { this.discount = 10; @@ -2992,7 +2241,7 @@ }); }); } - } catch (error) {} + } catch (error) { } this.loading = false; }); } @@ -3016,7 +2265,7 @@ }); }); } - } catch (error) {} + } catch (error) { } this.loading = false; }); } @@ -3431,6 +2680,7 @@ this.treeList.push(item9.proId); }); } + this.TotalPrice = 0; this.TotalPrice1 += item.ordPrice; this.TotalPrice += item.nowPrice; @@ -3473,6 +2723,7 @@ this.treeList.push(item9.proId); }); } + this.TotalPrice = 0; this.TotalPrice1 += item.ordPrice; this.TotalPrice += item.nowPrice; @@ -3746,8 +2997,6 @@ listgetOrder(data) { getOrder(data).then((res) => { this.$modal.msgSuccess("鎻愪氦鎴愬姛"); - // this.dialogVisibles = true; - // this.url = window.webkitURL.createObjectURL(res); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl //璋冩帴鍙f樉绀哄妫�鍗� const tjNumber = res.msg; const viewNum = "792931586196398080"; -- Gitblit v1.8.0