Skip to content

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

提交

parent f5e8c8e8
Hide whitespace changes
Inline Side-by-side
Showing with 156 additions and 76 deletions
src/api/oneTbale.js
View file @ ca4568ea
......@@ -81,7 +81,7 @@ export function approveInformation(data) {
}
// 9.获取单号
export function getJcCode(data) {
export function getJcCode() {
return request({
url: '/incomeinspectinfo/getJcCode',
method: 'get'
......
src/views/checkList.vue
View file @ ca4568ea
......@@ -142,7 +142,8 @@
</div>
</div>
<div class="Value">
<TextToolTip :text="item.differenceValue" :max-length="8" :disabled-show="false" /></div>
<TextToolTip :text="item.differenceValue" :max-length="8" :disabled-show="false" />
</div>
<div class="averageValue">
<TextToolTip :text="item.differenceValue1" :max-length="8" :disabled-show="false" />
</div>
......@@ -216,7 +217,8 @@
</div>
</div>
<div class="Value">
<TextToolTip :text="item.differenceValue" :max-length="8" :disabled-show="false" /></div>
<TextToolTip :text="item.differenceValue" :max-length="8" :disabled-show="false" />
</div>
<div class="averageValue">
<TextToolTip :text="item.differenceValue1" :max-length="8" :disabled-show="false" />
</div>
......@@ -253,9 +255,15 @@
<!-- 检查内容-->
<div class="recordOneContainer">
<div class="inspectionStandards">
<!-- 表达右对齐 -->
<el-form :label-position="right" label-width="120px" ref="inspectJbAl2o3List" :model="inspectJbAl2o3List" :rules="rules">
<el-form-item label="检验标准1:" prop="limitOne">
<!-- 表达右对齐 -->
<el-form
ref="inspectJbAl2o3List"
label-position="right"
label-width="120px"
:model="inspectJbAl2o3List"
:rules="rules"
>
<el-form-item label="检验标准1:" prop="limitOne">
<el-input
v-model="inspectJbAl2o3List.limitOne"
class="inspectionStandardsInput"
......@@ -266,7 +274,7 @@
@input="CalculateDifference"
/>
</el-form-item>
<el-form-item label="检验标准2:" prop="limitTwo">
<el-form-item label="检验标准2:" prop="limitTwo">
<el-input
v-model="inspectJbAl2o3List.limitTwo"
class="inspectionStandardsInput"
......@@ -277,7 +285,7 @@
@input="CalculateDifference"
/>
</el-form-item>
<el-form-item label="差异:" prop="limitThree">
<el-form-item label="差异:" prop="limitThree">
<el-input
v-model="inspectJbAl2o3List.limitThree"
class="inspectionStandardsInput"
......@@ -304,13 +312,13 @@
v-model="item.recordData"
:maxlength="7"
:disabled="controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1'
|| (controlsForm.controls == '3' &&controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
|| (controlsForm.controls == '3' &&controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
@input="handleData3Input(index)"
/>
<i
v-show="!(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1'||
(controlsForm.controls == '3' && controlsForm.approveStatus === '1') ||
(controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' ))"
(controlsForm.controls == '3' && controlsForm.approveStatus === '1') ||
(controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' ))"
class="el-icon-circle-close"
style="color: #5cbce5"
@click="clearInspectionFormThree(index)"
......@@ -318,7 +326,8 @@
</div>
</div>
<div class="Value">
<TextToolTip :text="item.differenceValue" :max-length="8" :disabled-show="false" /></div>
<TextToolTip :text="item.differenceValue" :max-length="8" :disabled-show="false" />
</div>
</div>
</div>
<div class="recordThreeBottom">
......@@ -337,7 +346,7 @@
</el-tab-pane>
<el-tab-pane label="标签三" name="third">
<div class="twoTable">
<el-form :model="inspectJbAl2o3List" :label-position="right" label-width="80px">
<el-form :model="inspectJbAl2o3List" label-position="right" label-width="80px">
<div class="threeRegion">
<div class="leftRegion">
<el-form-item label="firstHdN:" class="inspectJbAlInputBody">
......@@ -425,7 +434,7 @@
<el-radio label="2">不合格</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="noProject:"class="inspectJbAlInputBody">
<el-form-item label="noProject:" class="inspectJbAlInputBody">
<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' )"
......@@ -734,7 +743,8 @@
v-if="(controlsForm.controls ==='2'&& controlsForm.approveStatus ==='0') || (controlsForm.controls ==='2'&& controlsForm.approveStatus ==='3')"
class="submitButton"
>
<el-button class="buttoonSave" type="primary" style="background-color: #5cbce5" @click="submitControl">保存</el-button>
<el-button class="buttoonSave" type="primary" style="background-color: #5cbce5" @click="submitControl">保存
</el-button>
<el-button class="buttoonCommit" type="primary" @click="present">提交</el-button>
</div>
<!-- <div-->
......@@ -753,7 +763,7 @@
<script>
import { getToken } from '@/utils/auth'
import { addIncomeInspectInfo, approveInformation, getIncomeInspectInfo } from '@/api/oneTbale'
import { addIncomeInspectInfo, approveInformation, getIncomeInspectInfo, getJcCode } from '@/api/oneTbale'
import { parseTime } from '@/utils'
import { getInfo } from '@/api/login'
import { downLoadFile } from '@/utils/checkList'
......@@ -812,7 +822,8 @@ export default {
],
limitOne: [
{ required: true, message: '请输入检验标准', trigger: 'blur' },
{ pattern: /^(0|[1-9]\d*)(\.\d+)?$/, message: '请输入有效的数字', trigger: 'change' }
{ pattern: /^(0|[1-9]\d*)(\.\d+)?$/, message: '请输入有效的数字', trigger: 'change' },
{ validator: this.validateMethod1, trigger: 'blur' }
],
limitTwo: [
{ required: true, message: '请输入检验标准', trigger: 'blur' },
......@@ -1031,9 +1042,27 @@ export default {
this.getJcCode()
},
methods: {
// handleCyPn(){
// this.inspectJbAl2o3List.cyPn = this.inspectJbAl2o3List.wgKx +
// },
// 校验方法1
validateMethod1(rule, value, callback) {
console.log('')
if (value && value !== '' && this.inspectJbAl2o3List.limitTwo && this.inspectJbAl2o3List.limitTwo !== '') {
if (Number(this.inspectJbAl2o3List.limitOne) < Number(this.inspectJbAl2o3List.limitTwo)) {
callback()
} else {
callback(new Error('标准1要大于'))
}
} else {
callback()
}
},
handleCyPn() {
this.inspectJbAl2o3List.cyPn =
Number(this.inspectJbAl2o3List.wgKx) +
this.inspectJbAl2o3List.wgLlw + this.inspectJbAl2o3List.wgWlw + this.inspectJbAl2o3List.wgJbwq + this.inspectJbAl2o3List.wgZk +
this.inspectJbAl2o3List.wgSh + this.inspectJbAl2o3List.wgBm + this.inspectJbAl2o3List.wgTc + this.inspectJbAl2o3List.wgQg +
this.inspectJbAl2o3List.wgCq + this.inspectJbAl2o3List.wgFf + this.inspectJbAl2o3List.wgTf
console.log('cyPn:', this.inspectJbAl2o3List.cyPn)
},
/* 动态获取css的颜色*/
getStatusLabelClass(status) {
switch (status) {
......@@ -1192,8 +1221,8 @@ export default {
/* 表单3的计算方法*/
handleData3Input(index) {
if (this.inspectJbAl2o3List.limitOne !== '' && this.inspectJbAl2o3List.limitTwo !== '') {
const limitOne = parseFloat(this.inspectJbAl2o3List.limitOne)
const limitTwo = parseFloat(this.inspectJbAl2o3List.limitTwo)
const limitOne = parseFloat(this.inspectJbAl2o3List.limitOne) - parseFloat(this.inspectJbAl2o3List.limitThree)
const limitTwo = parseFloat(this.inspectJbAl2o3List.limitTwo) + parseFloat(this.inspectJbAl2o3List.limitThree)
const recordData3 = this.recode3[index].recordData
if (recordData3 !== '') {
const num = parseFloat(recordData3)
......@@ -1231,15 +1260,13 @@ export default {
// 获取单号
getJcCode() {
if (this.controlsForm.approveStatus === '0' && this.controlsForm.controls === '2' && this.$route.query.businessId === undefined) {
this.inspectInfoList.jcCode = this.getRandomNum()
getJcCode().then(response => {
if (response.code === 200) {
this.inspectInfoList.jcCode = response.data
}
})
}
},
// 生成6位随机数
getRandomNum() {
var randomNum1 = Math.floor(Math.random() * 1000000)
console.log('randomNum1', randomNum1)
return randomNum1
},
// 审核驳回
reject() {
const obj = {
......@@ -1506,6 +1533,11 @@ export default {
console.log('res', res)
this.inspectJbAl2o3List.twoJcUser = res.data.user.name
})
this.$refs.inspectJbAl2o3List.validateField('limitTwo', (vaild) => {
if (vaild) {
console.log('1111')
}
})
},
// 重值
resetRecord() {
......@@ -2048,10 +2080,11 @@ export default {
background-color: rgba(0, 0, 0, 0.5);
}
.normalSelect{
.normalSelect {
width: 100%;
padding-right: 2px;
}
::v-deep .el-tabs__nav-wrap::after {
background-color: unset;
}
......@@ -2164,7 +2197,7 @@ export default {
//text-align: right;
.fontSp {
justify-content: end;
justify-content: end;
height: 28px;
width: 100%;
font-family: Microsoft YaHei, Microsoft YaHei-400;
......@@ -2213,6 +2246,7 @@ export default {
.right {
margin-left: 6%;
width: 45%;
.scanCodeTop {
//margin-left: 69%;
width: 40%;
......@@ -2321,12 +2355,14 @@ export default {
display: flex;
margin-left: 12%;
justify-content: space-around;
.input{
.input {
font-family: Microsoft YaHei, Microsoft YaHei-700;
font-weight: 700;
color: #606266;
}
.different{
.different {
font-family: Microsoft YaHei, Microsoft YaHei-700;
font-weight: 700;
color: #606266;
......@@ -2345,17 +2381,21 @@ export default {
width: 80%;
margin-left: 12%;
padding-top: 20px;
.inspectionStandardsInput {
width: 50%;
}
.isDifferentContent {
::v-deep .el-form-item__label{
::v-deep .el-form-item__label {
padding-left: 5%;
}
.inspectionDifferentInput {
width: 50%;
}
}
//.inspectDifferent{
// margin-left: 10px;
// padding-bottom: 13px;
......@@ -2410,9 +2450,10 @@ export default {
display: flex;
margin-top: 16px;
//padding-bottom: 16px;
.oneDiv{
.oneDiv {
width: 25%;
display: flex;
.number {
width: 9px;
height: 38px;
......@@ -2423,11 +2464,13 @@ export default {
display: flex;
align-items: center;
}
.recordData {
display: flex;
margin-left: 11%;
width: 80%;
.el-icon-circle-close{
.el-icon-circle-close {
cursor: pointer;
display: flex;
align-items: center;
......@@ -2452,6 +2495,7 @@ export default {
//margin-left: 5%;
margin-top: -3%;
}
.averageValue {
//margin-left: 12%;
font-family: Microsoft YaHei, Microsoft YaHei-400;
......@@ -2486,9 +2530,10 @@ export default {
margin-top: 16px;
padding-bottom: 16px;
//justify-content: center;
.oneDiv{
.oneDiv {
width: 25%;
display: flex;
.number {
width: 9px;
font-size: 14px;
......@@ -2503,11 +2548,12 @@ export default {
//margin-left: 4%;
//margin-right: 2%;
width: 80%;
margin-left:11%;
margin-left: 11%;
height: 32px;
border-radius: 4px;
display: flex;
.el-icon-circle-close{
.el-icon-circle-close {
cursor: pointer;
display: flex;
align-items: center;
......@@ -2566,6 +2612,7 @@ export default {
}
}
//.recordOneBottom{
// display: flex;
// padding-bottom: 2%;
......@@ -2604,9 +2651,10 @@ export default {
margin-top: 16px;
padding-bottom: 16px;
//margin-left: 10%;
.twoDiv{
.twoDiv {
display: flex;
width: 60%;
.number {
width: 9px;
font-size: 14px;
......@@ -2616,11 +2664,13 @@ export default {
display: flex;
align-items: center;
}
.recordData {
width: 80%;
display: flex;
margin-left: 3%;
.el-icon-circle-close{
.el-icon-circle-close {
cursor: pointer;
display: flex;
align-items: center;
......@@ -2654,9 +2704,10 @@ export default {
padding-bottom: 16px;
//justify-content: center;
//margin-left: 10%;
.twoDiv{
.twoDiv {
display: flex;
width: 60%;
.number {
width: 9px;
font-size: 14px;
......@@ -2676,7 +2727,7 @@ export default {
border-radius: 4px;
display: flex;
.el-icon-circle-close{
.el-icon-circle-close {
cursor: pointer;
display: flex;
align-items: center;
......@@ -2685,7 +2736,6 @@ export default {
}
}
.Value {
//margin-left: 20px;
//margin-top: 8px;
......@@ -2727,24 +2777,28 @@ export default {
}
}
.recordThreeBottom{
display: flex;
.recordThreeBottom {
display: flex;
padding-bottom: 2%;
padding-left: 1%;
justify-content: space-evenly;
.recordThreeBottomMax{
.recordThreeBottomMax {
width: 130px;
font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
}
.recordThreeBottomMini{
.recordThreeBottomMini {
width: 130px;
font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
}
.recordThreeBottomAverage{
.recordThreeBottomAverage {
width: 130px;
font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
......@@ -2927,9 +2981,11 @@ export default {
display: flex;
margin-top: 16px;
padding-bottom: 16px;
.oneDiv{
.oneDiv {
width: 25%;
display: flex;
.number {
width: 9px;
font-size: 14px;
......@@ -2943,8 +2999,9 @@ export default {
.recordData {
display: flex;
width: 80%;
margin-left:11%;
.el-icon-circle-close{
margin-left: 11%;
.el-icon-circle-close {
display: flex;
align-items: center;
margin-left: 10px;
......@@ -2953,6 +3010,7 @@ export default {
}
}
.Value {
//margin-left: 20px;
//margin-top: 8px;
......@@ -2969,6 +3027,7 @@ export default {
//margin-left: 5%;
margin-top: -3%;
}
.averageValue {
//margin-left: 12%;
font-family: Microsoft YaHei, Microsoft YaHei-400;
......@@ -3004,9 +3063,10 @@ export default {
margin-top: 16px;
padding-bottom: 16px;
//justify-content: center;
.oneDiv{
.oneDiv {
width: 25%;
display: flex;
.number {
width: 9px;
font-size: 14px;
......@@ -3021,11 +3081,12 @@ export default {
//margin-left: 4%;
//margin-right: 2%;
width: 80%;
margin-left:11%;
margin-left: 11%;
height: 32px;
border-radius: 4px;
display: flex;
.el-icon-circle-close{
.el-icon-circle-close {
display: flex;
align-items: center;
margin-left: 10px;
......@@ -3050,6 +3111,7 @@ export default {
//margin-left: 5%;
margin-top: -3%;
}
.averageValue {
//margin-left: 12%;
font-family: Microsoft YaHei, Microsoft YaHei-400;
......@@ -3312,37 +3374,45 @@ export default {
.leftRegion {
width: 47%;
.ThirdOneBlueText{
.ThirdOneBlueText {
color: blue;
}
.ThirdOneRedText{
.ThirdOneRedText {
color: red;
}
.ThirdTwoBlueText{
.ThirdTwoBlueText {
margin-left: 21px;
color: blue;
}
.ThirdTwoRedText{
.ThirdTwoRedText {
margin-left: 21px;
color: red;
}
.ThirdThreeBlueText{
.ThirdThreeBlueText {
margin-left: 24px;
color: blue;
}
.ThirdThreeRedText{
.ThirdThreeRedText {
margin-left: 24px;
color: red;
}
.ThirdFourBlueText{
.ThirdFourBlueText {
margin-left: 10px;
color: blue;
}
.ThirdFourRedText{
.ThirdFourRedText {
margin-left: 10px;
color: red;
}
.selectAlign {
text-align: left;
}
......@@ -3400,17 +3470,21 @@ export default {
padding-left: 5%;
}
}
.emptyInput{
.emptyInput {
height: 4%;
}
.wgLlwinspectJbAlInputBody{
.wgLlwinspectJbAlInputBody {
margin-top: 20px;
//text-align: right;
text-align: right;
margin-top: 6%;
::v-deep .el-form-item__label{
::v-deep .el-form-item__label {
padding-left: 4%;
}
}
.inspectJbAlInput {
width: 100%;
}
......@@ -3567,16 +3641,18 @@ export default {
margin-left: 10%;
padding-bottom: 10px;
.examineReason{
::v-deep .el-form-item__content{
.examineReason {
::v-deep .el-form-item__content {
display: flex;
}
}
.remarksDiv{
::v-deep .el-form-item__label{
.remarksDiv {
::v-deep .el-form-item__label {
padding-left: 3%;
}
::v-deep .el-form-item__content{
::v-deep .el-form-item__content {
display: flex;
margin-left: 8%;
}
......@@ -3688,7 +3764,8 @@ export default {
margin-left: 10%;
margin-top: 20px;
padding-bottom: 10px;
::v-deep .el-form-item__content{
::v-deep .el-form-item__content {
display: flex;
}
......@@ -3700,7 +3777,8 @@ export default {
font-weight: 400;
}
::v-deep .el-form-item__content {
::v-deep .el-form-item__content {
display: flex;
}
......@@ -3714,12 +3792,14 @@ export default {
margin-top: 50px;
margin-left: 24%;
padding-bottom: 50px;
.buttoonSave{
.buttoonSave {
width: 15%;
height: 32px;
border-radius: 4px;
}
.buttoonCommit{
.buttoonCommit {
margin-left: 16%;
width: 15%;
height: 32px;
......
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