Commit 7ff9eba2 authored by 高宇's avatar 高宇

移动菜单

parent f3b0a4da
...@@ -88,15 +88,15 @@ ...@@ -88,15 +88,15 @@
<div class="OneTable"> <div class="OneTable">
<div class="checkTicketOne "> <div class="checkTicketOne ">
<div class="CodeOne"> <div class="CodeOne">
<el-form :model="inspectInfoList"> <el-form :model="inspectJbAl2o3List">
<el-form-item label="检查一单号: "> <el-form-item label="检查一单号: ">
<el-input :disabled="((controlsForm.controls == '3' || controlsForm.controls == '1')&& controlsForm.approveStatus === '1') || ((controlsForm.controls == '3' || controlsForm.controls == '1' )&& controlsForm.approveStatus === '2') || ((controlsForm.controls == '3' || controlsForm.controls == '1')&& controlsForm.approveStatus === '3')" v-model="inspectJbAl2o3List.JcOneCode" class="CodeOneInput"></el-input> <el-input :disabled="((controlsForm.controls == '3' || controlsForm.controls == '1')&& controlsForm.approveStatus === '1') || ((controlsForm.controls == '3' || controlsForm.controls == '1' )&& controlsForm.approveStatus === '2') || ((controlsForm.controls == '3' || controlsForm.controls == '1')&& controlsForm.approveStatus === '3')" v-model="inspectJbAl2o3List.jcOneCode" class="CodeOneInput"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
</div> </div>
<div class="twoCheck"> <div class="twoCheck">
<!-- 检查单号一 --> <!-- 检查单号一 -->
<!-- 检查记录1 --> <!-- 检查记录1 -->
<div class="recordOne"> <div class="recordOne">
<!-- 标题 --> <!-- 标题 -->
...@@ -560,16 +560,16 @@ ...@@ -560,16 +560,16 @@
/> />
</el-form-item> </el-form-item>
</div> </div>
<div class="emptyButton"> <div class="emptyButton">
<i <i
v-show="!(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1'|| v-show="!(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1'||
(controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls == '3' && controlsForm.approveStatus === '1') ||
(controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' ))" (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' ))"
class="el-icon-circle-close" class="el-icon-circle-close"
style="color: #5cbce5" style="color: #5cbce5"
@click="clearInspectionFormTwo(0)" @click="clearInspectionFormTwo(0)"
/> />
</div> </div>
</div> </div>
<div class="Value"> <div class="Value">
<TextToolTip :text="inspectJbAl2o3List.recode2[0].differenceValue" :max-length="8" :disabled-show="false" /> <TextToolTip :text="inspectJbAl2o3List.recode2[0].differenceValue" :max-length="8" :disabled-show="false" />
...@@ -1428,14 +1428,14 @@ ...@@ -1428,14 +1428,14 @@
<TextToolTip :text="inspectJbAl2o3List.recode3[14].differenceValue" :max-length="8" :disabled-show="false" /> <TextToolTip :text="inspectJbAl2o3List.recode3[14].differenceValue" :max-length="8" :disabled-show="false" />
</div> </div>
</div> </div>
<!-- --> <!-- -->
</el-form> </el-form>
</div> </div>
<div class="recordThreeBottom"> <div class="recordThreeBottom">
<div class="recordThreeBottomMax">最大值 : {{calculationFormThird.Maximum}} <div class="recordThreeBottomMax">最大值 : {{calculationFormThird.Maximum}}
</div> </div>
<div class="recordThreeBottomMini">最小值 : {{calculationFormThird.Minimum}} <div class="recordThreeBottomMini">最小值 : {{calculationFormThird.Minimum}}
</div> </div>
<div class="recordThreeBottomAverage">平均值: {{calculationFormThird.Average}} <div class="recordThreeBottomAverage">平均值: {{calculationFormThird.Average}}
</div> </div>
</div> </div>
...@@ -1451,9 +1451,9 @@ ...@@ -1451,9 +1451,9 @@
<el-tab-pane label="标签三" name="third"> <el-tab-pane label="标签三" name="third">
<div class="checkTicketOne "> <div class="checkTicketOne ">
<div class="CodeOne"> <div class="CodeOne">
<el-form :model="inspectInfoList"> <el-form :model="inspectJbAl2o3List">
<el-form-item label="检查三单号: "> <el-form-item label="检查三单号: ">
<el-input :disabled="((controlsForm.controls == '3' || controlsForm.controls == '1')&& controlsForm.approveStatus === '1') || ((controlsForm.controls == '3' || controlsForm.controls == '1' )&& controlsForm.approveStatus === '2') || ((controlsForm.controls == '3' || controlsForm.controls == '1')&& controlsForm.approveStatus === '3')" v-model="inspectJbAl2o3List.JcTwoCode" class="CodeOneInput"></el-input> <el-input :disabled="((controlsForm.controls == '3' || controlsForm.controls == '1')&& controlsForm.approveStatus === '1') || ((controlsForm.controls == '3' || controlsForm.controls == '1' )&& controlsForm.approveStatus === '2') || ((controlsForm.controls == '3' || controlsForm.controls == '1')&& controlsForm.approveStatus === '3')" v-model="inspectJbAl2o3List.jcTwoCode" class="CodeOneInput"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -1901,10 +1901,10 @@ import { addIncomeInspectInfo, approveInformation, getIncomeInspectInfo, getJcCo ...@@ -1901,10 +1901,10 @@ import { addIncomeInspectInfo, approveInformation, getIncomeInspectInfo, getJcCo
import { parseTime } from '@/utils' import { parseTime } from '@/utils'
import { getInfo } from '@/api/login' import { getInfo } from '@/api/login'
import { downLoadFile } from '@/utils/checkList' import { downLoadFile } from '@/utils/checkList'
import TextToolTip from '@/components/TextToolTip/index' import TextToolTip from '@/components/TextToolTip'
export default { export default {
name: 'CheckList', name: 'TemplateFirst',
components: { TextToolTip }, components: { TextToolTip },
data() { data() {
return { return {
...@@ -1922,7 +1922,7 @@ export default { ...@@ -1922,7 +1922,7 @@ export default {
wgFf: [{ pattern: /^(0|[1-9]\d*)(\.\d{0,6})?$/, message: '请输入有效的数字', trigger: 'change' }], wgFf: [{ pattern: /^(0|[1-9]\d*)(\.\d{0,6})?$/, message: '请输入有效的数字', trigger: 'change' }],
wgTf: [{ pattern: /^(0|[1-9]\d*)(\.\d{0,6})?$/, message: '请输入有效的数字', trigger: 'change' }], wgTf: [{ pattern: /^(0|[1-9]\d*)(\.\d{0,6})?$/, message: '请输入有效的数字', trigger: 'change' }],
}, },
// 第一部分限制表单账单 // 第一部分限制表单账单
IRMAXLENGTHONE: 11, IRMAXLENGTHONE: 11,
IRMAXLENGTHTWO: 11, IRMAXLENGTHTWO: 11,
IRMAXLENGTHTHREE: 11, IRMAXLENGTHTHREE: 11,
...@@ -2075,8 +2075,8 @@ export default { ...@@ -2075,8 +2075,8 @@ export default {
}, },
// 表单二 // 表单二
inspectJbAl2o3List: { inspectJbAl2o3List: {
JcOneCode: 'xxxx', jcOneCode: 'xxxx',
JcTwoCode: 'yyyy', jcTwoCode: 'yyyy',
oneJcUser: undefined, oneJcUser: undefined,
oneJcDate: undefined, oneJcDate: undefined,
twoJcUser: undefined, twoJcUser: undefined,
...@@ -2210,7 +2210,7 @@ export default { ...@@ -2210,7 +2210,7 @@ export default {
} }
console.log('i',i) console.log('i',i)
if (i < 20) { if (i < 20) {
that.activeName = 'first' that.activeName = 'first'
} else { } else {
that.activeName = 'second' that.activeName = 'second'
} }
...@@ -3606,9 +3606,9 @@ export default { ...@@ -3606,9 +3606,9 @@ export default {
margin-left: 13%; margin-left: 13%;
height: 20px; height: 20px;
.CodeOne{ .CodeOne{
::v-deep .el-form-item__content { ::v-deep .el-form-item__content {
margin-left: 85px; margin-left: 85px;
} }
float: right; float: right;
width: 36%; width: 36%;
::v-deep .el-form-item__label{ ::v-deep .el-form-item__label{
...@@ -4847,7 +4847,7 @@ export default { ...@@ -4847,7 +4847,7 @@ export default {
//::v-deep .el-form-item__label{ //::v-deep .el-form-item__label{
// width: 14%; // width: 14%;
//} //}
} }
.wxpnInspectJbAlInputBody{ .wxpnInspectJbAlInputBody{
padding-top: 1%; padding-top: 1%;
//margin-top: 20px; //margin-top: 20px;
......
...@@ -100,15 +100,15 @@ ...@@ -100,15 +100,15 @@
@click="resetQuery" @click="resetQuery"
>重置</el-button> >重置</el-button>
</el-form-item> </el-form-item>
<el-form-item style="float: right; margin-right: 3%"> <el-form-item style="float: right; margin-right: 3%">
<el-button <el-button
:class="commonField.exportClass" :class="commonField.exportClass"
:type="commonField.typeSuccess" :type="commonField.typeSuccess"
:icon="commonField.exportIcon" :icon="commonField.exportIcon"
:size="commonField.smallSize" :size="commonField.smallSize"
@click="handleExport" @click="handleExport"
>导出</el-button> >导出</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -147,16 +147,16 @@ ...@@ -147,16 +147,16 @@
{{ scope.row.jcRank || '-' }} {{ scope.row.jcRank || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="抽样" prop="jcFacadeCy" :show-overflow-tooltip="true">--> <!-- <el-table-column label="抽样" prop="jcFacadeCy" :show-overflow-tooltip="true">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- {{ scope.row.jcFacadeCy || '-' }}--> <!-- {{ scope.row.jcFacadeCy || '-' }}-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column label="不合格" prop="jcFacadeBl" :show-overflow-tooltip="true">--> <!-- <el-table-column label="不合格" prop="jcFacadeBl" :show-overflow-tooltip="true">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- {{ scope.row.jcFacadeBl || '-' }}--> <!-- {{ scope.row.jcFacadeBl || '-' }}-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="检查结果" prop="jcResult" :show-overflow-tooltip="true" > <el-table-column label="检查结果" prop="jcResult" :show-overflow-tooltip="true" >
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.jcResult=='1'">OK</span> <span v-if="scope.row.jcResult=='1'">OK</span>
...@@ -239,7 +239,7 @@ import { ...@@ -239,7 +239,7 @@ import {
import commonField from '@/utils/commonField' import commonField from '@/utils/commonField'
import { getInfo } from '@/api/login' import { getInfo } from '@/api/login'
export default { export default {
name: 'IncomeInspectInfo', name: 'TemplateFirstList',
data() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -716,9 +716,9 @@ export default { ...@@ -716,9 +716,9 @@ export default {
} }
} }
.submitTopTime{ .submitTopTime{
.timeForamt{ .timeForamt{
width: 61%; width: 61%;
} }
} }
} }
......
...@@ -345,7 +345,7 @@ ...@@ -345,7 +345,7 @@
<script> <script>
export default { export default {
name: 'InspectionSheet', name: 'templateSecond',
data() { data() {
return { return {
url: require('@/assets/image/cadone.png'), url: require('@/assets/image/cadone.png'),
......
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