From 9e0426e8e28dd530663cdbe80f258d1622cc9e7d Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 21 三月 2025 13:35:02 +0800
Subject: [PATCH] 原材料变更为原辅料，新增基础配置包材
---
src/views/business/productOrder/components/add.vue | 95 +++++++++++++++++++++++++----------------------
1 files changed, 50 insertions(+), 45 deletions(-)
diff --git a/src/views/business/productOrder/components/add.vue b/src/views/business/productOrder/components/add.vue
index 5f151a6..b41c345 100644
--- a/src/views/business/productOrder/components/add.vue
+++ b/src/views/business/productOrder/components/add.vue
@@ -117,13 +117,29 @@
</el-form-item>
</el-col>
<el-col :span="6">
+ <el-form-item label="鎶ュ憡鍙戦�佹柟寮�:">
+ <el-radio-group v-model="addObj.send" :disabled="active>1&&tabIndex!=4" size="mini">
+ <el-radio :label="1" border style="margin-right: 0">鑷彇</el-radio>
+ <el-radio :label="0" border>鍏朵粬</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鏍峰搧澶勭悊鏂瑰紡:">
+ <el-radio-group v-model="addObj.processing" :disabled="active>1&&tabIndex!=4" size="mini" style="display: flex; flex-direction: column;">
+ <el-radio :label="0" border style="margin-right: 0">濮旀墭鍗曚綅鍙栧洖</el-radio>
+ <el-radio :label="1" border>瀹為獙瀹ゅ鐞�</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
<el-form-item label="鐢熶骇鍗曚綅:" prop="production">
<el-input v-model="addObj.production" :disabled="active>1&&tabIndex!=4" clearable placeholder="璇疯緭鍏�"
size="small"></el-input>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="6">
<el-form-item label="鐢熶骇鍗曚綅EN:" prop="productionEn">
<el-input v-model="addObj.productionEn" :disabled="active>1&&tabIndex!=4" clearable placeholder="璇疯緭鍏�"
@@ -131,26 +147,10 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鏍峰搧澶勭悊鏂瑰紡:">
- <el-radio-group v-model="addObj.processing" :disabled="active>1&&tabIndex!=4" size="mini">
- <el-radio :label="0" border style="margin-right: 0">濮旀墭鍗曚綅鍙栧洖</el-radio>
- <el-radio :label="1" border>瀹為獙瀹ゅ鐞�</el-radio>
- </el-radio-group>
- </el-form-item>
- </el-col>
- <el-col :span="6">
<el-form-item label="鏄惁鐣欐牱:">
<el-radio-group v-model="addObj.isLeave" border :disabled="active>1&&tabIndex!=4" size="mini">
<el-radio :label="0" border style="margin-right: 0">涓嶇暀鏍�</el-radio>
<el-radio :label="1" border>鐣欐牱</el-radio>
- </el-radio-group>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鎶ュ憡鍙戦�佹柟寮�:">
- <el-radio-group v-model="addObj.send" :disabled="active>1&&tabIndex!=4" size="mini">
- <el-radio :label="1" border style="margin-right: 0">鑷彇</el-radio>
- <el-radio :label="0" border>鍏朵粬</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -232,6 +232,7 @@
</div>
</div>
<el-table ref="sampleTable" :data="sampleList" border class="el-table sampleTable" highlight-current-row
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
max-height="400px" tooltip-effect="dark" @selection-change="selectSample" @row-click="rowClick">
<el-table-column v-if="active==1" :selectable="selectable" type="selection" width="60"></el-table-column>
<el-table-column align="center" label="搴忓彿" type="index" width="65"></el-table-column>
@@ -295,8 +296,9 @@
</template>
</el-table-column>
</el-table>
- <el-table ref="productTable" v-loading="getProductLoad" :data="productList" :row-class-name="tableRowClassName" border class="el-table"
- :key="upIndex"
+ <el-table ref="productTable" v-loading="getProductLoad" :data="productList"
+ :row-class-name="tableRowClassName" border class="el-table"
+ :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>
@@ -596,7 +598,7 @@
} from "@/api/business/rawMaterialOrder";
import {
addInsOrder, addInsOrderTemplate, delInsOrderTemplate,
- getQuarterOnOrder,
+ getQuarterOnOrder, selectInsOrderTemplateById,
selectOrderManDay,
updateInsOrder,
upInsOrder,
@@ -606,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',
@@ -613,6 +616,9 @@
limsTable,
cableConfig,
AuxiliaryWireCore
+ },
+ computed:{
+ ...mapGetters(["nickName"]),
},
dicts: ['check_type1', 'urgency_level', 'form_type', 'sample_status_list'],
data() {
@@ -899,7 +905,6 @@
this.isSpecial = true
this.$nextTick(() => {
this.$refs.productTable.doLayout();
- this.upIndex++
});
},
getQuarterOnOrderList () {
@@ -980,7 +985,7 @@
},
// 鑾峰彇鐢ㄦ埛鍒楄〃
getAuthorizedPerson() {
- selectUserCondition().then(res => {
+ selectUserCondition({ type: 1 }).then(res => {
let data = []
res.data.forEach(a => {
data.push({
@@ -1125,7 +1130,9 @@
sampleList.forEach(a => {
if (a.insProduct.length > 0) {
a.insProduct.forEach(c => {
- delete c.id
+ if (this.tabIndex != 4) {
+ delete c.id
+ }
})
}
if (a.endModels) {
@@ -1163,7 +1170,9 @@
sampleList.forEach(a => {
if (a.insProduct.length > 0) {
a.insProduct.forEach(c => {
- delete c.id
+ if (this.tabIndex != 4) {
+ delete c.id
+ }
})
}
if (a.endModels) {
@@ -1262,14 +1271,16 @@
}
},
saveMethod(sampleList){
- console.log('sampleList----', sampleList)
this.saveLoad = true
if (this.addObj.quarterItemId) {
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;
@@ -1301,7 +1312,6 @@
company: this.addObj.company
}).then(res => {
this.saveLoad = false
- if (res.code == 201) return
this.$message.success('鎻愪氦鎴愬姛')
selectOrderManDay({
id: this.currentId
@@ -1339,10 +1349,6 @@
userId: this.distributeData.userId,
sonLaboratory:this.distributeData.sonLaboratory
}).then(res => {
- if (res.code === 201) {
- this.upLoad = false
- return
- }
this.$message.success('鎻愪氦鎴愬姛')
this.upLoad = false
this.issuedDialogVisible = false
@@ -1408,7 +1414,6 @@
if (node.data.code === '[3]') {
this.sampleViewEn = val.sampleTypeEn
} else if (node.data.code === '[4]') {
- console.log('node.data---', node.data)
if (node.data.children!==null && node.data.children.length>0) {
this.sampleViewEn = val.sampleEn
}
@@ -1652,14 +1657,12 @@
backtrack([], nums);
return result;
},
- tableRowClassName({
- row,
- rowIndex
- }) {
- if (row.state === 0) {
+ tableRowClassName({row, rowIndex}) {
+ if (row.state == 1) {
+ return 'warning-row';
+ } else {
return '';
}
- return 'warning-row';
},
selectInsOrderTemplate() {
selectInsOrderTemplate({company: this.addObj.company}).then(res => {
@@ -1676,9 +1679,6 @@
delInsOrderTemplate({
id: row.id
}).then(res => {
- if (res.code === 201) {
- return
- }
this.$message.success('鍒犻櫎鎴愬姛')
this.selectInsOrderTemplate()
}).catch(e => {
@@ -1715,12 +1715,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() {
@@ -2221,7 +2222,11 @@
</script>
<style scoped>
-.el-table .warning-row .cell {
- color: #3A7BFA;
+>>>.warning-row {
+ color: #1890FF;
+}
+.node_i {
+ color: orange;
+ font-size: 18px;
}
</style>
--
Gitblit v1.9.3