From f512991df3c0aa2d85fd4f8affcf13ca6588e9f1 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期三, 21 一月 2026 15:02:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
.env.development | 4
src/views/basic/gyCar/gyCarList.vue | 525 +++++++++----------------------------------
src/views/basic/gyCartypelist/gyCartypelist.vue | 5
src/views/component/AreaDialog/index.vue | 2
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 138 +++++++++--
5 files changed, 236 insertions(+), 438 deletions(-)
diff --git a/.env.development b/.env.development
index b0ad4ec..0c16dc6 100644
--- a/.env.development
+++ b/.env.development
@@ -5,8 +5,8 @@
ENV = 'development'
# 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/寮�鍙戠幆澧�
-# VUE_APP_BASE_API = http://localhost:81/API/
-# VUE_APP_BASE_API = 'http://47.96.97.237/API/'
+# # VUE_APP_BASE_API = http://localhost:81/API/
+VUE_APP_BASE_API = 'http://47.96.97.237/API/'
# VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
VUE_APP_BASE_API = 'http://localhost:8082/LuBaoAPI/'
#閿﹂殕
diff --git a/src/views/basic/gyCar/gyCarList.vue b/src/views/basic/gyCar/gyCarList.vue
index a17b3ea..3d9099a 100644
--- a/src/views/basic/gyCar/gyCarList.vue
+++ b/src/views/basic/gyCar/gyCarList.vue
@@ -1,77 +1,33 @@
<template>
- <div style="padding: 10px">
- <el-form
- :model="queryParams"
- ref="queryForm"
- size="small"
- :inline="true"
- label-width="78px"
- class="searchBox"
- >
+ <div style="padding: 10px; position: relative;">
+ <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,64 +131,28 @@
>
</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-button
- type="primary"
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleEdit((row = rowForm), (OperationType = 2))"
- >澶嶅埗</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="handleEdit((row = rowForm), (OperationType = 2))">澶嶅埗</el-button>
</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(0, (form = rowForm))"
- >瀹℃牳</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="set_CheckBill(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_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
@@ -323,178 +177,76 @@
>
</el-col> -->
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="set_CloseBill(1, (form = rowForm))"
- >鍏抽棴</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="set_CloseBill(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_CloseBill(2, (form = rowForm))"
- >鍙嶅叧闂�</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="set_CloseBill(2, (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_CloseRow(0, (form = rowForm))"
- >琛屽叧闂�</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="set_CloseRow(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_CloseRow(1, (form = rowForm))"
- >琛屽弽鍏抽棴</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="set_CloseRow(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_DropBill(1, (form = rowForm))"
- >浣滃簾</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="set_DropBill(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_DropBill(2, (form = rowForm))"
- >鍙嶄綔搴�</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="set_DropBill(2, (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"
@@ -508,93 +260,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>
@@ -1177,6 +875,9 @@
}
this.lastSelectedRowIndex = this.tableData.indexOf(row);
this.$refs.tableData.toggleRowSelection(row);
+ if (this.openPage) {
+ this.$emit('deptEmit', row, 14)
+ }
},
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
@@ -1197,7 +898,11 @@
return;
}
this.OperationType = 3;
- this.handleEdit(row, this.OperationType);
+ if (this.openPage) {
+ this.$emit('deptEmitDb', row, 14)
+ } else {
+ this.handleEdit(row, this.OperationType);
+ }
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
@@ -1427,7 +1132,7 @@
this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
}
})
- .catch(() => {});
+ .catch(() => { });
},
// 鍙嶅鏍�/瀹℃牳鏁版嵁
set_CheckBill(num, form) {
@@ -1591,8 +1296,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 }
);
@@ -1621,8 +1326,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 }
);
@@ -1646,7 +1351,7 @@
return deleteList.indexOf(item.index) == -1;
});
})
- .catch(() => {});
+ .catch(() => { });
},
getPage(page, list) {
let sindex = (parseInt(page) - 1) * this.uploadPageSize;
@@ -1669,7 +1374,7 @@
width: 100%;
}
-.form-item-inline > .el-form-item__content {
+.form-item-inline>.el-form-item__content {
display: flex;
flex-direction: row;
width: 60%;
diff --git a/src/views/basic/gyCartypelist/gyCartypelist.vue b/src/views/basic/gyCartypelist/gyCartypelist.vue
index e05f100..0c9388c 100644
--- a/src/views/basic/gyCartypelist/gyCartypelist.vue
+++ b/src/views/basic/gyCartypelist/gyCartypelist.vue
@@ -175,6 +175,7 @@
components: { RowSettings, Edit },
props: {
openPage: { type: String, },
+ volume:{},
},
data() {
return {
@@ -434,7 +435,7 @@
this.$refs.tableData.toggleRowSelection(row);
if (this.openPage) {
//this.$emit('carTypeEmit', row, 1)
- this.$emit('deptEmitDb', row, 7)
+ this.$emit('deptEmit', row, 13)
}
},
@@ -457,7 +458,7 @@
this.OperationType = 3
if (this.openPage) {
//this.$emit('carTypeEmitDb', row, 1)
- this.$emit('deptEmitDb', row, 7)
+ this.$emit('deptEmitDb', row, 13)
} else {
this.handleEdit();
}
diff --git a/src/views/component/AreaDialog/index.vue b/src/views/component/AreaDialog/index.vue
index edeb50d..719b6d2 100644
--- a/src/views/component/AreaDialog/index.vue
+++ b/src/views/component/AreaDialog/index.vue
@@ -216,6 +216,8 @@
components: { RowSettings, Edit },
props: {
openPage: { type: String, },
+ HBeginAddrName: { type: String, },
+ HEndAddrName: { type: String, },
},
data() {
return {
diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
index 49f5425..5684ebd 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -54,7 +54,7 @@
<el-form-item label="濮嬪彂鍦�" prop="HBeginAddrName">
<el-input v-model="form.HBeginAddrName" placeholder="璇疯緭鍏ュ鍙戝湴">
<el-button slot="append" icon="el-icon-search"
- @click="openDataDialog('鏆傛棤')"></el-button>
+ @click="openDataDialog(3, areaType = 'b')"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -62,7 +62,7 @@
<el-form-item label="鐩殑鍦�" prop="HEndAddrName">
<el-input v-model="form.HEndAddrName" placeholder="璇疯緭鍏ョ洰鐨勫湴">
<el-button slot="append" icon="el-icon-search"
- @click="openDataDialog('鏆傛棤')"></el-button>
+ @click="openDataDialog(3, areaType = 'e')"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -434,7 +434,9 @@
</el-table-column>
<el-table-column align="center" label="鍣ㄥ叿浠ｇ爜" width="120">
<template slot-scope="scope">
- <el-input v-model="scope.row.HMouldNumber" placeholder="璇疯緭鍏ュ櫒鍏蜂唬鐮�" />
+ <el-input v-model="scope.row.HMouldNumber" placeholder="璇疯緭鍏ュ櫒鍏蜂唬鐮�"
+ @keyup.native.f7="openDataDialog(8, scope.row)"
+ @dblclick.native="openDataDialog(8, scope.row)" />
</template>
</el-table-column>
<el-table-column align="center" label="鍣ㄥ叿鍚嶇О" width="120">
@@ -476,7 +478,8 @@
<el-table-column align="center" label="鐗╂枡鏁伴噺" width="120">
<template slot-scope="scope">
<el-input-number v-model="scope.row.HQty" :min="0" style="width: 90px;"
- controls-position="right"></el-input-number>
+ controls-position="right"
+ @change="checkTotalQtyExceed(scope.row)"></el-input-number>
</template>
</el-table-column>
<el-table-column align="center" label="浣撶Н" width="120">
@@ -513,11 +516,13 @@
:propsHOrgID="form.HOrgID" v-if="xsSeOutStockBillShow" />
<GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
<GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
- <GyCartype @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCartypeShow" />
+ <GyCartype @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :volume="form.HCarTypeMaxVolume" v-if="gyCartypeShow" />
<GyCar @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCarShow" />
<GyDriver @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyDriverShow" />
<ContractTransport @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName"
v-if="ContractTransportShow" />
+ <GyMould @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
+ <AreaDialog @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :HBeginAddrName="form.HBeginAddrName" :HEndAddrName="form.HEndAddrName" v-if="AreaDialogShow" />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
<el-button @click="deptClose">鍙� 娑�</el-button>
@@ -545,9 +550,11 @@
import GyCar from "@/views/basic/gyCar/gyCarList.vue"
import GyDriver from "@/views/system/user/GyDriver.vue"
import ContractTransport from "@/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue"
+import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
+import AreaDialog from "@/views/component/AreaDialog"
export default {
name: 'SellOutBill',
- components: { Dept, Warehouse, Material, RowSettings, XsSeOutStockBill, GyCustomer, GySupplier, GyCartype, GyCar, GyDriver, ContractTransport },
+ components: { Dept, Warehouse, Material, RowSettings, XsSeOutStockBill, GyCustomer, GySupplier, GyCartype, GyCar, GyDriver, ContractTransport, GyMould, AreaDialog },
props: {
OperationType: { type: Number, },
linterid: { type: Number, },
@@ -588,7 +595,10 @@
gyCarShow: false, //杞﹁締鏁版嵁缁勪欢鏄剧ず鏍囪
gyDriverShow: false, //鍙告満鏁版嵁缁勪欢鏄剧ず鏍囪
ContractTransportShow: false, //鎵胯繍鍚堝悓鏁版嵁缁勪欢鏄剧ず鏍囪
+ gyMouldShow: false, //瀹瑰櫒鏁版嵁缁勪欢鏄剧ず鏍囪
+ AreaDialogShow: false, //鐩殑鍦版暟鎹粍浠舵樉绀烘爣璁�
deptform: {}, //寮圭獥閫変腑鏁版嵁
+ areaType: '',//鍦板尯閫夋嫨绫诲瀷
temp: undefined, //涓存椂鍙橀噺
btResList: [], // 鍒楄缃�
@@ -1050,8 +1060,8 @@
this.warehouseShow = true
this.openData = true
} else if (num == 3) {
- this.dialogTitle = '鐗╂枡鍒楄〃'
- this.materialShow = true
+ this.dialogTitle = '鍦板尯鍒楄〃'
+ this.AreaDialogShow = true;
this.openData = true
} else if (num == 4) {
this.dialogTitle = '浠撲綅鍒楄〃'
@@ -1064,6 +1074,10 @@
} else if (num == 7) {
this.dialogTitle = '瀹㈡埛鍒楄〃'
this.gyCustomerShow = true
+ this.openData = true
+ } else if (num == 8) {
+ this.dialogTitle = '瀹瑰櫒鍒楄〃'
+ this.gyMouldShow = true
this.openData = true
} else if (num == 12) {
this.dialogTitle = '婧愬崟鍒楄〃'
@@ -1099,6 +1113,7 @@
this.gyCarShow = false
this.gyDriverShow = false
this.ContractTransportShow = false
+ this.gyMouldShow = false
},
//#endregion
//#endregion
@@ -1119,15 +1134,15 @@
this.editData[this.zbIndex].HSPID = deptRow.HItemID;
this.editData[this.zbIndex].浠撲綅鍚嶇О = deptRow.浠撲綅鍚嶇О;
this.openData = false
- } else if (num == 3) { //鐗╂枡
- this.editData[this.zbIndex].HMaterID = deptRow.HItemID;
- this.editData[this.zbIndex].鐗╂枡浠ｇ爜 = deptRow.鐗╂枡浠ｇ爜;
- this.editData[this.zbIndex].鐗╂枡鍚嶇О = deptRow.鐗╂枡鍚嶇О;
- this.editData[this.zbIndex].HUnitID = deptRow.HUnitID;
- this.editData[this.zbIndex].瑙勬牸鍨嬪彿 = deptRow.瑙勬牸鍨嬪彿
- this.editData[this.zbIndex].璁￠噺鍗曚綅 = deptRow.璁￠噺鍗曚綅鍚嶇О
- this.editData[this.zbIndex].HTaxPrice = deptRow.鍚◣鎴愭湰浠�
- this.editData[this.zbIndex].HTaxRate = deptRow.榛樿绋庣巼
+ } else if (num == 3) { //鍦板尯
+ if (this.areaType == 'b') {
+ this.form.HBeginAddrName = deptRow.鍦板尯鍚嶇О
+ this.form.HBeginAddr = deptRow.HItemID
+ } else if (this.areaType == 'e') {
+ this.form.HEndAddrName = deptRow.鍦板尯鍚嶇О
+ this.form.HEndAddr = deptRow.HItemID
+ }
+ this.AreaDialogShow = false;
this.openData = false
} else if (num == 6) {
this.form.HCarrierName = deptRow.渚涘簲鍟嗗悕绉�
@@ -1139,6 +1154,16 @@
this.form.HCusID = deptRow.HItemID
this.gyCustomerShow = false
this.openData = false
+ } else if (num == 8) {
+ console.log(deptRow)
+ this.editData[this.zbIndex].HMouldID = deptRow.hmainid
+ this.editData[this.zbIndex].HMouldNumber = deptRow.妯″叿缂栧彿
+ this.editData[this.zbIndex].HMouldName = deptRow.妯″叿鍚嶇О
+ this.editData[this.zbIndex].HMouldLength = deptRow.闀�
+ this.editData[this.zbIndex].HMouldWidth = deptRow.瀹�
+ this.editData[this.zbIndex].HMouldFoldHeight = deptRow.鎶樺彔楂樺害
+ this.gyMouldShow = false
+ this.openData = false
} else if (num == 12) {
// 浣跨敤寮傛鏂瑰紡澶勭悊婧愬崟鏁版嵁
this.processSourceDataAsync(deptRow);
@@ -1146,7 +1171,7 @@
this.form.HCarTypeName = deptRow.杞﹀瀷鍚嶇О
this.form.HCarTypeID = deptRow.HItemID
this.form.HCarTypeMaxVolume = deptRow["鏈�澶т綋绉�(绔嬫柟绫�)"]
- this.calculateLoadingRate(parseFloat($('#HTotalVolume').val()) || 0);
+ this.calculateLoadingRate(parseFloat(this.form.HTotalVolume || 0));
this.gyCartypeShow = false
this.openData = false
} else if (num == 14) {
@@ -1236,10 +1261,10 @@
this.form.HCusName = deptRow[0]["瀹㈡埛"];
}
console.log(deptRow)
- this.form.HMainSourceInterID=deptRow[0]["hmainid"]
- this.form.HMainSourceEntryID=deptRow[0]["hsubid"]
- this.form.HMainSourceBillType=deptRow[0]["HBillType"]
- this.form.HMainSourceBillNo=deptRow[0]["鍗曟嵁鍙�"]
+ this.form.HMainSourceInterID = deptRow[0]["hmainid"]
+ this.form.HMainSourceEntryID = deptRow[0]["hsubid"]
+ this.form.HMainSourceBillType = deptRow[0]["HBillType"]
+ this.form.HMainSourceBillNo = deptRow[0]["鍗曟嵁鍙�"]
// 妫�鏌ユ槸鍚︽墍鏈夎褰曞睘浜庡悓涓�瀹㈡埛
for (var i = 0; i < deptRow.length; i++) {
if (deptRow[i]["HCusID"] != this.form.HCusID) {
@@ -1382,7 +1407,6 @@
var qty = materialInfo.HSNP || 0;
var snp = materialInfo.HSNP || 1;
var mouldQty = snp > 0 ? Math.ceil(qty / snp) : 0;
-
var length = parseFloat(materialInfo.闀垮害) || 0;
var width = parseFloat(materialInfo.瀹藉害) || 0;
var height = parseFloat(materialInfo.楂樺害) || 0;
@@ -1766,7 +1790,7 @@
// 璁＄畻瑁呰浇鐜囧嚱鏁�
calculateLoadingRate(totalVolume) {
- var maxVolume = parseFloat((this.form.HCarTypeMaxVolume).val()) || 0;
+ var maxVolume = parseFloat(this.form.HCarTypeMaxVolume) || 0;
if (maxVolume > 0) {
var loadingRate = (totalVolume / maxVolume * 100).toFixed(2);
this.form.HLoadingRate = loadingRate + "%"
@@ -1775,7 +1799,73 @@
}
},
//#endregion
+ checkTotalQtyExceed(selRow) {
+ var tableData = this.editData
+ console.log(tableData)
+ if (!tableData || tableData.length === 0) return;
+ var sourceQtyMap = {};
+ var currentQtyMap = {};
+ tableData.forEach(function (row) {
+ if (row.HSourceInterID && row.HSourceEntryID) {
+ var key = row.HSourceInterID + '_' + row.HSourceEntryID;
+ if (row.HQty_origin) {
+ sourceQtyMap[key] = parseFloat(row.HQty_origin) || 0;
+ }
+ }
+ });
+ tableData.forEach(function (row) {
+ if (row.HSourceInterID && row.HSourceEntryID) {
+ var key = row.HSourceInterID + '_' + row.HSourceEntryID;
+ var currentQty = parseFloat(row.HQty) || 0;
+
+ if (!currentQtyMap[key]) {
+ currentQtyMap[key] = 0;
+ }
+ currentQtyMap[key] += currentQty;
+ }
+ });
+
+ // 妫�鏌ユ槸鍚﹁秴鍑�
+ var exceedSources = [];
+ for (var key in sourceQtyMap) {
+ var sourceQty = sourceQtyMap[key];
+ var currentTotal = currentQtyMap[key] || 0;
+
+ if (currentTotal > sourceQty) {
+
+ var sourceBillNo = '';
+ tableData.some(function (row) {
+ if (row.HSourceInterID + '_' + row.HSourceEntryID === key) {
+ sourceBillNo = row.HSourceBillNo || '鏈煡婧愬崟';
+ return true;
+ }
+ return false;
+ });
+
+ exceedSources.push({
+ sourceBillNo: sourceBillNo,
+ sourceQty: sourceQty,
+ currentTotal: currentTotal
+ });
+ }
+ }
+ console.log(exceedSources)
+
+ if (exceedSources.length > 0) {
+ var message = '鐗╂枡鏁伴噺涔嬪拰瓒呰繃婧愬崟鏁伴噺锛�';
+ exceedSources.forEach(function (item, index) {
+ message += (index + 1) + '. 婧愬崟鍙凤細' + item.sourceBillNo +
+ '锛屾簮鍗曟暟閲忥細' + item.sourceQty +
+ '锛屽綋鍓嶆暟閲忥細' + item.currentTotal;
+ });
+
+ this.$modal.msgError(message);
+ return true; // 琛ㄧず鏈夎秴鍑�
+ }
+
+ return false; // 琛ㄧず娌℃湁瓒呭嚭
+ },
//#region 闄勪欢涓婁紶鐩稿叧鏂规硶
// 鏂囦欢閫夋嫨鍙樺寲鏃剁殑澶勭悊
handleFileChange(file, fileList) {
--
Gitblit v1.9.1