From cf83459b41f2a8d172c4129710bd853ccfd2a4bb Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期二, 27 一月 2026 10:56:57 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/basic/gyUnit/gyUnit.vue | 544 ++++++++++++++---------------------------------------
1 files changed, 145 insertions(+), 399 deletions(-)
diff --git a/src/views/basic/gyUnit/gyUnit.vue b/src/views/basic/gyUnit/gyUnit.vue
index 2905483..b563227 100644
--- a/src/views/basic/gyUnit/gyUnit.vue
+++ b/src/views/basic/gyUnit/gyUnit.vue
@@ -1,77 +1,33 @@
<template>
<div style="padding: 10px; position: relative;">
- <el-form
- :model="queryParams"
- ref="queryForm"
- size="small"
- :inline="true"
- label-width="78px"
- class="searchBox"
- >
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="78px" class="searchBox">
<el-row>
<el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px">
- <el-date-picker
- v-model="sTime"
- type="date"
- placeholder="寮�濮嬫棩鏈�"
- style="width: 150px"
- :disabled="queryParams.HInitTimeCycle != -1"
- value-format="yyyy-MM-dd"
- >
+ <el-date-picker v-model="sTime" type="date" placeholder="寮�濮嬫棩鏈�" style="width: 150px"
+ :disabled="queryParams.HInitTimeCycle != -1" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="缁撴潫鏃ユ湡">
- <el-date-picker
- v-model="eTime"
- type="date"
- placeholder="缁撴潫鏃ユ湡"
- style="width: 150px"
- :disabled="queryParams.HInitTimeCycle != -1"
- value-format="yyyy-MM-dd"
- >
+ <el-date-picker v-model="eTime" type="date" placeholder="缁撴潫鏃ユ湡" style="width: 150px"
+ :disabled="queryParams.HInitTimeCycle != -1" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="鏃ユ湡闂撮殧">
- <el-select
- v-model="queryParams.HInitTimeCycle"
- placeholder="璇烽�夋嫨"
- @change="riqiChange"
- >
- <el-option
- v-for="(item, index) in rqsgList"
- :key="index"
- :label="item.label"
- :value="item.value"
- >
+ <el-select v-model="queryParams.HInitTimeCycle" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <el-option v-for="(item, index) in rqsgList" :key="index" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="璁￠噺鍗曚綅浠ｇ爜" prop="HName">
- <el-input
- v-model="queryParams.HName"
- placeholder="璁￠噺鍗曚綅浠ｇ爜"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.HName" placeholder="璁￠噺鍗曚綅浠ｇ爜" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="璁￠噺鍗曚綅鍚嶇О" prop="HNumber">
- <el-input
- v-model="queryParams.HNumber"
- placeholder="璇疯緭鍏ヨ閲忓崟浣嶅悕绉�"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.HNumber" placeholder="璇疯緭鍏ヨ閲忓崟浣嶅悕绉�" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="缁勭粐">
- <el-select
- v-model="queryParams.HOrgID"
- placeholder="璇烽�夋嫨"
- class="ForFilteringSchemes"
- >
- <el-option
- v-for="(item, index) in organizationList"
- :key="index"
- :label="item.Name"
- :value="item.ID.toString()"
- >
+ <el-select v-model="queryParams.HOrgID" placeholder="璇烽�夋嫨" class="ForFilteringSchemes">
+ <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name"
+ :value="item.ID.toString()">
</el-option>
</el-select>
</el-form-item>
@@ -85,132 +41,69 @@
<el-row>
<el-form-item label-width="0">
<el-col :span="7">
- <el-select
- v-model="queryParams.ColName1"
- placeholder="璇烽�夋嫨"
- @change="riqiChange"
- class="ForFilteringSchemes"
- >
+ <el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" @change="riqiChange"
+ class="ForFilteringSchemes">
<span v-for="(item, index) in btList" :key="index">
- <el-option
- :label="item.field"
- :value="item.field"
- v-if="!item.hide"
- ></el-option>
+ <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
</span>
</el-select>
</el-col>
<el-col :span="6" style="padding: 0 10px">
- <el-select
- v-model="queryParams.Comparator1"
- placeholder="璇烽�夋嫨"
- @change="riqiChange"
- class="ForFilteringSchemes"
- >
- <el-option
- v-for="(item, index) in comparatorList"
- :key="index"
- :label="item.label"
- :value="item.value"
- ></el-option>
+ <el-select v-model="queryParams.Comparator1" placeholder="璇烽�夋嫨" @change="riqiChange"
+ class="ForFilteringSchemes">
+ <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+ :value="item.value"></el-option>
</el-select>
</el-col>
<el-col :span="11">
- <el-input
- v-model="queryParams.ColContent1"
- placeholder="璇疯緭鍏�"
- clearable
- @keyup.enter.native="handleQuery"
- class="ForFilteringSchemes"
- />
+ <el-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" clearable
+ @keyup.enter.native="handleQuery" class="ForFilteringSchemes" />
</el-col>
</el-form-item>
</el-row>
<el-row>
<el-form-item label-width="0">
<el-col :span="7">
- <el-select
- v-model="queryParams.ColName2"
- placeholder="璇烽�夋嫨"
- @change="riqiChange"
- class="ForFilteringSchemes"
- >
+ <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" @change="riqiChange"
+ class="ForFilteringSchemes">
<span v-for="(item, index) in btList" :key="index">
- <el-option
- :label="item.field"
- :value="item.field"
- v-if="!item.hide"
- ></el-option>
+ <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
</span>
</el-select>
</el-col>
<el-col :span="6" style="padding: 0 10px">
- <el-select
- v-model="queryParams.Comparator2"
- placeholder="璇烽�夋嫨"
- @change="riqiChange"
- class="ForFilteringSchemes"
- >
+ <el-select v-model="queryParams.Comparator2" placeholder="璇烽�夋嫨" @change="riqiChange"
+ class="ForFilteringSchemes">
<span v-for="(item, index) in btList" :key="index">
- <el-option
- :label="item.field"
- :value="item.field"
- v-if="!item.hide"
- ></el-option>
+ <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
</span>
</el-select>
</el-col>
<el-col :span="11">
- <el-input
- v-model="queryParams.ColContent2"
- placeholder="璇疯緭鍏�"
- clearable
- @keyup.enter.native="handleQuery"
- class="ForFilteringSchemes"
- />
+ <el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" clearable
+ @keyup.enter.native="handleQuery" class="ForFilteringSchemes" />
</el-col>
</el-form-item>
</el-row>
<el-row>
<el-form-item label-width="0">
<el-col :span="7">
- <el-select
- v-model="queryParams.ColName"
- placeholder="璇烽�夋嫨"
- @change="riqiChange"
- class="ForFilteringSchemes"
- >
- <el-option
- v-for="(item, index) in btList"
- :key="index"
- :label="item.field"
- :value="item.field"
- ></el-option>
+ <el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange"
+ class="ForFilteringSchemes">
+ <el-option v-for="(item, index) in btList" :key="index" :label="item.field"
+ :value="item.field"></el-option>
</el-select>
</el-col>
<el-col :span="6" style="padding: 0 10px">
- <el-select
- v-model="queryParams.Comparator"
- placeholder="璇烽�夋嫨"
- @change="riqiChange"
- class="ForFilteringSchemes"
- >
- <el-option
- v-for="(item, index) in comparatorList"
- :key="index"
- :label="item.label"
- :value="item.value"
- ></el-option>
+ <el-select v-model="queryParams.Comparator" placeholder="璇烽�夋嫨" @change="riqiChange"
+ class="ForFilteringSchemes">
+ <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+ :value="item.value"></el-option>
</el-select>
</el-col>
<el-col :span="11">
- <el-input
- v-model="queryParams.ColContent"
- placeholder="璇疯緭鍏�"
- clearable
- @keyup.enter.native="handleQuery"
- class="ForFilteringSchemes"
- />
+ <el-input v-model="queryParams.ColContent" placeholder="璇疯緭鍏�" clearable
+ @keyup.enter.native="handleQuery" class="ForFilteringSchemes" />
</el-col>
</el-form-item>
</el-row>
@@ -221,11 +114,8 @@
<el-form-item label-width="78px">
<el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">
- 鎼� 绱�</el-button
- >
- <el-button icon="el-icon-circle-close" size="small" @click="searchOpen = false"
- >鍙� 娑�</el-button
- >
+ 鎼� 绱�</el-button>
+ <el-button icon="el-icon-circle-close" size="small" @click="searchOpen = false">鍙� 娑�</el-button>
</el-form-item>
</el-form>
@@ -241,56 +131,26 @@
>
</el-col> -->
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-plus"
- size="mini"
- @click="handleAddEdit((OperationType = 1))"
- id="btn-Add"
- >鏂板</el-button
- >
+ <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddEdit((OperationType = 1))"
+ id="btn-Add">鏂板</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleEdit((row = rowForm), (OperationType = 3))"
- >缂栬緫</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="handleEdit((row = rowForm), (OperationType = 3))">缂栬緫</el-button>
</el-col>
<el-col :span="1.5">
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-delete"
- size="mini"
- :disabled="single"
- @click="handleDelete"
- >鍒犻櫎
+ <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="set_CheckBill(1, (form = rowForm))"
- >瀹℃牳</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="set_CheckBill(1, (form = rowForm))">瀹℃牳</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="set_CheckBill(2, (form = rowForm))"
- >鍙嶅鏍�</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="set_CheckBill(2, (form = rowForm))">鍙嶅鏍�</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
@@ -314,140 +174,62 @@
>鍙嶇鐢�</el-button
>
</el-col> -->
-
+
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="set_De_Stop(0, (form = rowForm))"
- >绂佺敤</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="set_De_Stop(0, (form = rowForm))">绂佺敤</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="set_De_Stop(1, (form = rowForm))"
- >鍙嶇鐢�</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="set_De_Stop(1, (form = rowForm))">鍙嶇鐢�</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- >瀵煎嚭</el-button
- >
+ <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-download"
- size="mini"
- @click="handleRowHide"
- >闅愯棌鍒楄缃�</el-button
- >
+ <el-button type="primary" icon="el-icon-download" size="mini" @click="handleRowHide">闅愯棌鍒楄缃�</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch"
- >鎼� 绱�</el-button
- >
+ <el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch">鎼� 绱�</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
- >閲� 缃�</el-button
- >
+ <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
</el-col>
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
</el-row>
<div class="tableBox" v-loading="loading">
- <el-table
- :data="tableData"
- ref="tableData"
- max-height="750"
- :summary-method="getSummaries"
- @selection-change="handleSelectionChange"
- show-summary
- border
- @row-click="handleRowClick"
- :row-style="rowStyle"
- @cell-dblclick="handleDblclick"
- v-if="tableShow"
- >
+ <el-table :data="tableData" ref="tableData" max-height="750" :summary-method="getSummaries"
+ @selection-change="handleSelectionChange" show-summary border @row-click="handleRowClick" :row-style="rowStyle"
+ @cell-dblclick="handleDblclick" v-if="tableShow">
<template v-for="(item, index) in btList">
- <el-table-column
- type="selection"
- width="55"
- align="center"
- :fixed="item.fixed"
- v-if="item.type == 'checkbox'"
- :key="index"
- />
- <el-table-column
- :align="item.align"
- :prop="item.field"
- :label="item.title"
- :width="item.width"
- :key="item.sorderid"
- v-else-if="!item.hide && item.type != 'checkbox'"
- :sortable="item.sort"
- show-overflow-tooltip
- :fixed="item.fixed"
- >
+ <el-table-column type="selection" width="55" align="center" :fixed="item.fixed" v-if="item.type == 'checkbox'"
+ :key="index" />
+ <el-table-column :align="item.align" :prop="item.field" :label="item.title" :width="item.width"
+ :key="item.sorderid" v-else-if="!item.hide && item.type != 'checkbox'" :sortable="item.sort"
+ show-overflow-tooltip :fixed="item.fixed">
<template slot-scope="{ row, column }">
<el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
<div :style="item.style">
<span v-if="column.property.includes('鏃ユ湡')">{{
parseTime(row[column.property], "{y}-{m}-{d}")
}}</span>
- <el-button
- type="text"
- @click.stop="handleEdit(row, (OperationType = 3))"
- v-else-if="column.property == '璁￠噺鍗曚綅浠ｇ爜'"
- >{{ row.璁￠噺鍗曚綅浠ｇ爜}}</el-button
- >
+ <el-button type="text" @click.stop="handleEdit(row, (OperationType = 3))"
+ v-else-if="column.property == '璁￠噺鍗曚綅浠ｇ爜'">{{ row.璁￠噺鍗曚綅浠ｇ爜 }}</el-button>
<span v-else>{{ row[column.label] }}</span>
</div>
</template>
</el-table-column>
</template>
</el-table>
- <pagination
- v-show="total > 0"
- :total="total"
- :page.sync="page"
- :limit.sync="pageSize"
- :pageSizes="pageSizes"
- @pagination="handleQuery"
- />
- <el-dialog
- title="闅愯棌鍒楄缃�"
- :visible.sync="openRowHide"
- width="816px"
- append-to-body
- >
- <RowSettings
- :colName="btResList"
- :HModName="HModName"
- @rowEditClose="rowSetClose"
- v-if="rowHideShow"
- />
+ <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" :pageSizes="pageSizes"
+ @pagination="handleQuery" />
+ <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
+ <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
</el-dialog>
<!-- 缂栬緫 -->
- <el-dialog
- title="缂栬緫璁￠噺鍗曚綅"
- :visible.sync="openEdit"
- width="1480px"
- append-to-body
- class="xsckdBox"
- :before-close="close"
- >
+ <el-dialog title="缂栬緫璁￠噺鍗曚綅" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox"
+ :before-close="close">
<!-- <edit
:OperationType="OperationType"
:linterid="this.rowForm.hmainid"
@@ -461,93 +243,39 @@
<iframe :src="iframeUrl" frameborder="0" width="100%" height="100%"></iframe>
</div>
</el-dialog>
- <el-dialog
- :title="upload.title"
- :visible.sync="upload.open"
- width="1500px"
- append-to-body
- v-if="false"
- >
+ <el-dialog :title="upload.title" :visible.sync="upload.open" width="1500px" append-to-body v-if="false">
<div style="margin-top: -20px">
<el-button type="primary" @click="set_AddNew">瀵煎叆鏁版嵁</el-button>
<el-button type="primary" @click="upload.open = false">閫� 鍑�</el-button>
- <el-upload
- ref="upload"
- :limit="1"
- accept=".xlsx, .xls"
- style="display: inline-block; margin-left: 10px"
- :action="upload.url + '?updateSupport=' + upload.updateSupport"
- :disabled="upload.isUploading"
- :on-progress="handleFileUploadProgress"
- :on-success="handleFileSuccess"
- >
+ <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" style="display: inline-block; margin-left: 10px"
+ :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+ :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess">
<el-button type="primary">鏂囦欢涓婁紶</el-button>
</el-upload>
</div>
- <el-table
- :data="uploadData"
- v-loading="uploadTableLoading"
- :row-class-name="uploadDataIndex"
- border
- height="550"
- >
+ <el-table :data="uploadData" v-loading="uploadTableLoading" :row-class-name="uploadDataIndex" border
+ height="550">
<el-table-column type="index" label="搴忓彿" width="55" align="center" />
<el-table-column label="缁勭粐浠ｇ爜" prop="缁勭粐浠ｇ爜" align="center" width="120" />
<el-table-column label="缁勭粐鍚嶇О" prop="缁勭粐鍚嶇О" align="center" width="120" />
- <el-table-column
- label="鐢熶骇璧勬簮鍚嶇О"
- prop="鐢熶骇璧勬簮鍚嶇О"
- align="center"
- width="120"
- />
- <el-table-column
- label="鐢熶骇璧勬簮浠ｇ爜"
- prop="鐢熶骇璧勬簮浠ｇ爜"
- align="center"
- width="120"
- />
+ <el-table-column label="鐢熶骇璧勬簮鍚嶇О" prop="鐢熶骇璧勬簮鍚嶇О" align="center" width="120" />
+ <el-table-column label="鐢熶骇璧勬簮浠ｇ爜" prop="鐢熶骇璧勬簮浠ｇ爜" align="center" width="120" />
<el-table-column label="閮ㄩ棬浠ｇ爜" prop="閮ㄩ棬浠ｇ爜" align="center" width="120" />
<el-table-column label="閮ㄩ棬鍚嶇О" prop="閮ㄩ棬鍚嶇О" align="center" width="120" />
- <el-table-column
- label="璐熻矗浜轰唬鐮�"
- prop="璐熻矗浜轰唬鐮�"
- align="center"
- width="120"
- />
+ <el-table-column label="璐熻矗浜轰唬鐮�" prop="璐熻矗浜轰唬鐮�" align="center" width="120" />
<el-table-column label="璐熻矗浜�" prop="璐熻矗浜�" align="center" width="120" />
- <el-table-column
- label="宸ヤ綔涓績浠ｇ爜"
- prop="宸ヤ綔涓績浠ｇ爜"
- align="center"
- width="120"
- />
- <el-table-column
- label="宸ヤ綔涓績鍚嶇О"
- prop="宸ヤ綔涓績鍚嶇О"
- align="center"
- width="120"
- />
+ <el-table-column label="宸ヤ綔涓績浠ｇ爜" prop="宸ヤ綔涓績浠ｇ爜" align="center" width="120" />
+ <el-table-column label="宸ヤ綔涓績鍚嶇О" prop="宸ヤ綔涓績鍚嶇О" align="center" width="120" />
<el-table-column label="鍗曠彮宸ユ椂" prop="鍗曠彮宸ユ椂" align="center" width="120" />
<el-table-column label="鎿嶄綔" align="center">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="uploadDataDelete(scope.row)"
- >鍒犻櫎</el-button
- >
+ <el-button size="mini" type="text" icon="el-icon-delete"
+ @click="uploadDataDelete(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
- <pagination
- v-show="uploadTotal > 0"
- :total="uploadTotal"
- :page.sync="uploadPage"
- :limit.sync="uploadPageSize"
- :pageSizes="uploadPageSizes"
- @pagination="currentPage"
- />
+ <pagination v-show="uploadTotal > 0" :total="uploadTotal" :page.sync="uploadPage" :limit.sync="uploadPageSize"
+ :pageSizes="uploadPageSizes" @pagination="currentPage" />
</el-dialog>
</div>
</div>
@@ -633,7 +361,7 @@
selectedRow: null, // 褰撳墠閫変腑鐨勮
rowForm: {},
checkedSysZb: [],
- editData: [],
+ editData: [],
activeName: "first",
searchOpen: false,
// 寮瑰嚭灞傛爣棰�
@@ -719,16 +447,16 @@
this.editGyClose(); // 缁勪欢鍐呯殑鏂规硶缁戝畾鍒皐indows
};
this.queryParams.HOrgID = sessionStorage["OrganizationID"];
+
+ this.riqiChange();
+ this.handleQuery();
},
beforeDestroy() {
// 缁勪欢閿�姣佹椂娓呯悊鍏ㄥ眬鏂规硶锛岄伩鍏嶅唴瀛樻硠婕�
delete window.editGyClose;
},
- created() {
- this.riqiChange();
- this.handleQuery();
- },
+ created() {},
methods: {
onDateScanOptionChangerHandler(e) {
this.queryParams.timeSpan = e;
@@ -770,7 +498,7 @@
defaintOperationByCompanyName() {
var result = false;
axios
- .get(this.baseURL + "/Xt_getInfo/getCompanyName")
+ .get(this.$baseUrl + "/Xt_getInfo/getCompanyName")
.then((res) => {
var data1 = res.data;
if (data1.count == 1) {
@@ -866,13 +594,13 @@
this.pageSize = 50;
}
// 璁￠噺鍗曚綅鍒楄〃
-
+
try {
- let res = await axios.get(this.baseURL + "/Gy_Unit/list1", {
+ let res = await axios.get(this.$baseUrl + "/Gy_Unit/list1", {
params: {
sWhere: this.sWhere,
user: sessionStorage["HUserName"],
- Organization:this.getOrgNameById(this.queryParams.HOrgID)
+ Organization: this.getOrgNameById(this.queryParams.HOrgID)
},
});
this.tyResList = [...JSON.parse(JSON.stringify(res.data.data))]; //鎬绘暟鎹�
@@ -972,7 +700,7 @@
DisPlay_HideColumn(HModName, user, option, dataOption) {
this.totalNameList = [];
axios
- .get(this.baseURL + "/Xt_grdAlignment_WMES/grdAlignmentWMESList", {
+ .get(this.$baseUrl + "/Xt_grdAlignment_WMES/grdAlignmentWMESList", {
params: {
HModName: HModName,
user: user,
@@ -1124,10 +852,13 @@
}
this.lastSelectedRowIndex = this.tableData.indexOf(row);
this.$refs.tableData.toggleRowSelection(row);
+ if (this.openPage) {
+ this.$emit('deptEmit', row, 11)
+ }
},
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
- if (this.ids.includes(row.hmainid)) {
+ if (this.ids.includes(row.HItemID)) {
return { background: "#ecf5ff" };
}
},
@@ -1144,16 +875,30 @@
return;
}
this.OperationType = 3;
+ if (this.openPage) {
+ this.$emit('deptEmitDb', row, 11)
+ }
this.handleEdit(row, this.OperationType);
},
- // 澶氶�夋閫変腑鏁版嵁
+ // 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
// this.rowForm = {}
- this.ids = selection.map((item) => item.hmainid);
- this.single = selection.length != 1;
- this.multiple = !selection.length;
- if (!this.single) {
+ if (this.openPage) {
+ //鍒楄〃鍗曢��
+ if (selection.length > 1) {
+ const del_row = selection.shift();
+ this.$refs.tableData.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ }
+ this.rowForm = {};
+ this.ids = selection.map((item) => item.HItemID);
this.rowForm = selection[0];
+ } else {
+ this.ids = selection.map((item) => item.HItemID);
+ this.single = selection.length != 1;
+ this.multiple = !selection.length;
+ if (!this.single) {
+ this.rowForm = selection[0];
+ }
}
},
//鎵撳紑渚ц竟鎼滅储寮圭獥
@@ -1245,7 +990,7 @@
// if (this.queryParams.HBeginDate && this.queryParams.HEndDate) {
// this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '${this.queryParams.HBeginDate}' and CONVERT(varchar(100),鏃ユ湡, 23) <= '${this.queryParams.HEndDate}'`;
// }
-
+
this.sWhere += this.addSWhereByOpenType();
// this.sWhere += this.getOrgIDByUser();
this.searchOpen = false;
@@ -1257,16 +1002,17 @@
var sWhere = "";
//this.openPage鍒ゆ柇鏄惁鏈夊�硷紝鏈変唬琛ㄥ叾瀹冮〉闈㈤�氳繃閫夋嫨鎸夐挳鎵撳紑
if (this.openPage || window.parent != window.self) {
- sWhere += " and 绂佺敤鏍囧織 != '1' and ISNULL(瀹℃牳浜�,'') != ''";
+ sWhere += " and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'') != ''";
return sWhere;
}
+
return sWhere;
},
//鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈缁勭粐鐨勮繃婊ゆ潯浠�
getOrgIDByUser() {
var res = "";
axios
- .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
+ .get(this.$baseUrl + "/Xt_User/getOrgIDListByUser", {
params: {
HModName: this.HModName,
user: sessionStorage["HUserName"],
@@ -1350,9 +1096,10 @@
.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
.then(() => {
if (!this.rowForm.瀹℃牳浜�) {
- const InterID = this.rowForm.hmainid || this.rowForm.HItemID || this.rowForm.HInterID;
+ const InterID =
+ this.rowForm.hmainid || this.rowForm.HItemID || this.rowForm.HInterID;
axios
- .get(this.baseURL + "DeltetGy_Unit", {
+ .get(this.$baseUrl + "DeltetGy_Unit", {
params: {
HItemID: InterID,
user: sessionStorage["HUserName"],
@@ -1373,14 +1120,14 @@
this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
}
})
- .catch(() => {});
+ .catch(() => { });
},
// 鍙嶅鏍�/瀹℃牳鏁版嵁
set_CheckBill(num, form) {
var InterID = form.HItemID || form.HInterID || form.hmainid;
//閫昏緫瀹℃牳鏂规硶
axios
- .get(this.baseURL + "/Gy_Unit/AuditGy_Unit", {
+ .get(this.$baseUrl + "/Gy_Unit/AuditGy_Unit", {
params: {
HInterID: InterID,
Type: num,
@@ -1390,7 +1137,7 @@
.then((res) => {
let result = res.data;
if (result.code == 1) {
-
+
this.handleQuery();
this.$modal.msgError("閿欒:" + result.code + result.Message);
} else {
@@ -1410,7 +1157,7 @@
var InterID = form.HItemID || form.HInterID;
//閫昏緫瀹℃牳鏂规硶
axios
- .get(this.baseURL + "/Gy_Unit/StopGy_Unit", {
+ .get(this.$baseUrl + "/Gy_Unit/StopGy_Unit", {
params: {
HInterID: InterID,
IsStop: num,
@@ -1462,8 +1209,8 @@
} else {
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
- res.Message +
- "</div>",
+ res.Message +
+ "</div>",
"瀵煎叆缁撴灉",
{ dangerouslyUseHTMLString: true }
);
@@ -1472,16 +1219,15 @@
// 鍋囪鎮ㄦ湁涓�涓粍缁嘔D
-// 鏂规硶1.1锛氫娇鐢� find 鏂规硶
+ // 鏂规硶1.1锛氫娇鐢� find 鏂规硶
getOrgNameById(id) {
- const org = this.organizationList.find(item =>
+ const org = this.organizationList.find(item =>
item.ID.toString() === id.toString()
);
- return org ? org.Name : ''; // 鍙繑鍥炵粍缁囧悕绉�
+ return org ? org.Name : ''; // 鍙繑鍥炵粍缁囧悕绉�
},
-
- // 鎻愪氦涓婁紶鏂囦欢
+ // 鎻愪氦涓婁紶鏂囦欢
submitFileForm() {
this.$refs.upload.submit();
},
@@ -1496,7 +1242,7 @@
var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
axios({
method: "post",
- url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",
+ url: this.$baseUrl + "/Gy_Source/Gy_Source_btnSave",
data: {
sMainSub: sMainSub,
},
@@ -1504,8 +1250,8 @@
.then((res) => {
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
- res.data.Message +
- "</div>",
+ res.data.Message +
+ "</div>",
"瀵煎叆缁撴灉",
{ dangerouslyUseHTMLString: true }
);
@@ -1529,7 +1275,7 @@
return deleteList.indexOf(item.index) == -1;
});
})
- .catch(() => {});
+ .catch(() => { });
},
getPage(page, list) {
let sindex = (parseInt(page) - 1) * this.uploadPageSize;
@@ -1552,7 +1298,7 @@
width: 100%;
}
-.form-item-inline > .el-form-item__content {
+.form-item-inline>.el-form-item__content {
display: flex;
flex-direction: row;
width: 60%;
--
Gitblit v1.9.1