From 10f334d1b36f8dad1edcd3b489c9eb6b8773d444 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期一, 03 三月 2025 14:47:53 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/business/productOrder/components/add.vue | 74 +++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 35 deletions(-)
diff --git a/src/views/business/productOrder/components/add.vue b/src/views/business/productOrder/components/add.vue
index 93e2d2c..d3e19c0 100644
--- a/src/views/business/productOrder/components/add.vue
+++ b/src/views/business/productOrder/components/add.vue
@@ -50,10 +50,10 @@
</el-select>
</el-form-item>
<el-form-item label="鍒跺崟浜�:">
- <el-input v-model="addObj.custom" disabled size="small"></el-input>
+ <el-input v-model="addObj.custom" disabled size="small" clearable></el-input>
</el-form-item>
<el-form-item label="濮旀墭鍗曚綅:" prop="company">
- <el-input v-model="addObj.company" disabled placeholder="閫夋嫨濮旀墭鍗曚綅" size="small" style="width: 200px">
+ <el-input v-model="addObj.company" disabled placeholder="閫夋嫨濮旀墭鍗曚綅" size="small" style="width: 208px">
<template slot="append">
<el-button slot="append" :disabled="active>1&&tabIndex!=4" icon="el-icon-search"
@click="openCompanyList"></el-button>
@@ -69,14 +69,14 @@
</el-select>
</el-form-item>
<el-form-item label="鏍峰搧鍚嶇О:" prop="sample">
- <el-input v-model="addObj.sample" disabled size="small" style="width: 178px">
+ <el-input v-model="addObj.sample" disabled size="small" style="width: 208px">
<template slot="append"><el-button slot="append" :disabled="active>1&&tabIndex!=4" icon="el-icon-search"
@click="selectStandardTree = true"></el-button></template>
</el-input>
</el-form-item>
- <el-form-item label="鏍峰搧鏁伴噺:" prop="sampleNum">
+ <el-form-item label="鏍峰搧鏁伴噺:" prop="sampleNum" style="margin-right: 0">
<el-input-number v-model="addObj.sampleNum" :disabled="active>1" :max="100" :min="1" :precision="0"
- size="small" style="width: 65%;" @change="addStandardTree"></el-input-number>
+ size="small" @change="addStandardTree"></el-input-number>
</el-form-item>
<el-form-item label="鏍峰搧鐘舵��:" prop="sampleStatus">
<el-select v-model="addObj.sampleStatus" :disabled="active>1&&tabIndex!=4" size="small">
@@ -87,21 +87,9 @@
<el-input v-model="addObj.testQuantity" :disabled="active>1&&tabIndex!=4" clearable size="small"></el-input>
</el-form-item>
<el-form-item label="鏉ユ牱鏂瑰紡:" prop="formType">
- <el-select v-model="addObj.formType" :disabled="active>1&&tabIndex!=4" size="small">
+ <el-select v-model="addObj.formType" :disabled="active>1&&tabIndex!=4" size="small" clearable>
<el-option v-for="(a,ai) in dict.type.form_type" :key="ai" :label="a.label" :value="a.value"></el-option>
</el-select>
- </el-form-item>
- <el-form-item label="鎶ュ憡鍙戦�佹柟寮�:">
- <el-radio-group v-model="addObj.send" :disabled="active>1&&tabIndex!=4">
- <el-radio :label="1">鑷彇</el-radio>
- <el-radio :label="0">鍏朵粬</el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="鏍峰搧澶勭悊鏂瑰紡:">
- <el-radio-group v-model="addObj.processing" :disabled="active>1&&tabIndex!=4">
- <el-radio :label="0">濮旀墭鍗曚綅鍙栧洖</el-radio>
- <el-radio :label="1">瀹為獙瀹ゅ鐞�</el-radio>
- </el-radio-group>
</el-form-item>
<el-form-item label="鐢熶骇鍗曚綅:" prop="production">
<el-input v-model="addObj.production" :disabled="active>1&&tabIndex!=4" clearable placeholder="璇疯緭鍏�"
@@ -111,10 +99,22 @@
<el-input v-model="addObj.productionEn" :disabled="active>1&&tabIndex!=4" clearable placeholder="璇疯緭鍏�"
size="small"></el-input>
</el-form-item>
+ <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-form-item label="鏄惁鐣欐牱:">
- <el-radio-group v-model="addObj.isLeave" :disabled="active>1&&tabIndex!=4">
- <el-radio :label="0">涓嶇暀鏍�</el-radio>
- <el-radio :label="1">鐣欐牱</el-radio>
+ <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-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-form-item label="濮旀墭浜�:">
@@ -125,7 +125,7 @@
</el-form-item>
<el-form-item label="澶囨敞:">
<el-input v-model="addObj.remark" :autosize="{ minRows: 2, maxRows: 2}" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
- size="small" type="textarea"></el-input>
+ size="small" style="width: 100%" type="textarea"></el-input>
</el-form-item>
<el-form-item label="澶囨敞鑻辨枃:">
<el-input v-model="addObj.remarkEn" :autosize="{ minRows: 2, maxRows: 2}" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
@@ -176,10 +176,9 @@
</el-form-item>
</el-form>
</div>
- <div style="display: flex;align-items: center">
+ <div style="display: flex;align-items: center;margin-bottom: 10px">
<span style="width: 150px;font-size: 14px;text-align: right;">鐗规畩鏍囧噯锛�</span>
- <el-input v-model="specialStandardMethod" :disabled="!isSpecial" clearable
- size="small"></el-input>
+ <el-input v-model="specialStandardMethod" :disabled="!isSpecial" clearable size="small"></el-input>
<el-button v-show="active==1" size="small" style="margin-left: 10px"
type="primary" @click="editSpecial">缂栬緫</el-button>
</div>
@@ -432,7 +431,7 @@
</div>
<span slot="footer" class="dialog-footer">
<el-row>
- <el-button @click="issuedDialogVisible=false;goBack">鍙� 娑�</el-button>
+ <el-button @click="issuedDialogVisible=false;closeOpenPage">鍙� 娑�</el-button>
<el-button :loading="upLoad" type="primary" @click="submitForm2">纭� 瀹�</el-button>
</el-row>
</span>
@@ -560,6 +559,7 @@
import {selectCustomPageList} from "@/api/system/customer";
export default {
+ name: 'Add',
components: {
limsTable,
cableConfig,
@@ -1210,7 +1210,7 @@
this.saveLoad = false
this.$message.success('宸叉彁浜�')
this.bsm3Dia = false;
- this.goBack()
+ this.closeOpenPage()
}).catch(e=>{
this.saveLoad = false
})
@@ -1220,7 +1220,7 @@
this.saveLoad = false
this.$message.success('宸叉彁浜�')
this.bsm3Dia = false;
- this.goBack()
+ this.closeOpenPage()
}).catch(e=>{
this.saveLoad = false
})
@@ -1283,7 +1283,7 @@
this.$message.success('鎻愪氦鎴愬姛')
this.upLoad = false
this.issuedDialogVisible = false
- this.goBack()
+ this.closeOpenPage()
}).catch(e => {
this.$message.error('鎻愪氦澶辫触')
this.upLoad = false
@@ -1921,16 +1921,12 @@
state: 2,
id: this.currentId,
tell: this.tell
- }, {
- headers: {
- 'Content-Type': 'application/json'
- }
}).then(res => {
this.noLoading = false;
this.tell = '';
this.$message.success('鎻愪氦鎴愬姛')
this.issuedDialogVisible = false;
- this.goBack()
+ this.closeOpenPage()
})
},
filterHandler(value, row, column) {
@@ -2143,8 +2139,16 @@
this.productList0.splice(index,1)
},
goBack () {
+ if (this.active == 1) {
+ this.$router.go(-1)
+ } else {
+ this.closeOpenPage()
+ }
+ },
+ closeOpenPage() {
this.$router.go(-1)
- }
+ this.$tab.closeOpenPage()
+ },
}
}
</script>
--
Gitblit v1.9.3