Skip to content

T
template_vue
Commit 077a11bf authored by Hagsn3's avatar Hagsn3
Browse files
Options

修改样式

parent c9de944b
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 68 deletions
src/views/checkList.vue
View file @ 077a11bf
...@@ -11,9 +11,6 @@ ...@@ -11,9 +11,6 @@
</div> </div>
<!-- 中间文本--> <!-- 中间文本-->
<div class="textDiv"> <div class="textDiv">
<div class="scanDiv">
<el-button class="scanCode" type="primary" @click="scanCodes">扫码</el-button>
</div>
<div class="fontSp">单号: {{ inspectInfoList.jcCode }}</div> <div class="fontSp">单号: {{ inspectInfoList.jcCode }}</div>
</div> </div>
<!-- 下方表格--> <!-- 下方表格-->
...@@ -21,6 +18,31 @@ ...@@ -21,6 +18,31 @@
<el-form ref="ruleForm" :model="inspectInfoList" :rules="rules" label-width="80"> <el-form ref="ruleForm" :model="inspectInfoList" :rules="rules" label-width="80">
<div class="formLabel"> <div class="formLabel">
<div class="left"> <div class="left">
<el-form-item label="厂家:" prop="jcCj">
<el-select
v-model="inspectInfoList.jcCj"
:disabled="(controlsForm.controls=='3'&&controlsForm.approveStatus=='1')
||(controlsForm.controls == '1' && controlsForm.approveStatus === '1') ||
(controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
class="normalSelect"
placeholder="请选择厂家"
>
<el-option
v-for="item in manufacturer"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
<!-- <el-input-->
<!-- v-model="inspectInfoList.jcCj"-->
<!-- :disabled="(this.controlsForm.controls=='3'&&this.controlsForm.approveStatus=='1')-->
<!-- ||(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>
<el-form-item label="LOT:" prop="jcLot"> <el-form-item label="LOT:" prop="jcLot">
<el-input <el-input
v-model="inspectInfoList.jcLot" v-model="inspectInfoList.jcLot"
...@@ -36,6 +58,11 @@ ...@@ -36,6 +58,11 @@
class="normalInput" class="normalInput"
/> />
</el-form-item> </el-form-item>
</div>
<div class="right">
<el-form-item>
<el-button class="scanCodeTop" type="primary" @click="scanCodes">扫码</el-button>
</el-form-item>
<el-form-item label="rank:" prop="jcRank"> <el-form-item label="rank:" prop="jcRank">
<el-input <el-input
v-model="inspectInfoList.jcRank" v-model="inspectInfoList.jcRank"
...@@ -50,62 +77,7 @@ ...@@ -50,62 +77,7 @@
class="normalInput" class="normalInput"
/> />
</el-form-item> </el-form-item>
</div>
<div class="right">
<!-- <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>-->
<el-form-item label="厂家:" prop="jcCj">
<el-select
v-model="inspectInfoList.jcCj"
:disabled="(controlsForm.controls=='3'&&controlsForm.approveStatus=='1')
||(controlsForm.controls == '1' && controlsForm.approveStatus === '1') ||
(controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
class="normalSelect"
placeholder="请选择厂家"
>
<el-option
v-for="item in manufacturer"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
<!-- <el-input-->
<!-- v-model="inspectInfoList.jcCj"-->
<!-- :disabled="(this.controlsForm.controls=='3'&&this.controlsForm.approveStatus=='1')-->
<!-- ||(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" 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" 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>
</div>
</div> </div>
</div> </div>
</el-form> </el-form>
...@@ -1002,7 +974,7 @@ export default { ...@@ -1002,7 +974,7 @@ export default {
}, },
methods: { methods: {
/* 动态获取csss的颜色*/ /* 动态获取css的颜色*/
getStatusLabelClass(status) { getStatusLabelClass(status) {
switch (status) { switch (status) {
case '0': case '0':
...@@ -1030,6 +1002,7 @@ export default { ...@@ -1030,6 +1002,7 @@ export default {
this.recode3[index].recordData = '' this.recode3[index].recordData = ''
this.handleData3Input(index) this.handleData3Input(index)
}, },
// 去掉多余的0
digitalFormat(num) { digitalFormat(num) {
// // 示例字符串 // // 示例字符串
// const str = num.toString() // const str = num.toString()
...@@ -1095,9 +1068,9 @@ export default { ...@@ -1095,9 +1068,9 @@ export default {
sum = arr.reduce((acc, cur) => acc + cur, 0) // 计算总和 sum = arr.reduce((acc, cur) => acc + cur, 0) // 计算总和
average = sum / arr.length // 计算平均值 average = sum / arr.length // 计算平均值
if (average.toString().length > 0) { if (average.toString().length > 0) {
stingAverage = average.toString().substr(0,7) stingAverage = average.toString().substr(0, 7)
} else { } else {
stingAverage = average.toString().substr(0,average.toString().length-1) stingAverage = average.toString().substr(0, average.toString().length - 1)
} }
} }
if (sys === 1) { if (sys === 1) {
...@@ -2063,7 +2036,7 @@ export default { ...@@ -2063,7 +2036,7 @@ export default {
} }
.scanCode { .scanCode {
margin-left: 69%; //margin-left: 69%;
width: 30%; width: 30%;
background: #0057ff; background: #0057ff;
border-radius: 4px; border-radius: 4px;
...@@ -2125,15 +2098,11 @@ export default { ...@@ -2125,15 +2098,11 @@ export default {
margin-bottom: 3px; margin-bottom: 3px;
//justify-content: space-between; //justify-content: space-between;
//text-align: right; //text-align: right;
.scanDiv {
width: 43%;
margin-left: 7%;
}
.fontSp { .fontSp {
margin-left: 43%; justify-content: end;
height: 28px; height: 28px;
width: 11%; width: 100%;
font-family: Microsoft YaHei, Microsoft YaHei-400; font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400; font-weight: 400;
color: #606266; color: #606266;
...@@ -2180,6 +2149,12 @@ export default { ...@@ -2180,6 +2149,12 @@ export default {
.right { .right {
margin-left: 6%; margin-left: 6%;
width: 45%; width: 45%;
.scanCodeTop {
//margin-left: 69%;
width: 40%;
background: #0057ff;
border-radius: 4px;
}
::v-deep .el-form-item__label { ::v-deep .el-form-item__label {
width: 53px; width: 53px;
......
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