From a97ed98a732f533edd1b2b61ca3dbcaec7406306 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 29 十一月 2023 10:41:46 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/product/workbench/feed-pane.vue | 12
vue.config.js | 7
src/views/warehouse/pallettransports/index.vue | 115 +++++++++-----
src/api/warehouse/pallettransports.js | 8 +
src/views/quality/Packaging_ledger/index.vue | 287 +++++++++++++++++++++++++++++++++++
src/views/product/workbench/feed-form.vue | 14
src/views/common/ztt-table.vue | 3
7 files changed, 387 insertions(+), 59 deletions(-)
diff --git a/src/api/warehouse/pallettransports.js b/src/api/warehouse/pallettransports.js
index c2c2b20..54c4c69 100644
--- a/src/api/warehouse/pallettransports.js
+++ b/src/api/warehouse/pallettransports.js
@@ -23,6 +23,14 @@
})
}
+export function selectAll(data) {
+ return request({
+ url: '/mes/palletTransportsDetail/selectAll',
+ method: 'get',
+ params: data
+ })
+}
+
export function putPalletTransports(obj) {
return request({
url: '/mes/palletTransports',
diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue
index 2f5a551..4776dca 100644
--- a/src/views/common/ztt-table.vue
+++ b/src/views/common/ztt-table.vue
@@ -937,7 +937,8 @@
}
},
getDataList(selectedId) {
- this.dataListLoading = true
+ // this.dataListLoading = true
+ this.dataListLoading = false
var criteria = {}
criteria.dateTimeFilters = this.dateTimeFilters
criteria.multiSearchFilter = this.multiSearchFilter
diff --git a/src/views/product/workbench/feed-form.vue b/src/views/product/workbench/feed-form.vue
index e895b0a..ccfa65d 100644
--- a/src/views/product/workbench/feed-form.vue
+++ b/src/views/product/workbench/feed-form.vue
@@ -29,10 +29,10 @@
>
</el-table-column>
<el-table-column
- prop="partDescription"
+ prop="partName"
header-align="center"
align="center"
- label="闆朵欢鎻忚堪"
+ label="闆朵欢"
>
</el-table-column>
<el-table-column
@@ -205,13 +205,13 @@
getCheckRawPart(partNoList).then((response) => {
if (response.data.code === 0) {
// 闇�瑕佸瘑鐮佺‘璁ゆ儏鍐�
- if (response.data.data.success === false) {
- this.messages = response.data.data.message
- this.onnerVisible = true
- } else {
+ //if (response.data.data.success === false) {
+ // this.messages = response.data.data.message
+ // this.onnerVisible = true
+ //} else {
// 涓嶉渶瑕佸瘑鐮� 鐩存帴鎶曟枡
this.saveFeed()
- }
+ //}
}
})
},
diff --git a/src/views/product/workbench/feed-pane.vue b/src/views/product/workbench/feed-pane.vue
index 52b123f..743e9a2 100644
--- a/src/views/product/workbench/feed-pane.vue
+++ b/src/views/product/workbench/feed-pane.vue
@@ -229,16 +229,16 @@
</template>
</el-table-column> -->
<el-table-column
- label="闆朵欢鎻忚堪"
- prop="partDescription"
+ label="闆朵欢"
+ prop="partName"
align="center" show-overflow-tooltip
>
<template slot="header">
- <div style="line-height: 14px;">闆朵欢鎻忚堪</div>
+ <div style="line-height: 14px;">闆朵欢</div>
<div class="th" @click.stop>
<el-input
type="text"
- v-model="queryParamTwo.partDescription"
+ v-model="queryParamTwo.partName"
@keyup.enter.native="handleStockList"
clearable
@clear="handleStockList"
@@ -247,7 +247,7 @@
</div>
</template>
<template slot-scope="scope">
- <span>{{ scope.row.partDescription }}</span>
+ <span>{{ scope.row.partName }}</span>
</template>
</el-table-column>
<el-table-column label="IFS鎵规鍙�" prop="ifsBatchNo" align="center">
@@ -1202,7 +1202,7 @@
:show-overflow-tooltip="true"
>
<template slot="header" slot-scope="scope">
- <div style="line-height: 14px;">闆朵欢鎻忚堪</div>
+ <div style="line-height: 14px;">闆朵欢</div>
<div class="th" @click.stop>
<el-input
type="text"
diff --git a/src/views/quality/Packaging_ledger/index.vue b/src/views/quality/Packaging_ledger/index.vue
new file mode 100644
index 0000000..430bba5
--- /dev/null
+++ b/src/views/quality/Packaging_ledger/index.vue
@@ -0,0 +1,287 @@
+<template>
+ <div class="mod-config">
+ <basic-container>
+ <el-row>
+ <el-col :span="11">
+ <ttable
+ :table="table"
+ :isShowHide="true"
+ :prelang="prelang"
+ :options="options"
+ ref="processconfiguration"
+ >
+ <template #toolbar></template>
+ </ttable>
+ </el-col>
+
+
+ <el-col :span="13" style="padding-left: 10px">
+ <el-card>
+ <div slot="header">
+ <el-row>
+ <el-col :span="8">
+ <span>鏍囧噯鍙傛暟</span>
+ </el-col>
+ <el-col :span="8" :offset="4">
+ <!-- <el-button
+ style="float: right; padding: 3px 0"
+ type="text"
+ @click="beginItemLayOut"
+ >
+ 甯冨眬
+ </el-button> -->
+ </el-col>
+ <el-col :span="2">
+ <!-- <el-button
+ style="float: right; padding: 3px 0"
+ type="text"
+ :disabled="isSubmit"
+ v-thinclick="`dataFormTestStandardParam`"
+ v-if="editable"
+ >淇濆瓨
+ </el-button> -->
+ </el-col>
+ <el-col :span="2">
+ <!-- <el-button
+ style="float: right; padding: 3px 0"
+ type="text"
+ @click="relateOperationParam()"
+ v-if="editable"
+ >娣诲姞
+ </el-button> -->
+ </el-col>
+ </el-row>
+ <el-row>
+ <!-- <span style="font-weight:500" v-if="testNo.length > 0"
+ >鎮ㄥ綋鍓嶉�夋嫨鐨勬娴嬫爣鍑嗙紪鍙锋槸锛�<span style="color:#066EFF">{{
+ testNo
+ }}</span></span
+ > -->
+ </el-row>
+ </div>
+ <el-table
+ :data="testStandardParams"
+ id="testStandardParamTable"
+ ref="testStandardParam"
+ :default-sort="{ prop: 'index' }"
+ highlight-current-row
+ height="700"
+ style="width: 100%"
+ class="l-mes-table"
+ border
+ stripe
+ >
+ <el-table-column
+ prop="index"
+ label="搴忓彿"
+ align="center"
+ width="50"
+ />
+ <!-- <el-table-column
+ label="鏄惁寮曠敤宸ヨ壓鍙傛暟"
+ prop="isReference"
+ align="center"
+ >
+ <template slot-scope="scope">
+ <el-select
+ v-model="scope.row.isReference"
+ placeholder="璇烽�夋嫨"
+ style="width: 100%;"
+ >
+ <el-option
+ v-for="(item, index) in referenceOptions"
+ :key="index"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column label="鏄惁鎶芥" prop="isCheck" align="center">
+ <template slot-scope="scope">
+ <el-select
+ v-model="scope.row.isCheck"
+ placeholder="璇烽�夋嫨"
+ style="width: 100%;"
+ >
+ <el-option
+ v-for="(item, index) in isCheckOptions"
+ :key="index"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="绾胯姱"
+ prop="wireCore"
+ align="center"
+ width="60"
+ >
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.wireCore"></el-input>
+ </template>
+ </el-table-column> -->
+ <el-table-column label="鍙傛暟缂栧彿" prop="code" align="center" />
+ <el-table-column
+ label="鍙傛暟椤�"
+ prop="parameterItem"
+ align="center"
+ />
+ <el-table-column
+ label="瑕佹眰鑼冨洿"
+ prop="referenceValue"
+ align="center"
+ >
+ </el-table-column>
+ <el-table-column
+ label="榛樿鍊�"
+ prop="defaultValue"
+ align="center"
+ >
+ </el-table-column>
+ <el-table-column
+ label="鍙傛暟椤圭被鍨�"
+ prop="paramType"
+ align="center"
+ >
+ </el-table-column>
+ <el-table-column
+ label="鍙傛暟鏍煎紡"
+ prop="parameterFormat"
+ align="center"
+ width="80"
+ >
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.parameterFormat"></el-input>
+ </template>
+ </el-table-column><el-table-column
+ label="娴嬭瘯鏂规硶"
+ prop="purpose"
+ align="center"
+ width="80"
+ >
+ </el-table-column>
+ <el-table-column
+ label="娴嬭瘯鐩殑"
+ prop="method"
+ align="center"
+ width="80"
+ >
+ </el-table-column>
+ <el-table-column label="鍗曚綅" prop="unit" align="center" />
+ </el-table>
+ </el-card>
+ </el-col>
+ </el-row>
+ </basic-container>
+ </div>
+</template>
+
+<script>
+import ttable from '@/views/common/ztt-table.vue'
+export default {
+ data(){
+ return {
+ prelang: 'operation',
+ dataListLoading: false,
+ options: {
+ height: 300, // 榛樿楂樺害-涓轰簡琛ㄥご鍥哄畾
+ stripe: true, // 鏄惁涓烘枒椹汗 table
+ highlightCurrentRow: false, // 鏄惁瑕侀珮浜綋鍓嶈
+ border: true, // 鏄惁鏈夌旱鍚戣竟妗�
+ lazy: false, // 鏄惁闇�瑕佹噿鍔犺浇
+ fit: true, // 鍒楃殑瀹藉害鏄惁鑷拺寮�
+ multiSelect: true, //
+ seqNo: true,
+ isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
+ isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
+ isSearch: true, // 楂樼骇鏌ヨ鎸夐挳
+ defaultOrderBy: { column: 'createTime', direction: 'desc' }
+ },
+ table: {
+ total: 0,
+ currentPage: 1,
+ pageSize: 20,
+ data: [],
+ // 鏍囬
+ column: [
+ {
+ minWidth: '140',
+ prop: 'oo',
+ label: '璁㈠崟缂栧彿',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },{
+ minWidth: '140',
+ prop: 'materhhooial',
+ label: '璐ㄩ噺杩芥函鍙�',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '140',
+ prop: 'mateuurial',
+ label: '浜у搧鍚嶇О',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '140',
+ prop: 'materoiial',
+ label: '瑙勬牸鍨嬪彿',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '140',
+ prop: 'matperoial',
+ label: '鍗曚綅',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '140',
+ prop: 'materpial',
+ label: '鏁伴噺',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '130',
+ width: '150',
+ prop: 'dealTime',
+ label: '鍏ュ簱鏃堕棿',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'datetimerange',
+ },
+ ],
+ toolbar: [
+ {
+ text: 'xxx',
+ type: 'primary',
+ },
+ ],
+ },
+ }
+ },
+ medthods: {},
+// computed: {
+// ...mapGetters(['permissions'])
+// },
+ components: {
+ ttable
+ },
+}
+</script>
\ No newline at end of file
diff --git a/src/views/warehouse/pallettransports/index.vue b/src/views/warehouse/pallettransports/index.vue
index 9f33ac0..9a4dda2 100644
--- a/src/views/warehouse/pallettransports/index.vue
+++ b/src/views/warehouse/pallettransports/index.vue
@@ -17,7 +17,8 @@
<div></div>
</div>
<div style="padding:0px 20px 0px;">
- <el-table class="pallet-transports-optask-table" :data="palletTransportsOptaskData" style="width: 100%;"
+ <el-table class="pallet-transports-optask-table" :data="palletTransportsOptaskData"
+ style="width: 100%;"
v-adaptive="{ bottomOffset: 20, fixedHeight: 0 }" height="100px" border highlight-current-row
@row-click="optaskRowClick" stripe ref="palletTransportsOptaskTable">
<el-table-column align="center" width="55" label="鍗曢��">
@@ -89,7 +90,8 @@
</div>
<div style="margin-top:10px;display:flex;height:36px;justify-content: space-between;align-items:center;">
<div>
- <span style="font-weight:bold;">绉诲簱鏄庣粏</span><span style="color:red;">({{
+ <span style="font-weight:bold;">绉诲簱鏄庣粏</span>
+ <span style="color:red;">({{
palletTransportsMaterialMultipleSelection.length > 0
? palletTransportsMaterialMultipleSelection[
palletTransportsMaterialMultipleSelection.length - 1
@@ -111,27 +113,27 @@
v-adaptive="{ bottomOffset: 20, fixedHeight: 0 }" height="100px" border
@selection-change="palletTransportsDetailSelectionChange" stripe ref="palletTransportsDetailTable">
<el-table-column type="selection" width="55"> </el-table-column>
- <el-table-column prop="partNo" label="闆朵欢鍙�" align="center" show-overflow-tooltip>
+ <el-table-column prop="part_no" label="闆朵欢鍙�" align="center" show-overflow-tooltip>
</el-table-column>
- <el-table-column prop="partDesc" label="闆朵欢鎻忚堪" align="center" show-overflow-tooltip>
+ <el-table-column prop="part_desc" label="闆朵欢鎻忚堪" align="center" show-overflow-tooltip>
</el-table-column>
<!-- <el-table-column prop="batchNo" label="鎵规鍙�" align="center" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="wdr" label="WDR" align="center">
</el-table-column> -->
- <el-table-column prop="operationTaskNo" label="宸ュ崟" align="center" show-overflow-tooltip>
+ <el-table-column prop="operation_task_no" label="宸ュ崟" align="center" show-overflow-tooltip>
</el-table-column>
- <el-table-column prop="transferQuantity" label="绉诲簱鏁伴噺" align="center">
+ <el-table-column prop="transfer_quantity" label="绉诲簱鏁伴噺" align="center">
</el-table-column>
<el-table-column prop="unit" label="鍗曚綅" align="center">
</el-table-column>
<!-- <el-table-column prop="fromIfsLocationNo" label="IFS浠庡簱浣�" align="center">
</el-table-column> -->
- <el-table-column prop="toIfsLocationNo" label="绉昏嚦搴撲綅" align="center">
- <template slot-scope="scope">
+ <el-table-column prop="to_ifs_location_no" label="绉昏嚦搴撲綅" align="center">
+ <!-- <template slot-scope="scope">
<el-link type="primary" @click="openSingleLocationDialog(scope.row)">{{ scope.row.toIfsLocationNo
}}</el-link>
- </template>
+ </template> -->
</el-table-column>
<el-table-column prop="state" label="鐘舵��" align="center">
<template slot-scope="scope">
@@ -146,8 +148,8 @@
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" width="85">
<template slot-scope="scope">
- <el-button type="text" @click="openEditStockDialog(scope.row)"
- :disabled="scope.row.state === '01initial' ? false : true">缂栬緫</el-button>
+ <!-- <el-button type="text" @click="openEditStockDialog(scope.row)"
+ :disabled="scope.row.state === '01initial' ? false : true">缂栬緫</el-button> -->
<el-button type="text" @click="delDetail(scope.row)"
:disabled="scope.row.state === '01initial' ? false : true">鍒犻櫎</el-button>
</template>
@@ -186,7 +188,8 @@
delPalletTransportsMaterialObj,
palletTransportsDetailFetchList,
delPalletTransportsDetailObj,
- executeMoveLocation
+ executeMoveLocation,
+ selectAll,
} from '@/api/warehouse/pallettransports'
import { getByPalletTransId } from '@/api/plan/operationtask'
import ttable from '@/views/common/ztt-table.vue'
@@ -198,7 +201,7 @@
import detailIfsLocationDialog from './detail-ifslocation-form'
import adaptive from '@/util/adaptive'
import { mapGetters } from 'vuex'
-
+import { saveBatchPalletTransportsDetail } from '@/api/warehouse/pallettransports'
export default {
data() {
return {
@@ -211,6 +214,8 @@
isShow: false,
url: ''
},
+ WorkOrder:{},
+ datalistAPI:'',
prelang: 'pallettransports',
options: {
height: 300, // 榛樿楂樺害-涓轰簡琛ㄥご鍥哄畾
@@ -544,25 +549,39 @@
},
// 鑾峰彇绉诲簱鏄庣粏鏁版嵁鍒楄〃
getPalletTransportsDetailData() {
- this.palletTransportsDetailData = []
- if (this.palletTransportsMaterialMultipleSelection.length > 0) {
- const currPalletTransportsMaterial = this
- .palletTransportsMaterialMultipleSelection[
- this.palletTransportsMaterialMultipleSelection.length - 1
- ]
- let obj = {
- partNo: currPalletTransportsMaterial.partNo,
- partDesc: currPalletTransportsMaterial.partDesc,
- operationTaskNo: this.currOptask.optaskNo,
- transferQuantity: currPalletTransportsMaterial.surplusQuantity,
- unit: currPalletTransportsMaterial.unit,
- toIfsLocationNo: currPalletTransportsMaterial.currPalletTransportsMaterial,
- state: null
+ console.log("瀵瑰簲宸ュ崟",this.WorkOrder);
+ console.log("鐗╂枡闇�姹�",this.palletTransportsMaterialMultipleSelection);
+ let transportsDetails =[]
+ transportsDetails = this.palletTransportsMaterialMultipleSelection.map(el =>{
+ return{
+ partNo:el.partNo,
+ partDesc: el.partDesc,
+ transferQuantity: el.surplusQuantity,
+ toIfsLocationNo:el.toIfsLocationNo,
+ toIfsLocationName: el.toIfsLocationName,
+ transportsId: el.transportsId,
+ transportsMaterialId:el.id,
+ operationTaskNo:this.WorkOrder.optaskNo,
+ operationTaskId:this.WorkOrder.id,
+ unit: el.unit,
+ }})
+ // this.palletTransportsDetailData = transportsDetails
+ if (transportsDetails.length > 0) {
+ saveBatchPalletTransportsDetail(transportsDetails)
+ .then((response) => {
+ const resData = response.data
+ if (resData.code === 0) {
+ this.innerVisible = false
+ this.$message.success('娣诲姞绉诲簱鏄庣粏鎴愬姛')
+ this.$emit('refreshDataList')
+ } else {
+ this.$message.error('娣诲姞绉诲簱鏄庣粏澶辫触')
+ }
+ this.palletTransportsMaterialSelectionChange()
+ })
+ .catch(() => {
+ })
}
- this.palletTransportsDetailData.push(obj)
- } else {
- this.$message.error('璇峰厛閫夋嫨鐗╂枡闇�姹�')
- }
},
// 娣诲姞ifs鐗╂枡搴撳瓨鍥炶皟
addIfsStockCallback() {
@@ -600,10 +619,11 @@
},
// 鎵撳紑鍗曚釜鏄庣粏鎵归噺鏇存柊搴撲綅寮规
openSingleLocationDialog(row) {
+ console.log(row);
if (row.state === '01initial') {
this.detailList = []
this.detailList.push(row)
- this.showDetailLocation = true
+ // this.showDetailLocation = true
} else {
this.$message.error('绉诲簱鏄庣粏宸叉墽琛�')
}
@@ -686,16 +706,25 @@
},
palletTransportsMaterialSelectionChange(val) {
this.palletTransportsMaterialMultipleSelection = val
- if (this.palletTransportsMaterialMultipleSelection.length > 0) {
- const currPalletTransportsMaterial = this
- .palletTransportsMaterialMultipleSelection[
- this.palletTransportsMaterialMultipleSelection.length - 1
- ]
- this.materialRow = currPalletTransportsMaterial
- } else {
- this.materialRow = null
- }
- // this.getPalletTransportsDetailData()
+ let ids =[]
+ this.palletTransportsMaterialMultipleSelection.forEach(el =>{ids.push(el.id)})
+ let pId = ids[ids.length - 1];
+ console.log(pId);
+ if(pId!=null){
+ selectAll({
+ transportsId:this.currPalletTransportsRow.id,
+ transportsMaterialId: pId
+ }).then((res) =>{
+ console.log(res);
+ if(res.data.data){
+ this.palletTransportsDetailData.push(res.data.data)
+ }else{
+ this.palletTransportsDetailData = []
+ }
+ })
+ }else{
+ this.palletTransportsDetailData = []
+ }
},
palletTransportsDetailSelectionChange(val) {
this.palletTransportsDetailMultipleSelection = val
@@ -712,6 +741,8 @@
})
},
optaskRowClick(row, column) {
+ console.log(row,222222222222222);
+ this.WorkOrder = row
this.palletTransportsOptaskData.forEach((item) => {
if (row.id !== item.id) {
item.commonChecked = false
diff --git a/vue.config.js b/vue.config.js
index 088a087..627b473 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,12 +2,13 @@
* 閰嶇疆鍙傝��:
* https://cli.vuejs.org/zh/config/
*/
+const url = 'http://192.168.2.7:9999'
+//const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.0.23:9999'
-// const url = 'http://192.168.83.249:9999'
-// const url = 'http://localhost:9999'
+// const url = 'http://localhost:9999'
-const url = 'http://ztt-gateway:9999'
+// const url = 'http://ztt-gateway:9999'
const localUrl = 'http://localhost:8089'
//const localUrl = 'http://10.88.15.95:8089'
const CompressionWebpackPlugin = require('compression-webpack-plugin')
--
Gitblit v1.9.3