From 6371e0890178fe1fdd9c36f72373a141add90d92 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 12 十二月 2023 17:25:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/plan/manufacturingorder/index.vue | 46 +++++++++------
src/views/quality/packageinspect/packageInspect-form.vue | 87 +++++++++++++++++++----------
src/views/common/documentDetail.vue | 8 +-
src/views/technology/document/teststandard.vue | 4 +
4 files changed, 91 insertions(+), 54 deletions(-)
diff --git a/src/views/common/documentDetail.vue b/src/views/common/documentDetail.vue
index 2f7c052..b93f8e9 100644
--- a/src/views/common/documentDetail.vue
+++ b/src/views/common/documentDetail.vue
@@ -52,7 +52,7 @@
></el-input>
</el-form-item>
</el-col>
- <el-col :span="4">
+ <!-- <el-col :span="4">
<el-form-item label="椤圭洰绫诲埆" prop="projectType">
<el-select
v-model="dataForm.projectType"
@@ -74,7 +74,7 @@
<el-form-item label="鍥藉" prop="country">
<countrySelector v-model="dataForm.country"></countrySelector>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
<el-row>
<el-col :span="5">
@@ -374,7 +374,7 @@
</el-collapse>
</el-card>
</el-tab-pane>
- <el-tab-pane label="鍥剧墖涓婁紶" style="height: 100%">
+ <!-- <el-tab-pane label="鍥剧墖涓婁紶" style="height: 100%">
<el-card class="document-structure">
<div slot="header">
<span>缁撴瀯鍥�</span>
@@ -440,7 +440,7 @@
<img width="100%" :src="dialogFlowImageUrl" alt="" />
</el-dialog>
</el-card>
- </el-tab-pane>
+ </el-tab-pane> -->
</el-tabs>
</div>
</div>
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index e9822f7..ec2c361 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -211,6 +211,10 @@
<el-card class="box-card" v-for="(item, i) in qrData" :key="i" style="margin-bottom: 15px; font-size: 16px !important;">
<el-checkbox :label="i" :key="i" style="position: relative;top:-20px;left:5px"><br></el-checkbox>
<el-row>
+ <el-col :span="10" :offset="3">鎵规鍙�</el-col>
+ <el-col :span="10" style="font-weight: bold;">{{ item.code.moNo2 }}</el-col>
+ </el-row>
+ <el-row>
<el-col :span="10" :offset="3">璁㈠崟鍙凤細</el-col>
<el-col :span="10" style="font-weight: bold;">{{ item.orderNo }}</el-col>
</el-row>
@@ -239,25 +243,29 @@
</el-dialog>
<div class="el-dialog__body" style="width:448.8px;overflow-y: auto;position: absolute;top:9999px;padding: 0;">
<div id="printMOrder">
- <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="margin-bottom:10px;font-size: 16px !important;">
- <el-row>
- <el-col :span="10" :offset="3">璁㈠崟鍙凤細</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.customerOrderNo }}</el-col>
- </el-row>
- <el-row>
- <el-col :span="10" :offset="3">瀹㈡埛鍚嶇О锛�</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.cName }}</el-col>
- </el-row>
- <el-row>
- <el-col :span="10" :offset="3">闆朵欢鍚嶇О锛�</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.pName }}</el-col>
- </el-row>
- <el-row>
- <el-col :span="10" :offset="3">璁㈠崟浜岀淮鐮侊細</el-col>
- <el-col :span="10">
- <vueQr :text="JSON.stringify(item.code)" :size="80" :margin="2"></vueQr>
- </el-col>
- </el-row>
+ <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="padding-top:0px;margin-bottom:10px;font-size: 16px !important;">
+ <el-row style="font-size:12px;">
+ <el-col :span="10" :offset="3">鎵规鍙�</el-col>
+ <el-col :span="10" style="font-weight: bold;">{{ item.code.moNo2 }}</el-col>
+ </el-row>
+ <el-row style="font-size:12px;">
+ <el-col :span="10" :offset="3">璁㈠崟鍙凤細</el-col>
+ <el-col :span="10" style="font-weight: bold;">{{ item.orderNo }}</el-col>
+ </el-row>
+ <el-row style="font-size:12px;">
+ <el-col :span="10" :offset="3">瀹㈡埛鍚嶇О锛�</el-col>
+ <el-col :span="10" style="font-weight: bold;">{{ item.cName }}</el-col>
+ </el-row>
+ <el-row style="font-size:12px;">
+ <el-col :span="10" :offset="3">闆朵欢鍚嶇О锛�</el-col>
+ <el-col :span="10" style="font-weight: bold;">{{ item.pName }}</el-col>
+ </el-row>
+ <el-row style="font-size:12px;">
+ <el-col :span="10" :offset="3">璁㈠崟浜岀淮鐮侊細</el-col>
+ <el-col :span="10">
+ <vueQr :text="JSON.stringify(item.code)" :size="80" :margin="2"></vueQr>
+ </el-col>
+ </el-row>
</el-card>
</div>
</div>
diff --git a/src/views/quality/packageinspect/packageInspect-form.vue b/src/views/quality/packageinspect/packageInspect-form.vue
index 3bada7a..53f333c 100644
--- a/src/views/quality/packageinspect/packageInspect-form.vue
+++ b/src/views/quality/packageinspect/packageInspect-form.vue
@@ -160,6 +160,20 @@
</el-row>
</div>
</div>
+ <el-dialog
+ title="鎻愮ず"
+ :visible.sync="dialogVisible"
+ width="30%">
+ <el-form :model="submitData" ref="form" label-width="100px" >
+ <el-form-item label="璇疯緭鍏ヨ鍙�" prop="lineNo" :rules="{required:true,message:'琛屽彿涓嶈兘涓虹┖',trigger:'blur'}">
+ <el-input v-model="submitData.lineNo" />
+ </el-form-item>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="confirmSubmit(submitData,false)">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
</div>
</template>
@@ -176,6 +190,12 @@
},
data(){
return{
+ submitData: {
+ id:null,
+ result: null,
+ lineNo: null,
+ },
+ dialogVisible: false,
loading: false,
resultVal: null,
dataForm:{
@@ -223,6 +243,11 @@
this.init()
},
watch:{
+ dialogVisible(newVal){
+ if(!newVal){
+ this.$refs.form.resetFields();
+ }
+ }
},
methods:{
changeResult(){
@@ -250,39 +275,41 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- this.checkCustomer(_than.dataForm.id)
- }).catch(() => {})
- },
- checkCustomer(id){
- const _than = this
- if(id){
- getCustomer(id).then(res=>{
+ _than.submitData.id = _than.dataForm.id,
+ _than.submitData.result = _than.conclusionTable[0].result,
+ getCustomer(_than.dataForm.id).then(res=>{
if(res.status===200){
- console.log(res.data);
+ _than.confirmSubmit(_than.submitData,true)
}
}).catch(error=>{
- this.$prompt('璇疯緭鍏ヨ鍙�', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- inputPattern: /\S/,
- inputErrorMessage: '琛屽彿涓嶈兘涓虹┖'
- }).then(({ value }) => {
- let data = {
- id: _than.dataForm.id,
- result: _than.conclusionTable[0].result,
- lineNo: value
- }
- updatePackageInspectById(data).then(res => {
- if(res.data.code === 0){
- _than.resultVal = res.data.data
- sessionStorage.setItem("packIns-resultVal-"+_than.dataForm.id,res.data.data)
- _than.$message.success("涓婃姤鎴愬姛");
- }else{
- _than.$message.error("涓婃姤澶辫触",res.data.data);
- }
- })
- }).catch(() => {
- })
+ console.log("杈撳叆琛屽彿");
+ _than.dialogVisible = true
+ })
+
+ }).catch(() => {})
+ },
+ confirmSubmit(data,isOtc){
+ const _than = this
+ let isSubmit = false
+ if(isOtc){
+ isSubmit = true
+ }else{
+ _than.$refs.form.validate(valid=>{
+ if(valid){
+ isSubmit = true
+ _than.dialogVisible = false
+ }
+ })
+ }
+ if(isSubmit){
+ updatePackageInspectById(data).then(res => {
+ if(res.data.code === 0){
+ _than.resultVal = res.data.data
+ sessionStorage.setItem("packIns-resultVal-"+_than.dataForm.id,res.data.data)
+ _than.$message.success("涓婃姤鎴愬姛");
+ }else{
+ _than.$message.error("涓婃姤澶辫触",res.data.data);
+ }
})
}
},
diff --git a/src/views/technology/document/teststandard.vue b/src/views/technology/document/teststandard.vue
index 2a7da1a..f8aa95a 100644
--- a/src/views/technology/document/teststandard.vue
+++ b/src/views/technology/document/teststandard.vue
@@ -184,7 +184,9 @@
computed: {
...mapGetters(['permissions'])
},
- created() {},
+ created() {
+ getTestStand(this.paramObj)
+ },
methods: {
// 鑾峰彇鏁版嵁鍒楄〃
getData() {
--
Gitblit v1.9.3