From 6fa91251b0c631ca10c87135b9f8d973e5687797 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期二, 18 三月 2025 14:34:52 +0800
Subject: [PATCH] 修改成品下单退回提交字段
---
src/views/business/productOrder/components/add.vue | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/src/views/business/productOrder/components/add.vue b/src/views/business/productOrder/components/add.vue
index e2d0238..bb0553c 100644
--- a/src/views/business/productOrder/components/add.vue
+++ b/src/views/business/productOrder/components/add.vue
@@ -298,8 +298,7 @@
</el-table>
<el-table ref="productTable" v-loading="getProductLoad" :data="productList"
:row-class-name="tableRowClassName" border class="el-table"
- :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
- :key="upIndex"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
max-height="400px" style="margin-bottom: 10px;" tooltip-effect="dark"
@select="selectOne" @selection-change="selectProduct" @select-all="handleAll">
<el-table-column v-if="active==1" :selectable="selectable0" type="selection" width="65"></el-table-column>
@@ -599,7 +598,7 @@
} from "@/api/business/rawMaterialOrder";
import {
addInsOrder, addInsOrderTemplate, delInsOrderTemplate,
- getQuarterOnOrder,
+ getQuarterOnOrder, selectInsOrderTemplateById,
selectOrderManDay,
updateInsOrder,
upInsOrder,
@@ -609,6 +608,7 @@
import {selectsStandardMethodByFLSSM} from "@/api/standard/standardLibrary";
import limsTable from "@/components/Table/lims-table.vue";
import {selectCustomPageList} from "@/api/system/customer";
+import {mapGetters} from "vuex";
export default {
name: 'Add',
@@ -616,6 +616,9 @@
limsTable,
cableConfig,
AuxiliaryWireCore
+ },
+ computed:{
+ ...mapGetters(["nickName"]),
},
dicts: ['check_type1', 'urgency_level', 'form_type', 'sample_status_list'],
data() {
@@ -902,7 +905,6 @@
this.isSpecial = true
this.$nextTick(() => {
this.$refs.productTable.doLayout();
- this.upIndex++
});
},
getQuarterOnOrderList () {
@@ -983,7 +985,7 @@
},
// 鑾峰彇鐢ㄦ埛鍒楄〃
getAuthorizedPerson() {
- selectUserCondition().then(res => {
+ selectUserCondition({ type: 1 }).then(res => {
let data = []
res.data.forEach(a => {
data.push({
@@ -1271,8 +1273,11 @@
this.addObj.quarterItemId = this.addObj.quarterItemId[1]
}
if(this.tabIndex==4&&this.active==2){
+ if (this.addObj.createTime) {
+ delete this.addObj.createTime
+ }
// 閫�鍥炲悗鎻愪氦
- updateInsOrder({insOrder: this.addObj, sampleList: sampleList}).then(res => {
+ updateInsOrder({insOrder: this.addObj, sampleProduct: sampleList}).then(res => {
this.saveLoad = false
this.$message.success('宸叉彁浜�')
this.bsm3Dia = false;
@@ -1650,14 +1655,13 @@
backtrack([], nums);
return result;
},
- tableRowClassName({
- row,
- rowIndex
- }) {
- if (row.state === 0) {
+ tableRowClassName({row, rowIndex}) {
+ if (row.state == 1) {
+ console.log('row.state---', row.state)
+ return 'warning-row';
+ } else {
return '';
}
- return 'warning-row';
},
selectInsOrderTemplate() {
selectInsOrderTemplate({company: this.addObj.company}).then(res => {
@@ -1710,12 +1714,13 @@
selectInsOrderTemplateById({id: e}).then(res => {
let obj = JSON.parse(res.data)
//鍒跺崟浜鸿缃负褰撳墠鐧诲綍鐢ㄦ埛
- let user = JSON.parse(localStorage.getItem('user'))
+ let user = this.nickName
obj.addObj.custom = user.name
obj.addObj.userId = user.userId
this.addObj = obj.addObj;
this.sampleList = obj.sampleList;
this.selectTree = obj.selectTree
+ this.rowClick(this.sampleList[0])
})
},
delSampleAndProduct() {
@@ -2216,7 +2221,7 @@
</script>
<style scoped>
-.el-table .warning-row .cell {
- color: #3A7BFA;
+>>>.warning-row {
+ color: #1890FF;
}
</style>
--
Gitblit v1.9.3