| UI-Project/config.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| UI-Project/src/lang/zh.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| UI-Project/src/utils/constants.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| UI-Project/src/views/PurchaseReturn/purchaseStorage.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| UI-Project/src/views/ReportWork/reportWork.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
UI-Project/config.js
@@ -1,7 +1,7 @@ export default { // serverUrl: "10.153.19.150:88/api", serverUrl: "192.168.1.199:88/api", // serverUrl2: "10.153.19.150:88" serverUrl2: "192.168.1.199:88" serverUrl: "10.153.19.150:88/api", // serverUrl: "192.168.1.199:88/api", serverUrl2: "10.153.19.150:88" // serverUrl2: "192.168.1.199:88" //serverUrl:"res.abeim.cn" } UI-Project/src/lang/zh.js
@@ -419,5 +419,40 @@ allstatus: '全部入库状态', completedquantity: '完成数量', scrapquantity: '报废数量', } }, reportmanage:{ productiontime :'生产时间', all :'全部', completed :'完工', broke :'破损', takeout :'拿走', dreportwork :'未报工', pendingwork :'待报工', reportwork :'已报工', incise :'切割', edging :'磨边', steel :'钢化', inquire :'查询', signingwork :'报工', reporteam :'报工班组', reportingequipment :'报工设备', line :'线路', process :'工序', glassID :'玻璃ID', projectnumber :'工程号', layoutID :'钢化版图ID', productiontime :'生产时间', type :'类型', state :'状态', processcards :'流程卡', number :'序号', layer :'层', typebreakage :'破损类型', causebreakage :'破损原因', responsibleprocess :'责任工序', responsiblepersonnel :'责任人员', responsibleteam :'责任班组', responsibleequipment :'责任设备', remark :'备注', }, } UI-Project/src/utils/constants.js
@@ -1,3 +1,3 @@ export const WebSocketHost = "192.168.1.199"; // export const WebSocketHost = "10.153.19.150"; // export const WebSocketHost = "192.168.1.199"; export const WebSocketHost = "10.153.19.150"; export const host = "88"; UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -163,11 +163,11 @@ function getRectColora(state) { switch (state) { case 0: return '#d1edc4'; return '#7AC5CD'; case 1: return '#E6E6FA'; return '#95d475'; case -1: return '#dedfe0'; return '#CDAF95'; case 5: return '#911005'; } @@ -175,9 +175,9 @@ function getRectColorb(state) { switch (state) { case 3: return '#f8e3c5'; return '#eebe77'; case 4: return '#F0F8FF'; return '#CD6090'; case 5: return '#911005'; } UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
@@ -73,9 +73,9 @@ function getRectColora(state) { switch (state) { case 3: return '#f8e3c5'; return '#eebe77'; case 4: return '#F0F8FF'; return '#CD6090'; case 5: return '#911005'; } UI-Project/src/views/ReportWork/reportWork.vue
@@ -1,29 +1,33 @@ <template> <div style="height: 600px;"> <span class="demonstration">生产时间</span> <el-date-picker v-model="timeRange" type="daterange" format="YYYY/MM/DD" value-format="YYYY-MM-DD" <div style="display: flex; flex-direction: row; align-items: center; margin-top: 20px;"> <span style="margin-left: 10px;" class="demonstration">生产时间</span> <el-date-picker style="margin-left: 10px;" v-model="timeRange" type="daterange" format="YYYY/MM/DD" value-format="YYYY-MM-DD" start-placeholder="开始时间" end-placeholder="结束时间" :default-time="defaultTime" /> <el-select v-model="report.type" placeholder="清选择类型"> <el-select v-model="report.type" placeholder="清选择类型" style="margin-left: 10px;" > <el-option label="全部" value="0"></el-option> <el-option label="完工" value="1"></el-option> <el-option label="破损" value="2"></el-option> <el-option label="拿走" value="3"></el-option> </el-select> <el-select v-model="report.status" placeholder="清选择状态"> <el-select v-model="report.status" placeholder="清选择状态" style="margin-left: 10px;" > <el-option label="全部" value="0"></el-option> <el-option label="未报工" value="1"></el-option> <el-option label="待报工" value="2"></el-option> <el-option label="已报工" value="3"></el-option> </el-select> <el-select v-model="report.workingProcedure" placeholder="清选择工序"> <el-select v-model="report.workingProcedure" placeholder="清选择工序" style="margin-left: 10px;" > <el-option label="全部" value="0"></el-option> <el-option label="切割" value="1"></el-option> <el-option label="磨边" value="2"></el-option> <el-option label="钢化" value="3"></el-option> </el-select> <el-button type="primary" @click="selectReportData()">查询</el-button> <el-button type="success">报工</el-button> <el-table height="100%" ref="table" :data="reportData" <el-button type="primary" style="margin-left: 10px;" @click="selectReportData()">查询</el-button> <el-button type="success" style="margin-left: 10px;" >报工</el-button> </div> <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading"> <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;"> <el-table height="550" ref="table" :data="reportData" :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }"> <el-table-column prop="teamsGroupsName" align="center" label="报工班组" min-width="120" /> <el-table-column prop="deviceName" align="center" label="报工设备" min-width="120" /> @@ -47,6 +51,8 @@ <el-table-column prop="remark" align="center" label="备注" min-width="120" /> </el-table> </div> </el-card> </div> </template> <script setup> import { Delete, Upload } from '@element-plus/icons-vue'
