Commit 52e26587 authored by Hagsn3's avatar Hagsn3

按钮功能

parent bd68978c
......@@ -389,7 +389,7 @@ export default {
/** 审批按钮*/
/**
* controls 操作 1:审核 2:修改 3:查看
* approveStatus 状态 0 cg 1 待审核 2 已通过 3 已驳回
* approveStatus 状态 0 cg 1 待审核 9已通过 3 已驳回
* **/
handleApprove(row) {
const id = row.businessId
......@@ -407,7 +407,11 @@ export default {
const id = row.businessId
this.$router.push({
path: 'checkList',
query: { businessId: id }
query: {
businessId: id,
controls: '3',
approveStatus: row.approveStatus
}
})
},
/** 查询列表 */
......
......@@ -11,26 +11,44 @@
</div>
<!-- 中间文本-->
<div class="textDiv">
<span class="fontSp">{{ inspectInfoList.jcCode }}</span>
<div class="scanDiv">
<el-button class="scanCode" type="primary" @click="scanCodes">扫码</el-button>
</div>
<div class="fontSp">单号: {{ inspectInfoList.jcCode }}</div>
</div>
<!-- 下方表格-->
<div class="oneForm">
<el-form :model="inspectInfoList" label-width="21">
<el-form ref="ruleForm" :model="inspectInfoList" :rules="rules" label-width="80">
<div class="formLabel">
<div class="left">
<el-form-item label="LOT:">
<el-input v-model="inspectInfoList.jcLot" :disabled="(this.controlsForm.controls == '1' && this.controlsForm.approveStatus === '1')" class="scanInput" />
<el-button class="scanCode" type="primary" @click="scanCodes">扫码</el-button>
<el-form-item label="LOT:" prop="jcLot">
<el-input
v-model="inspectInfoList.jcLot"
:disabled="(this.controlsForm.controls == '1' && this.controlsForm.approveStatus === '1')|| (this.controlsForm.controls == '3' && this.controlsForm.approveStatus === '1')||
(this.controlsForm.controls =='3'&& this.controlsForm.approveStatus === '9' )"
class="normalInput"
/>
</el-form-item>
<el-form-item label="厂家:">
<el-input v-model="inspectInfoList.jcCj" :disabled="(this.controlsForm.controls == '1' && this.controlsForm.approveStatus === '1')" class="normalInput" />
<!-- <el-button class="scanCode" type="primary" @click="scanCodes">扫码</el-button>-->
<el-form-item label="PN:" prop="jcPn">
<el-input
v-model="inspectInfoList.jcPn"
:disabled="(this.controlsForm.controls == '1' && this.controlsForm.approveStatus === '1')|| (this.controlsForm.controls == '3' && this.controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
class="normalInput"
/>
</el-form-item>
<el-form-item label="PN:">
<el-input v-model="inspectInfoList.jcPn" :disabled="(this.controlsForm.controls == '1' && this.controlsForm.approveStatus === '1')" class="normalInput" />
<el-form-item label="rank:" prop="jcRank">
<el-input
v-model="inspectInfoList.jcRank"
:disabled="(this.controlsForm.controls == '1' && this.controlsForm.approveStatus === '1') || (this.controlsForm.controls == '3' && this.controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
class="normalInput"
/>
</el-form-item>
<el-form-item label="数量:">
<el-input v-model="inspectInfoList.jcNum" :disabled="(this.controlsForm.controls == '1' && this.controlsForm.approveStatus === '1')" class="normalInput" />
<el-form-item label="数量:" prop="jcNum">
<el-input
v-model="inspectInfoList.jcNum"
:disabled="(this.controlsForm.controls == '1' && this.controlsForm.approveStatus === '1') || (this.controlsForm.controls == '3' && this.controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
class="normalInput"
/>
</el-form-item>
</div>
<div class="right">
......@@ -38,19 +56,35 @@
<!-- <el-form-item class="topContain">-->
<!--&lt;!&ndash; <el-input type="text" v-model="oneForm.rank" class="topInput" />&ndash;&gt;-->
<!-- </el-form-item>-->
<el-form-item label="rank:">
<el-input v-model="inspectInfoList.jcRank" :disabled="(this.controlsForm.controls == '1' && this.controlsForm.approveStatus === '1')" class="normalInput" />
<!-- <el-form-item label="rank:">-->
<!-- <el-input v-model="inspectInfoList.jcRank" :disabled="(this.controlsForm.controls == '1' && this.controlsForm.approveStatus === '1')" class="normalInput" />-->
<!-- </el-form-item>-->
<el-form-item label="厂家:" prop="jcCj">
<el-input
v-model="inspectInfoList.jcCj"
:disabled="(this.controlsForm.controls == '1' && this.controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
class="normalInput"
/>
<!-- <el-button class="scanCode" type="primary" @click="scanCodes">扫码</el-button>-->
</el-form-item>
<!-- 外观-->
<div class="appearanceDiv">
<div class="appearanceLabel">外观:</div>
<div class="appearance">
<div class="appearanceForm">
<el-form-item label="抽样:" class="sample">
<el-input v-model="inspectInfoList.jcFacadeCy" :disabled="(this.controlsForm.controls == '1' && this.controlsForm.approveStatus === '1')" class="smallInput" />
<el-form-item label="抽样:" class="sample" prop="jcFacadeCy">
<el-input
v-model="inspectInfoList.jcFacadeCy"
:disabled="(this.controlsForm.controls == '1' && this.controlsForm.approveStatus === '1') || (this.controlsForm.controls == '3' && this.controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
class="smallInput"
/>
</el-form-item>
<el-form-item label="不良:" class="badness">
<el-input v-model="inspectInfoList.jcFacadeBl" :disabled="(this.controlsForm.controls == '1' && this.controlsForm.approveStatus === '1')" class="smallInput" />
<el-form-item label="不良:" class="badness" prop="jcFacadeBl">
<el-input
v-model="inspectInfoList.jcFacadeBl"
:disabled="(this.controlsForm.controls == '1' && this.controlsForm.approveStatus === '1') || (this.controlsForm.controls == '3' && this.controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
class="smallInput"
/>
</el-form-item>
</div>
</div>
......@@ -78,7 +112,8 @@
<el-input
v-model="inspectJbAl2o3List.standardOne"
class="inspectionStandardsInput"
:disabled="(this.controlsForm.controls == '1' && this.controlsForm.approveStatus === '1')"
:disabled="(this.controlsForm.controls == '1' && this.controlsForm.approveStatus === '1')
|| (this.controlsForm.controls == '3' && this.controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
@blur="getInspect"
/>
</el-form-item>
......@@ -97,8 +132,10 @@
<div class="recordData">
<el-input
v-model="item.recordData"
:disabled="controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1' "
:disabled="controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1'|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
@input="handleData1Input(index)"
/>
<el-button class="clearButton" type="danger" icon="el-icon-delete" circle @click="clearForm(index)" />
</div>
<div class="Value">{{ item.differenceValue }}</div>
<div class="averageValue">{{ item.differenceValue1 }}</div>
......@@ -124,7 +161,8 @@
<el-form-item label="检验标准2:" label-width="80">
<el-input
v-model="inspectJbAl2o3List.standardTwo"
:disabled="controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1' "
:disabled="controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1'
|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
class="inspectionStandardsInput"
@blur="getInspect"
/>
......@@ -142,7 +180,13 @@
<div v-for="(item,index) in recode2" :key="index" :class="index === 0? 'oneContent': 'Content'">
<div class="number">{{ index + 11 }}</div>
<div class="recordData">
<el-input v-model="item.recordData" :disabled="controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1' "/>
<el-input
v-model="item.recordData"
:disabled="controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1'
|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
@input="handleData2Input(index)"
/>
<el-button class="clearButton" type="danger" icon="el-icon-delete" circle @click="clearInspectionFormTwo(index)" />
</div>
<div class="Value">{{ item.differenceValue }}</div>
<div class="averageValue">{{ item.differenceValue1 }}</div>
......@@ -177,8 +221,9 @@
<el-input
v-model="inspectJbAl2o3List.limitOne"
class="inspectionStandardsInput"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')
|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
@blur="getInspectNext"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')"
/>
</el-form-item>
</el-form>
......@@ -187,8 +232,9 @@
<el-input
v-model="inspectJbAl2o3List.limitTwo"
class="inspectionStandardsInput"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')
|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
@blur="getInspectNext"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')"
/>
</el-form-item>
</el-form>
......@@ -202,7 +248,13 @@
<div v-for="(item,index) in recode3" :key="index" :class="index === 0? 'oneContent': 'Content'">
<div class="number">{{ index + 1 }}</div>
<div class="recordData">
<el-input v-model="item.recordData" :disabled="controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1' " />
<el-input
v-model="item.recordData"
:disabled="controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1'
|| (controlsForm.controls == '3' &&controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
@input="handleData3Input(index)"
/>
<el-button class="clearButton" type="danger" icon="el-icon-delete" circle @click="clearInspectionFormThree(index)" />
</div>
<div class="Value">{{ item.differenceValue }}</div>
</div>
......@@ -222,87 +274,188 @@
<div class="threeRegion">
<div class="leftRegion">
<el-form-item label="firstHdN:" class="inspectJbAlInputBody">
<el-input v-model="inspectJbAl2o3List.firstHdN" :disabled="this.controlsForm.controls ==='1'&& this.controlsForm.approveStatus ==='1' " class="inspectJbAlInput" />
<el-input
v-model="inspectJbAl2o3List.firstHdN"
:disabled="this.controlsForm.controls ==='1'&& this.controlsForm.approveStatus ==='1'
|| (this.controlsForm.controls == '3' && this.controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
class="inspectJbAlInput"
/>
</el-form-item>
<el-form-item label="firstHdPn:" class="inspectJbAlInputBody">
<el-input v-model="inspectJbAl2o3List.firstHdPn" :disabled="this.controlsForm.controls ==='1'&& this.controlsForm.approveStatus ==='1' " class="inspectJbAlInput" />
<el-input
v-model="inspectJbAl2o3List.firstHdPn"
:disabled="this.controlsForm.controls ==='1'&& this.controlsForm.approveStatus ==='1'
|| (this.controlsForm.controls == '3' && this.controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
class="inspectJbAlInput"
/>
</el-form-item>
<el-form-item label="firstHdRes:">
<el-radio-group v-model="inspectJbAl2o3List.firstHdRes" :disabled="this.controlsForm.controls ==='1'&& this.controlsForm.approveStatus ==='1' ">
<el-radio-group
v-model="inspectJbAl2o3List.firstHdRes"
:disabled="this.controlsForm.controls ==='1'&& this.controlsForm.approveStatus ==='1'
|| (this.controlsForm.controls == '3' && this.controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
>
<el-radio label="1">合格</el-radio>
<el-radio label="2">不合格</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="wxN:" class="inspectJbAlInputBody">
<el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.wxN" class="inspectJbAlInput" />
<el-input
v-model="inspectJbAl2o3List.wxN"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')
|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
class="inspectJbAlInput"
/>
</el-form-item>
<el-form-item label="wxPn:" class="inspectJbAlInputBody">
<el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.wxPn" class="inspectJbAlInput" />
<el-input
v-model="inspectJbAl2o3List.wxPn"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')
|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
class="inspectJbAlInput"
/>
</el-form-item>
<el-form-item label="wxRes:">
<el-radio-group class="radioGroupWxRes" :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.wxRes">
<el-radio-group
v-model="inspectJbAl2o3List.wxRes"
class="radioGroupWxRes"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')
|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
>
<el-radio label="1">合格</el-radio>
<el-radio label="2">不合格</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="cyN:" class="inspectJbAlInputBody">
<el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.cyN" class="inspectJbAlInput" />
<el-input
v-model="inspectJbAl2o3List.cyN"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')
|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
class="inspectJbAlInput"
/>
</el-form-item>
<el-form-item label="cyPn:" class="inspectJbAlInputBody">
<el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.cyPn" class="inspectJbAlInput" />
<el-input
v-model="inspectJbAl2o3List.cyPn"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')
|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
class="inspectJbAlInput"
/>
</el-form-item>
<el-form-item label="cyRes:">
<el-radio-group class="radioGroupCyRes" :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.cyRes">
<el-radio-group
v-model="inspectJbAl2o3List.cyRes"
class="radioGroupCyRes"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')
|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
>
<el-radio label="1">合格</el-radio>
<el-radio label="2">不合格</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="finalRes:" >
<el-radio-group class="radioGroupfinalRes" :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.finalRes">
<el-form-item label="finalRes:">
<el-radio-group
v-model="inspectJbAl2o3List.finalRes"
class="radioGroupfinalRes"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')
|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
>
<el-radio label="1">合格</el-radio>
<el-radio label="2">不合格</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="noProject:">
<el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.noProject" class="inspectJbAlInputProject" />
<el-input
v-model="inspectJbAl2o3List.noProject"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
class="inspectJbAlInputProject"
/>
</el-form-item>
<el-form-item label="wgKx:" class="inspectJbAlInputBody">
<el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.wgKx" class="inspectJbAlInput" />
<el-input
v-model="inspectJbAl2o3List.wgKx"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
class="inspectJbAlInput"
/>
</el-form-item>
</div>
<div class="rightRegion">
<el-form-item label="wgLlw:" class="inspectJbAlInputBody">
<el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.wgLlw" class="inspectJbAlInput" />
<el-input
v-model="inspectJbAl2o3List.wgLlw"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
class="inspectJbAlInput"
/>
</el-form-item>
<el-form-item label="wgWlw:" class="inspectJbAlInputBody">
<el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.wgWlw" class="inspectJbAlInput" />
<el-input
v-model="inspectJbAl2o3List.wgWlw"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
class="inspectJbAlInput"
/>
</el-form-item>
<el-form-item label="wgJbwq:" class="inspectJbAlInputBody">
<el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.wgJbwq" class="inspectJbAlInputJbwq" />
<el-input
v-model="inspectJbAl2o3List.wgJbwq"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
class="inspectJbAlInputJbwq"
/>
</el-form-item>
<el-form-item label="wgZk:" class="inspectJbAlInputBody">
<el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.wgZk" class="inspectJbAlInput" />
<el-input
v-model="inspectJbAl2o3List.wgZk"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
class="inspectJbAlInput"
/>
</el-form-item>
<el-form-item label="wgSh:" class="inspectJbAlInputBody">
<el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.wgSh" class="inspectJbAlInput" />
<el-input
v-model="inspectJbAl2o3List.wgSh"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
class="inspectJbAlInput"
/>
</el-form-item>
<el-form-item label="wgBm:" class="inspectJbAlInputBody">
<el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.wgBm" class="inspectJbAlInput" />
<el-input
v-model="inspectJbAl2o3List.wgBm"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1')|| (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
class="inspectJbAlInput"
/>
</el-form-item>
<el-form-item label="wgTc:" class="inspectJbAlInputBody">
<el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.wgTc" class="inspectJbAlInput" />
<el-input
v-model="inspectJbAl2o3List.wgTc"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
class="inspectJbAlInput"
/>
</el-form-item>
<el-form-item label="wgQg:" class="inspectJbAlInputBody">
<el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.wgQg" class="inspectJbAlInput" />
<el-input
v-model="inspectJbAl2o3List.wgQg"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
class="inspectJbAlInput"
/>
</el-form-item>
<el-form-item label="wgCq:" class="inspectJbAlInputBody">
<el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.wgCq" class="inspectJbAlInput" />
<el-input
v-model="inspectJbAl2o3List.wgCq"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
class="inspectJbAlInput"
/>
</el-form-item>
<el-form-item label="wgFf:" class="inspectJbAlInputBody">
<el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.wgFf" class="inspectJbAlInput" />
<el-input
v-model="inspectJbAl2o3List.wgFf"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
class="inspectJbAlInput"
/>
</el-form-item>
<el-form-item label="wgTf:" class="inspectJbAlInputBody">
<el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.wgTf" class="inspectJbAlInput" />
<el-input
v-model="inspectJbAl2o3List.wgTf"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
class="inspectJbAlInput"
/>
</el-form-item>
<!-- <el-input class="tableInput" />-->
</div>
......@@ -327,7 +480,7 @@
@click.stop="handleClickStop(index)"
/>
<!-- 按钮区 -->
<div class="OneElImgButton" v-if="!(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')">
<div v-if="!((controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')||(controlsForm.controls ==='3'&& controlsForm.approveStatus ==='1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' ))" class="OneElImgButton">
<div>
<el-button type="primary" icon="el-icon-upload" circle @click="downloadImage(item)" />
</div>
......@@ -338,7 +491,11 @@
</div>
</div>
<div v-if="!(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" class="uploadButton" @click="handleTakePhotos">
<div
v-if="!((controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')||(controlsForm.controls ==='3'&& controlsForm.approveStatus ==='1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' ))"
class="uploadButton"
@click="handleTakePhotos"
>
<div class="uploadContent">
<div class="imgContainer">
<img class="img" src="@/assets/image/shangchuan.png">
......@@ -371,7 +528,11 @@
<div class="inspectionResults">
<el-form :model="inspectInfoList" label-width="42">
<el-form-item label="检验结果:">
<el-radio-group :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectInfoList.jcResult">
<el-radio-group
v-model="inspectInfoList.jcResult"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')
|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
>
<el-radio label="1">合格</el-radio>
<el-radio label="2">不合格</el-radio>
</el-radio-group>
......@@ -380,21 +541,34 @@
<el-input
v-model="inspectInfoList.remarks"
type="textarea"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')
|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
:rows="4"
placeholder="请输入备注"
/>
</el-form-item>
</el-form>
</div>
<hr class="twoHr" v-if="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')">
<div v-if="showPartIv" class="partIv">
<hr
v-if="((controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1') || (controlsForm.controls ==='2'&& controlsForm.approveStatus ==='3')) || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
class="twoHr"
>
<div
v-if="((controlsForm.controls ==='2'&& controlsForm.approveStatus ==='3') || (controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1' && (inspectsForm.approveUser && inspectsForm.approveUser !=''))|| (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' ))"
class="partIv"
>
<div class="auditor">审核人: {{ inspectsForm.approveUser }}</div>
<div class="auditTime">审核时间: {{ inspectsForm.approveDate }}</div>
<div class="auditStatus">审核状态: {{ inspectsForm.approveStatus }}</div>
<div
v-if="!(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1' && (inspectsForm.approveUser && inspectsForm.approveUser !=''))"
class="auditStatus"
>审核状态: {{ getApproveStatusLabel(inspectInfoList.approveStatus) }}
</div>
<div v-if="inspectInfoList.approveStatus==='3'">驳回原因:{{ inspectsForm.approveNoteHistory }}</div>
<div v-else>审批意见:{{ inspectsForm.approveNoteHistory }}</div>
</div>
<div v-if="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" class="auditOpinion">
<div v-if="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" class="auditOpinion">
<el-form :model="inspectsForm">
<el-form-item label="审核意见:" label-width="42" class="myForm">
<el-input
......@@ -406,11 +580,16 @@
</el-form-item>
</el-form>
</div>
<div v-if="(controlsForm.controls ==='2'&& controlsForm.approveStatus ==='0') || (controlsForm.controls ==='2'&& controlsForm.approveStatus ==='3')" class="submitButton">
<div
v-if="(controlsForm.controls ==='2'&& controlsForm.approveStatus ==='0') || (controlsForm.controls ==='2'&& controlsForm.approveStatus ==='3')"
class="submitButton"
>
<el-button class="buttoon" type="primary" @click="submitControl">保存</el-button>
<el-button class="buttoon" type="primary" @click="present">提交</el-button>
</div>
<div v-if="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" class="submitButton">
<div v-if="(controlsForm.controls ==='3'&& controlsForm.approveStatus ==='1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )" class="submitButton">
<el-button class="buttoon" type="primary" @click="back">返回</el-button></div>
<div v-if="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" class="submitButton">
<el-button class="buttoon" type="primary" @click="approve">同意</el-button>
<el-button class="buttoon" type="primary" @click="reject">驳回</el-button>
</div>
......@@ -429,6 +608,28 @@ export default {
name: 'CheckList',
data() {
return {
rules: {
jcLot: [{ required: true, message: '请输入LOT', trigger: 'blur' }],
jcPn: [{
required: true, message: '请输入PN', trigger: 'blur'
}],
jcRank: [{
required: true, message: '请输入rank', trigger: 'blur'
}],
jcNum: [{
required: true, message: '请输入数量', trigger: 'blur'
}],
jcCj: [{
required: true, message: '请输入厂家', trigger: 'blur'
}],
jcFacadeCy: [{
required: true, message: '请输入抽样', trigger: 'blur'
}],
jcFacadeBl: [{
required: true, message: '请输入不良', trigger: 'blur'
}]
},
controlsForm: {
controls: '2',
approveStatus: '0'
......@@ -475,8 +676,7 @@ export default {
url: '',
url1: require('@/assets/image/cadTwo.png'),
// url: '',
srcList: [
],
srcList: [],
// srcList: [],
srcList1: [
require('@/assets/image/cadTwo.png')
......@@ -498,9 +698,10 @@ export default {
},
// 审核部分
inspectsForm: {
approveUser: 'XXX',
approveUser: '',
approveNote: '',
approveDate: '2024-05-08'
approveNoteHistory: '',
approveDate: ''
},
// 表单二
inspectJbAl2o3List: {
......@@ -570,8 +771,102 @@ export default {
created() {
this.resetRecord()
this.judgmentParam()
this.getJcCode()
},
methods: {
/** 清空表格里的数据*/
clearForm(index) {
this.recode1[index].recordData = undefined
},
clearInspectionFormTwo(index) {
this.recode2[index].recordData = undefined
},
clearInspectionFormThree(index) {
this.recode3[index].recordData = undefined
},
/* 表单1的计算方法*/
handleData1Input(index) {
if (this.inspectJbAl2o3List.standardOne !== '' && this.inspectJbAl2o3List.standardOne !== undefined) {
this.recode1[index].differenceValue2 = (this.recode1[index].recordData - this.inspectJbAl2o3List.standardOne).toFixed(2)
}
if (index > 0 && this.recode1[index].recordData !== '' && this.recode1[index - 1].recordData !== '') {
const num1 = parseFloat(this.recode1[index - 1].recordData)
const num2 = parseFloat(this.recode1[index].recordData)
this.recode1[index].differenceValue = Math.abs(num1 - num2).toFixed(2)
this.recode1[index].differenceValue1 = ((num1 + num2) / 2).toFixed(2)
}
if (index < 9 && this.recode1[index].recordData !== '' && this.recode1[index + 1].recordData !== '') {
const num1 = parseFloat(this.recode1[index + 1].recordData)
const num2 = parseFloat(this.recode1[index].recordData)
this.recode1[index + 1].differenceValue = Math.abs(num1 - num2).toFixed(2)
this.recode1[index + 1].differenceValue1 = ((num1 + num2) / 2).toFixed(2)
}
if (this.recode1[index].recordData === '') {
this.recode1[index].differenceValue = ''
this.recode1[index + 1].differenceValue = ''
this.recode1[index].differenceValue1 = ''
this.recode1[index + 1].differenceValue1 = ''
this.recode1[index].differenceValue2 = ''
}
},
/* 表单2的计算方法*/
handleData2Input(index) {
if (this.inspectJbAl2o3List.standardTwo !== '' && this.inspectJbAl2o3List.standardTwo !== undefined) {
this.recode2[index].differenceValue2 = (this.recode2[index].recordData - this.inspectJbAl2o3List.standardTwo).toFixed(2)
}
if (index > 0 && this.recode2[index].recordData !== '' && this.recode2[index - 1].recordData !== '') {
const num1 = parseFloat(this.recode2[index - 1].recordData)
const num2 = parseFloat(this.recode2[index].recordData)
this.recode2[index].differenceValue = Math.abs(num1 - num2).toFixed(2)
this.recode2[index].differenceValue1 = ((num1 + num2) / 2).toFixed(2)
}
if (index < 9 && this.recode2[index].recordData !== '' && this.recode2[index + 1].recordData !== '') {
const num1 = parseFloat(this.recode2[index + 1].recordData)
const num2 = parseFloat(this.recode2[index].recordData)
this.recode2[index + 1].differenceValue = Math.abs(num1 - num2).toFixed(2)
this.recode2[index + 1].differenceValue1 = ((num1 + num2) / 2).toFixed(2)
}
if (this.recode2[index].recordData === '') {
this.recode2[index].differenceValue = ''
this.recode2[index + 1].differenceValue = ''
this.recode2[index].differenceValue1 = ''
this.recode2[index + 1].differenceValue1 = ''
this.recode2[index].differenceValue2 = ''
}
},
/* 表单3的计算方法*/
handleData3Input(index) {
if (index > 0 && this.recode3[index].recordData !== '' && this.recode3[index - 1].recordData !== '') {
const num1 = parseFloat(this.recode3[index - 1].recordData)
const num2 = parseFloat(this.recode3[index].recordData)
this.recode3[index].differenceValue = Math.abs(num1 - num2).toFixed(2)
}
if (index < 9 && this.recode3[index].recordData !== '' && this.recode3[index + 1].recordData !== '') {
const num1 = parseFloat(this.recode3[index + 1].recordData)
const num2 = parseFloat(this.recode3[index].recordData)
this.recode3[index + 1].differenceValue = Math.abs(num1 - num2).toFixed(2)
}
if (this.recode3[index].recordData === '') {
this.recode3[index].differenceValue = ''
this.recode3[index + 1].differenceValue = ''
}
},
// 获取单号
getJcCode() {
if (this.controlsForm.approveStatus === '0' && this.controlsForm.controls === '2' && this.$route.query.businessId === undefined) {
this.inspectInfoList.jcCode = this.getRandomNum()
}
},
// 生成6位随机数
getRandomNum() {
var randomNum1 = Math.floor(Math.random() * 1000000)
console.log('randomNum1', randomNum1)
return randomNum1
},
// 审核驳回
reject() {
const obj = {
......@@ -580,7 +875,7 @@ export default {
approveStatus: '3'
}
approveInformation(obj).then(res => {
console.log('审核结果',res)
console.log('审核结果', res)
if (res.code === 200) {
this.$message.error('该审核已驳回')
this.$router.push({
......@@ -597,7 +892,7 @@ export default {
approveStatus: '9'
}
approveInformation(obj).then(res => {
console.log('审核结果',res)
console.log('审核结果', res)
if (res.code === 200) {
this.$message.success('审核通过')
this.$router.push({
......@@ -661,34 +956,35 @@ export default {
this.inspectJbAl2o3List.wgTf = response.data.wgTf
this.inspectJbAl2o3List.limitData = response.data.limitData
this.inspectJbAl2o3List.ossId = response.data.ossId
// this.recode1.recordData =
// const qwe = []
// qwe =
// console.log(this.inspectJbAl2o3List.standardOneData.split(','))
// this.recode1.recordData = this.inspectJbAl2o3List.standardOneData.split(',')
this.getRecordList(this.inspectJbAl2o3List.standardOneData.split(','))
this.getRecordTwoList(this.inspectJbAl2o3List.standardTwoData.split(','))
this.getRecordThreeList(this.inspectJbAl2o3List.limitData.split(','))
console.log(this.recode1)
console.log(this.inspectJbAl2o3List)
/** 审批信息**/
this.inspectInfoList.approveStatus = response.data.approveStatus
this.inspectsForm.approveUser = response.data.nickName
this.inspectsForm.approveDate = response.data.approveDate
this.inspectsForm.approveNoteHistory = response.data.approveNote
})
},
// 数组1
getRecordList(list1) {
for (let i = 0; i < 10; i++) {
this.recode1[i].recordData = list1[i]
this.handleData1Input(i)
}
},
// 数组2
getRecordTwoList(list1) {
for (let i = 0; i < 10; i++) {
this.recode2[i].recordData = list1[i]
this.handleData2Input(i)
}
},
// 数组3
getRecordThreeList(list1) {
for (let i = 0; i < 10; i++) {
this.recode3[i].recordData = list1[i]
this.handleData3Input[i]
}
},
judgmentParam() {
......@@ -699,7 +995,8 @@ export default {
this.getRecordInfo(this.$route.query.businessId)
} else {
if (this.$store.getters.searchParams[this.$route.path]) {
const { searchParams } = this.$store.getters; const { path } = this.$route
const { searchParams } = this.$store.getters
const { path } = this.$route
const param = JSON.parse(searchParams[path]) // 保留着的查询条件
const obj = { ...param }
this.inspectInfoList = obj.from1
......@@ -720,6 +1017,20 @@ export default {
parseTime,
// 获取检验时间和检验人
// 根据传值获取审核状态
getApproveStatusLabel(type) {
switch (type) {
case '0':
return '待提交'
case '1':
return '待审核'
case '3':
return '已驳回'
case '9':
return '已通过'
}
},
/**
* @description: 下载图片到本地
* @author: gaoyu
......@@ -839,70 +1150,70 @@ export default {
recordData: '',
differenceValue: '',
differenceValue1: '',
differenceValue2: '61.224'
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '0.001',
differenceValue1: '0.001',
differenceValue2: '61.224'
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '0.001',
differenceValue1: '0.001',
differenceValue2: '61.224'
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '0.002',
differenceValue1: '0.001',
differenceValue2: '61.224'
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '0.001',
differenceValue1: '0.001',
differenceValue2: '61.224'
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '0.001',
differenceValue1: '0.001',
differenceValue2: '61.224'
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '0.002',
differenceValue1: '0.001',
differenceValue2: '61.224'
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '0.001',
differenceValue1: '0.001',
differenceValue2: '61.224'
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '0.001',
differenceValue1: '0.001',
differenceValue2: '61.224'
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '0.001',
differenceValue1: '0.001',
differenceValue2: '61.224'
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
}
]
this.recode2 = [
......@@ -911,70 +1222,70 @@ export default {
recordData: '',
differenceValue: '',
differenceValue1: '',
differenceValue2: '61.224'
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '0.001',
differenceValue1: '0.001',
differenceValue2: '61.224'
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '0.001',
differenceValue1: '0.001',
differenceValue2: '61.224'
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '0.002',
differenceValue1: '0.001',
differenceValue2: '61.224'
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '0.001',
differenceValue1: '0.001',
differenceValue2: '61.224'
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '0.001',
differenceValue1: '0.001',
differenceValue2: '61.224'
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '0.002',
differenceValue1: '0.001',
differenceValue2: '61.224'
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '0.001',
differenceValue1: '0.001',
differenceValue2: '61.224'
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '0.001',
differenceValue1: '0.001',
differenceValue2: '61.224'
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '0.001',
differenceValue1: '0.001',
differenceValue2: '61.224'
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
}
]
this.recode3 = [
......@@ -983,70 +1294,106 @@ export default {
recordData: '',
differenceValue: '',
differenceValue1: '',
differenceValue2: '61.224'
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '0.001',
differenceValue1: '0.001',
differenceValue2: '61.224'
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '0.001',
differenceValue1: '0.001',
differenceValue2: '61.224'
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '0.002',
differenceValue1: '0.001',
differenceValue2: '61.224'
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '0.001',
differenceValue1: '0.001',
differenceValue2: '61.224'
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '0.001',
differenceValue1: '0.001',
differenceValue2: '61.224'
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '0.002',
differenceValue1: '0.001',
differenceValue2: '61.224'
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '0.001',
differenceValue1: '0.001',
differenceValue2: '61.224'
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '0.001',
differenceValue1: '0.001',
differenceValue2: '61.224'
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '0.001',
differenceValue1: '0.001',
differenceValue2: '61.224'
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
},
{
// 记录数据
recordData: '',
differenceValue: '',
differenceValue1: '',
differenceValue2: ''
}
]
},
......@@ -1126,25 +1473,34 @@ export default {
})
},
present() {
this.inspectJbAl2o3List.standardOneData = this.getStringByArray(this.recode1)
this.inspectJbAl2o3List.standardTwoData = this.getStringByArray(this.recode2)
this.inspectJbAl2o3List.limitData = this.getStringByArray(this.recode3)
this.inspectInfoList.approveStatus = '1'
var obj = {
incomeInspectInfo: this.inspectInfoList,
incomeInspectJbAl2o3: this.inspectJbAl2o3List
}
console.log('obj', obj)
addIncomeInspectInfo(obj).then(response => {
console.log('re', response)
if (response.code === 200) {
this.msgSuccess('提交成功')
this.resetInspectInfo()
this.resetinspectJbAl2o3List()
this.resetRecord()
this.$refs.ruleForm.validate(vaild => {
if (vaild) {
this.inspectJbAl2o3List.standardOneData = this.getStringByArray(this.recode1)
this.inspectJbAl2o3List.standardTwoData = this.getStringByArray(this.recode2)
this.inspectJbAl2o3List.limitData = this.getStringByArray(this.recode3)
this.inspectInfoList.approveStatus = '1'
var obj = {
incomeInspectInfo: this.inspectInfoList,
incomeInspectJbAl2o3: this.inspectJbAl2o3List
}
console.log('obj', obj)
addIncomeInspectInfo(obj).then(response => {
console.log('re', response)
if (response.code === 200) {
this.msgSuccess('提交成功')
this.resetInspectInfo()
this.resetinspectJbAl2o3List()
this.resetRecord()
this.controlsForm.approveStatus = '0'
this.controlsForm.controls = '2'
}
})
}
})
},
back() {
this.$router.go(-1)
},
// 根据数组得到字符串
getStringByArray: function(recodeList) {
const inputList = []
......@@ -1340,7 +1696,7 @@ export default {
}
.scanCode {
margin-left: 1%;
margin-left: 69%;
width: 30%;
background: #0057ff;
border-radius: 4px;
......@@ -1395,15 +1751,24 @@ export default {
.textDiv {
margin-top: 20px;
width: 87%;
margin-left: 10%;
width: 77%;
height: 40px;
text-align: right;
display: flex;
//justify-content: space-between;
//text-align: right;
.scanDiv {
width: 43%;
margin-left: 4%;
}
.fontSp {
margin-left: 43%;
height: 28px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
margin-right: 5px;
font-weight: 400;
color: #606266;
display: flex;
align-items: center;
}
}
......@@ -1414,7 +1779,7 @@ export default {
width: 80%;
::v-deep .el-form-item__content {
margin-left: 45px !important;
margin-left: 53px !important;
}
.formLabel {
......@@ -1433,7 +1798,7 @@ export default {
}
::v-deep .el-form-item__label {
width: 42px;
width: 53px;
height: 18px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
......@@ -1447,7 +1812,7 @@ export default {
width: 45%;
::v-deep .el-form-item__label {
width: 42px;
width: 53px;
height: 18px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
......@@ -1634,9 +1999,14 @@ export default {
}
.recordData {
display: flex;
margin-left: 3%;
width: 25%;
.clearButton{
margin-left: 6px;
}
}
}
.Content {
......@@ -1663,6 +2033,10 @@ export default {
height: 32px;
border: 1px solid #d9d9d9;
border-radius: 4px;
display: flex;
.clearButton{
margin-left: 6px;
}
}
.Value {
......@@ -1736,8 +2110,12 @@ export default {
}
.recordData {
display: flex;
margin-left: 3%;
width: 27%;
.clearButton{
margin-left: 6px;
}
}
}
......@@ -1766,6 +2144,10 @@ export default {
height: 32px;
border: 1px solid #d9d9d9;
border-radius: 4px;
display: flex;
.clearButton{
margin-left: 6px;
}
}
.Value {
......@@ -2003,8 +2385,12 @@ export default {
}
.recordData {
display: flex;
margin-left: 3%;
width: 25%;
.clearButton{
margin-left: 6px;
}
}
}
......@@ -2032,6 +2418,10 @@ export default {
height: 32px;
border: 1px solid #d9d9d9;
border-radius: 4px;
display: flex;
.clearButton{
margin-left: 6px;
}
}
.Value {
......@@ -2136,7 +2526,8 @@ export default {
}
}
}
.inspect{
.inspect {
width: 58%;
height: auto;
display: flex;
......@@ -2237,9 +2628,9 @@ export default {
.leftRegion {
width: 47%;
// height: 100%;
// border: 1px solid #d9d9d9;
// border-radius: 4px;
// height: 100%;
// border: 1px solid #d9d9d9;
// border-radius: 4px;
}
.rightRegion {
......@@ -2275,31 +2666,40 @@ export default {
.leftRegion {
width: 47%;
.selectAlign{
.selectAlign {
text-align: left;
}
.inspectJbAlInputBody{
.inspectJbAlInputBody {
margin-top: 20px;
text-align: right;
}
.inspectJbAlInput{
.inspectJbAlInput {
width: 85%;
}
.inspectJbAlInputProject{
.inspectJbAlInputProject {
width: 84%;
}
.inspectJbAlInputJbwq{
.inspectJbAlInputJbwq {
width: 85%;
}
.radioGroupWxRes{
.radioGroupWxRes {
margin-left: 21px;
}
.radioGroupCyRes{
.radioGroupCyRes {
margin-left: 24px;
}
.radioGroupfinalRes{
.radioGroupfinalRes {
margin-left: 10px;
}
//height: 100%;
//border: 1px solid #d9d9d9;
//border-radius: 4px;
......@@ -2307,16 +2707,20 @@ export default {
.rightRegion {
width: 44.5%;
.inspectJbAlInputBody{
.inspectJbAlInputBody {
margin-top: 20px;
text-align: right;
}
.inspectJbAlInput{
.inspectJbAlInput {
width: 86%;
}
.inspectJbAlInputJbwq{
.inspectJbAlInputJbwq {
width: 85%;
}
//height: 100%;
//border: 1px solid #d9d9d9;
//border-radius: 4px;
......@@ -2340,8 +2744,9 @@ export default {
.peviewImg {
display: flex;
//width: 667px;
.imgDisplay{
.imgDisplay {
display: flex;
.OneImg {
margin-top: -1.6px;
margin-left: 12px;
......@@ -2351,7 +2756,8 @@ export default {
height: 112px;
border-radius: 4px;
}
.OneElImgButton{
.OneElImgButton {
margin-top: 10px;
width: 112px;
display: flex;
......@@ -2479,7 +2885,7 @@ export default {
}
display: flex;
width: 31%;
width: 47%;
height: auto;
margin-top: 10px;
margin-left: 10%;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment