zhangsiyu
/
erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

提交i

master
865118801@qq.com 4 years ago
parent
3e52282ead
commit
32ce2897cf
4 changed files with 187 additions and 100 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      api/user.js
  2. 2
      pages/firstInspection/firstInspection.vue
  3. 264
      pages/firstInspectionInfo/firstInspectionInfo.vue
  4. 5
      pages/firstInspectionInfo/index.scss

16
api/user.js
Unescape View File

@ -64,4 +64,18 @@ export function firstCheckDetail(data) {
method: "post",
data
});
}
}
/**
* 首检提交
* @param {Object} data
*/
export function firstCheckAdd(data) {
console.log(data)
return request({
url: `${functions.getDomain()}/api/first-check-add`,
method: "post",
data
});
}

2
pages/firstInspection/firstInspection.vue
Unescape View File

@ -50,7 +50,7 @@
firstInspectionInfo(plan_id,item) {
console.log("id",plan_id)
uni.navigateTo({
url: `../firstInspectionInfo/firstInspectionInfo?plan_id=${plan_id}&&planInfo=${encodeURIComponent(JSON.stringify(item))}`,
url: `../firstInspectionInfo/firstInspectionInfo?plan_id=${plan_id}&product_id=${item.product_id}&planInfo=${encodeURIComponent(JSON.stringify(item))}`,
success: res => {},
fail: () => {},
complete: () => {}

264
pages/firstInspectionInfo/firstInspectionInfo.vue
Unescape View File

@ -31,16 +31,11 @@
<view class="content-box-card-ul-two">
<view class="content-box-card-list">
<view class="content-box-card-title">机型:</view>
<text>{{palnInfo.product_name}}</text>
<text>{{palnInfo.product_size}}</text>
</view>
<view class="content-box-card-list">
<view class="content-box-card-title">线别:</view>
<picker @change="bindline" :value="lineIndex" :range="line">
<view class="lin-div">
<text>{{line[lineIndex]}}</text>
<image src="../../static/xiala.png"></image>
</view>
</picker>
<text>{{palnInfo.line_title}}</text>
</view>
</view>
<view class="content-box-card-ul">
@ -48,12 +43,13 @@
<view class="content-box-card-title">抽样方式:</view>
<view class="right-check">
<view class="check-list" v-for="(item,index) in cyMethod" :key="index"
@tap="radioChange(index)">
<image :src="current==index?'../../static/xz.png':'../../static/wxz.png'"></image>
@tap="radioChange(item.name)">
<image :src="item.name==forms.sampling?'../../static/xz.png':'../../static/wxz.png'">
</image>
<text>{{item.name}}</text>
</view>
<view class="other-input">
<input type="text" placeholder="其他" />
<input type="text" v-model="samplingModel" @input="samplingInput" placeholder="其他" />
</view>
</view>
</view>
@ -63,12 +59,12 @@
<view class="content-box-card-title">检验依据:</view>
<view class="right-check">
<view class="check-list" v-for="(item,index) in jyBasis" :key="index"
@tap="jyBasisChange(index)">
<image :src="jyBasisIds==index?'../../static/xz.png':'../../static/wxz.png'"></image>
@tap="jyBasisChange(item)">
<image :src="item==forms.basis?'../../static/xz.png':'../../static/wxz.png'"></image>
<text>{{item}}</text>
</view>
<view class="other-input">
<input type="text" placeholder="其他" />
<input type="text" v-model="basisModel" @input="basisInput" placeholder="其他" />
</view>
</view>
</view>
@ -83,26 +79,17 @@
<text>检验标准</text>
</view>
</view>
<view class="content-box-card-ul-two">
<view class="content-box-card-ul-two" v-for="(value, key, index) in info.reference">
<view class="content-box-card-list">
<view class="content-box-card-title">规格:</view>
<text>105</text>
<text>{{key}}</text>
</view>
<view class="content-box-card-list">
<view class="content-box-card-title">公差:</view>
<text>+3 -3</text>
</view>
</view>
<view class="content-box-card-ul-two">
<view class="content-box-card-list">
<view class="content-box-card-title">规格:</view>
<text>105</text>
</view>
<view class="content-box-card-list">
<view class="content-box-card-title">公差:</view>
<text>+3 -3</text>
<text>{{value}}</text>
</view>
</view>
<view class="sj-card">
<view class="sj-title">实际检测</view>
<view class="sj-nav">
@ -113,36 +100,26 @@
<view class="right">
<view class="right-list">
<view class="num-div">1</view>
<view class="gg-div">
<input type="number" />
</view>
<view class="gg-div">
<input type="number" />
</view>
</view>
<view class="right-list">
<view class="num-div">2</view>
<view class="num-div">3</view>
</view>
<view class="right-list" v-for="(item,index) in forms.msg" :key="index">
<view class="gg-div">
<input type="number" />
<input type="number" v-model="item.one" />
</view>
<view class="gg-div">
<input type="number" />
<input type="number" v-model="item.two" />
</view>
</view>
<view class="right-list">
<view class="num-div">3</view>
<view class="gg-div">
<input type="number" />
</view>
<view class="gg-div">
<input type="number" />
<input type="number" v-model="item.three" />
</view>
</view>
</view>
</view>
</view>
<view class="beizhu">
<textarea value="" placeholder="请输入备注" />
<textarea v-model="forms.remake" placeholder="请输入备注" />
</view>
</view>
</view>
@ -153,12 +130,14 @@
<view class="content-box-card-title">外观:</view>
<view class="right-check">
<view class="check-list" v-for="(item,index) in appearance" :key="index"
@tap="appearanceChange(index)">
<image :src="appearanceIds==index?'../../static/xz.png':'../../static/wxz.png'"></image>
@tap="appearanceChange(item)">
<image :src="item==forms.appearance?'../../static/xz.png':'../../static/wxz.png'">
</image>
<text>{{item}}</text>
</view>
<view class="other-input">
<input type="text" placeholder="其他" />
<input type="text" v-model="appearanceModel" @input="appearanceInput"
placeholder="其他" />
</view>
</view>
</view>
@ -168,12 +147,13 @@
<view class="content-box-card-title">结构性能:</view>
<view class="right-check">
<view class="check-list" v-for="(item,index) in structure" :key="index"
@tap="structureChange(index)">
<image :src="structureIds==index?'../../static/xz.png':'../../static/wxz.png'"></image>
@tap="structureChange(item)">
<image :src="item==forms.structure?'../../static/xz.png':'../../static/wxz.png'">
</image>
<text>{{item}}</text>
</view>
<view class="other-input">
<input type="text" placeholder="其他" />
<input type="text" v-model="structureModel" @input="structureInput" placeholder="其他" />
</view>
</view>
</view>
@ -187,8 +167,8 @@
<view class="content-box-card-title">最终判定:</view>
<view class="right-check">
<view class="check-list" v-for="(item,index) in ifQualified" :key="index"
@tap="ifQualifiedChange(index)">
<image :src="ifQualifiedIds==index?'../../static/xz.png':'../../static/wxz.png'">
@tap="ifQualifiedChange(index+1)">
<image :src="forms.result==index+1?'../../static/xz.png':'../../static/wxz.png'">
</image>
<text>{{item}}</text>
</view>
@ -200,8 +180,8 @@
<view class="content-box-card-title">是否量产:</view>
<view class="right-check">
<view class="check-list" v-for="(item,index) in ifProduction" :key="index"
@tap="ifProductionChange(index)">
<image :src="ProductionIds==index?'../../static/xz.png':'../../static/wxz.png'"></image>
@tap="ifProductionChange(index+1)">
<image :src="forms.agree==index+1?'../../static/xz.png':'../../static/wxz.png'"></image>
<text>{{item}}</text>
</view>
</view>
@ -209,7 +189,7 @@
</view>
</view>
<view class="submit-btn">
<button type="primary">提交并发起审核</button>
<button type="primary" @tap="submits">提交并发起审核</button>
</view>
</view>
@ -217,19 +197,23 @@
</template>
<script>
import {firstCheckDetail} from "../../api/user.js"
import {
firstCheckDetail,
firstCheckAdd
} from "../../api/user.js"
export default {
data() {
return {
pId:0,//计划id
palnInfo:{},//详情
crrentTime:'',//当前时间
pId: 0, //计划id
palnInfo: {}, //详情
crrentTime: '', //当前时间
line: ["A线", "B线", "C线", "D线"],
lineIndex: 0,
current: -1,
ifQualifiedIds: 0,
samplingModel: '',
basisModel: '',
cyMethod: [{
name: "开机首检",
check: false
@ -269,65 +253,151 @@
ifQualified: ["是", "否"],
qualifiedIds: -1,
ifProduction: ["是", "否"],
ProductionIds: -1
ProductionIds: -1,
forms: {
machine: "",
sampling: "",
msg: [{
one: "",
two: "",
three: ''
},
{
one: "",
two: "",
three: ''
}
],
basis: "",
appearance: "",
structure: "",
result: 1,
agree: 1,
remake: "",
information: "",
},
appearanceModel: '',
structureModel: '',
productId: 0,
info: {
reference: []
}
};
},
onLoad(e) {
this.pId = e.plan_id;
this.productId = e.product_id;
this.palnInfo = JSON.parse(decodeURIComponent(e.planInfo));
console.log('详情',this.palnInfo);
this.getTime();
console.log('详情', this.palnInfo);
this.getTime();
this.getInfo();
},
onShow() {
this.getInfo();
this.getTime();
},
methods: {
getTime:function(){
var date = new Date(),
year = date.getFullYear(),
month = date.getMonth() + 1,
day = date.getDate(),
hour = date.getHours() < 10 ? "0" + date.getHours() : date.getHours(),
minute = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes(),
second = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
month >= 1 && month <= 9 ? (month = "0" + month) : "";
day >= 0 && day <= 9 ? (day = "0" + day) : "";
var timer = year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second;
console.log("当前时间",date);
this.crrentTime=timer
return timer;
console.log("当前时间",timer)
appearanceInput(e) {
this.forms.appearance = e.detail.value;
},
getInfo(){
firstCheckDetail({plan_id:this.pId}).then(res=>{
// /console.log('详情', res)
samplingInput(e) {
this.forms.sampling = e.detail.value;
},
structureInput(e) {
this.forms.structure = e.detail.value;
},
basisInput(e) {
this.forms.basis = e.detail.value;
},
getTime: function() {
var date = new Date(),
year = date.getFullYear(),
month = date.getMonth() + 1,
day = date.getDate(),
hour = date.getHours() < 10 ? "0" + date.getHours() : date.getHours(),
minute = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes(),
second = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
month >= 1 && month <= 9 ? (month = "0" + month) : "";
day >= 0 && day <= 9 ? (day = "0" + day) : "";
var timer = year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second;
console.log("当前时间", date);
this.crrentTime = timer
return timer;
console.log("当前时间", timer)
},
getInfo() {
firstCheckDetail({
plan_id: this.pId,
product_id: this.productId
}).then(res => {
this.info = res;
})
},
bindline: function(e) {
console.log('picker发送选择改变，携带值为', e.target.value)
this.lineIndex = e.target.value
},
radioChange(index) {
this.current = index
radioChange(name) {
this.forms.sampling = name;
this.samplingModel = "";
},
jyBasisChange: function(index) {
this.jyBasisIds = index
jyBasisChange: function(name) {
this.forms.basis = name;
this.basisModel = "";
},
appearanceChange(index) {
this.appearanceIds = index
appearanceChange(name) {
this.forms.appearance = name;
this.appearanceModel = '';
},
structureChange(index) {
this.structureIds = index
structureChange(name) {
this.forms.structure = name;
this.structureModel = '';
},
ifQualifiedChange(index) {
this.qualifiedIds == index
this.forms.result = index
},
ifProductionChange(index) {
this.ProductionIds == index
this.forms.agree = index
},
submits() {
if (this.forms.sampling == '') {
this.$functions.error("请选择抽样方法");
return false;
}
if (this.forms.basis == '') {
this.$functions.error("请选择检测依据");
return false;
}
let flag = true;
this.forms.msg.map(item => {
if (!item.one || !item.two || !item.three) {
flag = false;
return false;
}
})
if (!flag) {
this.$functions.error("请完整填写实际检测数据");
return false;
}
if (this.forms.appearance == '') {
this.$functions.error("请选择外观");
return false;
}
if (this.forms.structure == '') {
this.$functions.error("请选择结构");
return false;
}
this.forms.machine = this.palnInfo.product_size;
this.forms.plan_id = this.pId;
firstCheckAdd(this.forms).then(res => {
uni.navigateBack({
})
})
}
}
}

5
pages/firstInspectionInfo/index.scss
Unescape View File

@ -125,11 +125,14 @@
}
.right{
width: 500upx;
@include flex(center,space-between);
//@include flex(center,space-between);
.right-list{
@include flex(center,space-between);
text-align: center;
.num-div{
width: 100upx;
@include fonts(24upx,#999);
text-align: center;
}
.gg-div{
width: 100upx;

Write Preview
Loading…
Cancel
Save