|
@@ -24,76 +24,76 @@
|
|
|
<uni-forms-item label="检查日期" required name="startDate">
|
|
|
<uni-datetime-picker type="date" return-type="string" v-model="addform.startDate"/>
|
|
|
</uni-forms-item>
|
|
|
- <uni-forms-item label="工程名称" required name="unitName">
|
|
|
+ <uni-forms-item label="工程名称" name="unitName">
|
|
|
<uni-easyinput v-model="addform.unitName" placeholder="请输入工程名称"/>
|
|
|
</uni-forms-item>
|
|
|
- <uni-forms-item label="关联部位" required name="relationString">
|
|
|
+ <uni-forms-item label="关联部位" name="relation">
|
|
|
<view class="hc-fj-form-item-s">
|
|
|
<view class="title text-cut">请点击右边按钮选择</view>
|
|
|
<button class="cu-btn bg-blue" @click="relationStringClick">+选择关联</button>
|
|
|
</view>
|
|
|
</uni-forms-item>
|
|
|
- <uni-forms-item label="左/右幅" required name="aroundPicture">
|
|
|
+ <uni-forms-item label="左/右幅" name="aroundPicture">
|
|
|
<uni-data-select v-model="addform.aroundPicture" :localdata="aroundPictureData"/>
|
|
|
</uni-forms-item>
|
|
|
- <uni-forms-item label="分部工程类别" required name="segmentName">
|
|
|
+ <uni-forms-item label="分部工程类别" name="segmentName">
|
|
|
<uni-easyinput v-model="addform.segmentName" placeholder="请输入分部工程类别"/>
|
|
|
</uni-forms-item>
|
|
|
<!-- 桥梁工程 -->
|
|
|
<block v-if="addform.engineeringType === 2">
|
|
|
- <uni-forms-item label="分项工程名称" required name="subitemName">
|
|
|
+ <uni-forms-item label="分项工程名称" name="subitemName">
|
|
|
<uni-easyinput v-model="addform.subitemName" placeholder="请输入分项工程名称"/>
|
|
|
</uni-forms-item>
|
|
|
- <uni-forms-item label="缺陷所处位置" required name="startStopStake">
|
|
|
+ <uni-forms-item label="缺陷所处位置" name="startStopStake">
|
|
|
<uni-easyinput v-model="addform.startStopStake" placeholder="请输入"/>
|
|
|
</uni-forms-item>
|
|
|
- <uni-forms-item label="构建编号" required name="buildNumber">
|
|
|
+ <uni-forms-item label="构建编号" name="buildNumber">
|
|
|
<uni-easyinput v-model="addform.buildNumber" placeholder="请输入"/>
|
|
|
</uni-forms-item>
|
|
|
</block>
|
|
|
<!-- 隧道工程 -->
|
|
|
<block v-if="addform.engineeringType === 1">
|
|
|
- <uni-forms-item label="分项工程桩号" required name="subitemStake">
|
|
|
+ <uni-forms-item label="分项工程桩号" name="subitemStake">
|
|
|
<uni-easyinput v-model="addform.subitemStake" placeholder="请输入分项工程桩号"/>
|
|
|
</uni-forms-item>
|
|
|
- <uni-forms-item label="缺陷起点桩号" required name="startStopStake">
|
|
|
+ <uni-forms-item label="缺陷起点桩号" name="startStopStake">
|
|
|
<uni-easyinput v-model="addform.startStopStake" placeholder="请输入"/>
|
|
|
</uni-forms-item>
|
|
|
- <uni-forms-item label="横坐标" required name="abscissa_1">
|
|
|
+ <uni-forms-item label="横坐标" name="abscissa_1">
|
|
|
<uni-easyinput v-model="addform.abscissa_1" placeholder="请输入"/>
|
|
|
</uni-forms-item>
|
|
|
- <uni-forms-item label="缺陷止点桩号" required name="stopStake">
|
|
|
+ <uni-forms-item label="缺陷止点桩号" name="stopStake">
|
|
|
<uni-easyinput v-model="addform.stopStake" placeholder="请输入"/>
|
|
|
</uni-forms-item>
|
|
|
- <uni-forms-item label="横坐标" required name="abscissa_2">
|
|
|
+ <uni-forms-item label="横坐标" name="abscissa_2">
|
|
|
<uni-easyinput v-model="addform.abscissa_2" placeholder="请输入"/>
|
|
|
</uni-forms-item>
|
|
|
- <uni-forms-item label="长(m)" required name="dataLength">
|
|
|
+ <uni-forms-item label="长(m)" name="dataLength">
|
|
|
<uni-easyinput v-model="addform.dataLength" placeholder="请输入"/>
|
|
|
</uni-forms-item>
|
|
|
- <uni-forms-item label="宽(m)" required name="dataWidth">
|
|
|
+ <uni-forms-item label="宽(m)" name="dataWidth">
|
|
|
<uni-easyinput v-model="addform.dataWidth" placeholder="请输入"/>
|
|
|
</uni-forms-item>
|
|
|
- <uni-forms-item label="面积" required name="dataArea">
|
|
|
+ <uni-forms-item label="面积" name="dataArea">
|
|
|
<uni-easyinput v-model="addform.dataArea" placeholder="请输入面积"/>
|
|
|
</uni-forms-item>
|
|
|
</block>
|
|
|
- <uni-forms-item label="病害类型" required name="diseaseType" v-if="addform.engineeringType === 1">
|
|
|
+ <uni-forms-item label="病害类型" name="diseaseType" v-if="addform.engineeringType === 1">
|
|
|
<uni-data-select v-model="addform.diseaseType" :clear="false" :localdata="diseaseTypeData" @change="diseaseTypeChange"/>
|
|
|
</uni-forms-item>
|
|
|
- <uni-forms-item label="病害类型" required name="diseaseType" v-if="addform.engineeringType === 2">
|
|
|
+ <uni-forms-item label="病害类型" name="diseaseType" v-if="addform.engineeringType === 2">
|
|
|
<uni-data-select v-model="addform.diseaseType" :clear="false" :localdata="diseaseTypeData1" @change="diseaseTypeChange"/>
|
|
|
</uni-forms-item>
|
|
|
- <uni-forms-item label="严重程度" required name="severity">
|
|
|
+ <uni-forms-item label="严重程度" name="severity">
|
|
|
<uni-data-select v-model="addform.severity" :localdata="severityData"/>
|
|
|
</uni-forms-item>
|
|
|
- <uni-forms-item label="限制性缺陷" required name="defectType">
|
|
|
+ <uni-forms-item label="限制性缺陷" name="defectType">
|
|
|
<uni-data-select v-model="addform.defectType" :localdata="defectTypeData"/>
|
|
|
</uni-forms-item>
|
|
|
- <uni-forms-item label="病害描述" required name="hiddenDanger">
|
|
|
+ <uni-forms-item label="病害描述" name="hiddenDanger">
|
|
|
<uni-easyinput type="textarea" v-model="addform.hiddenDanger" :disabled="!addform.diseaseType" placeholder="请先选择病害类型"/>
|
|
|
</uni-forms-item>
|
|
|
- <uni-forms-item label="上传照片" required name="photoImages">
|
|
|
+ <uni-forms-item label="上传照片" name="photoImages">
|
|
|
<view class="hc-form-up-img-box">
|
|
|
<block v-for="(item, index) in photoImages" :key="index">
|
|
|
<view class="bg-img" @click="viewImage(index)">
|
|
@@ -103,31 +103,31 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
</block>
|
|
|
- <view class="solids-add" @click="chooseImageTap" v-if="photoImages.length <= 0">
|
|
|
+ <view class="solids-add" @click="chooseImageTap">
|
|
|
<text class='cuIcon-add'/>
|
|
|
</view>
|
|
|
<view class="tip-text">支持JPG/JPEG/PNG</view>
|
|
|
</view>
|
|
|
</uni-forms-item>
|
|
|
- <uni-forms-item label="是否限期整改" required name="deadline">
|
|
|
+ <uni-forms-item label="是否限期整改" name="deadline">
|
|
|
<uni-data-checkbox v-model="addform.deadline" :localdata="[{text: '是',value: 1}, {text: '否',value: 0}]"/>
|
|
|
</uni-forms-item>
|
|
|
- <uni-forms-item label="限期整改日期" required name="endDate">
|
|
|
+ <uni-forms-item label="限期整改日期" name="endDate">
|
|
|
<uni-datetime-picker type="date" return-type="string" v-model="addform.endDate"/>
|
|
|
</uni-forms-item>
|
|
|
- <uni-forms-item label="施工方检查人" required name="checkName">
|
|
|
+ <uni-forms-item label="施工方检查人" name="checkName">
|
|
|
<uni-easyinput v-model="addform.checkName" placeholder="请输入施工方检查人员"/>
|
|
|
</uni-forms-item>
|
|
|
- <uni-forms-item label="监理方检查人" required name="superCheckName">
|
|
|
+ <uni-forms-item label="监理方检查人" name="superCheckName">
|
|
|
<uni-easyinput v-model="addform.superCheckName" placeholder="请输入监理方检查人员"/>
|
|
|
</uni-forms-item>
|
|
|
- <uni-forms-item label="整改人员" required name="taskflowUser">
|
|
|
+ <uni-forms-item label="整改人员" name="taskflowUser">
|
|
|
<view class="flex">
|
|
|
<uni-easyinput :value="taskflowUserStr" disabled/>
|
|
|
<view class="name-btn" @click="userChange">选择+</view>
|
|
|
</view>
|
|
|
</uni-forms-item>
|
|
|
- <uni-forms-item label="备注">
|
|
|
+ <uni-forms-item label="备注" name="remark">
|
|
|
<uni-easyinput v-model="addform.remark" type="textarea" placeholder="请输入备注"/>
|
|
|
</uni-forms-item>
|
|
|
</uni-forms>
|
|
@@ -136,6 +136,7 @@
|
|
|
</template>
|
|
|
<script>
|
|
|
import config from "../../core/api.js"
|
|
|
+import {deepCopy} from "@/uni_modules/uni-forms/components/uni-forms/utils";
|
|
|
|
|
|
export default {
|
|
|
data() {
|
|
@@ -213,22 +214,10 @@ export default {
|
|
|
},
|
|
|
// 校验规则
|
|
|
formRules: {
|
|
|
- supervisionUnitName: {
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- errorMessage: '请输入检查单位'
|
|
|
- }]
|
|
|
- },
|
|
|
startDate: {
|
|
|
rules: [{
|
|
|
required: true,
|
|
|
- errorMessage: '请输入检查单位'
|
|
|
- }]
|
|
|
- },
|
|
|
- checkName: {
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- errorMessage: '请输入检查人员'
|
|
|
+ errorMessage: '请选择检查日期'
|
|
|
}]
|
|
|
},
|
|
|
}
|
|
@@ -282,7 +271,7 @@ export default {
|
|
|
//上传照片
|
|
|
chooseImageTap() {
|
|
|
uni.chooseFile({
|
|
|
- count: 1,
|
|
|
+ count: 3,
|
|
|
extension: ['.jpg', '.png', '.jpeg'],
|
|
|
success: ({tempFiles, tempFilePaths}) => {
|
|
|
this.addform.photoImages = tempFiles
|
|
@@ -305,7 +294,7 @@ export default {
|
|
|
//关联工程部位
|
|
|
relationStringClick() {
|
|
|
//把已选值储存到全局变量
|
|
|
- getApp().globalData.relationStringId = this.addform.relationStringId;
|
|
|
+ getApp().globalData.relationId = this.addform.relationId;
|
|
|
uni.navigateTo({
|
|
|
url: "/pages/qualityInspection_fj/tree"
|
|
|
})
|
|
@@ -327,156 +316,45 @@ export default {
|
|
|
//提交代码
|
|
|
submitForm() {
|
|
|
this.$refs.formRef.validate().then(res => {
|
|
|
- console.log('success', res);
|
|
|
- }).catch(err => {
|
|
|
- console.log('err', err);
|
|
|
- })
|
|
|
- /*this.$refs.form.validate().then(res => {
|
|
|
- if (this.addform.deadline == '1' && !this.addform.endDate) {
|
|
|
- this.$prompt.none("请选择整改期限日期");
|
|
|
- return;
|
|
|
- }
|
|
|
- if (!(this.addform.taskflowUser && this.addform.taskflowUser.length)) {
|
|
|
- this.$prompt.none("请选择整改人员");
|
|
|
- return;
|
|
|
- }
|
|
|
this.addInfoHandle();
|
|
|
- })*/
|
|
|
+ }).catch(() => {
|
|
|
+ uni.showToast({
|
|
|
+ title: '请完善表单信息',
|
|
|
+ duration: 1500,
|
|
|
+ icon: 'none'
|
|
|
+ });
|
|
|
+ })
|
|
|
},
|
|
|
-
|
|
|
addInfoHandle() {
|
|
|
- //console.log('addInfoHandle')
|
|
|
- let taskflowUserIds = [];
|
|
|
- if (this.addform.taskflowUser) {
|
|
|
- this.addform.taskflowUser.forEach(element => {
|
|
|
- taskflowUserIds.push(element.id)
|
|
|
+ let formData = deepCopy(this.addform);
|
|
|
+ //处理日期格式
|
|
|
+ formData.startDate = this.$dayjs(formData.startDate).format('YYYY 年 MM 月 DD 日');
|
|
|
+ formData.endDate = this.$dayjs(formData.endDate).format('YYYY 年 MM 月 DD 日');
|
|
|
+ //处理人员
|
|
|
+ let taskFlowUserIds = [];
|
|
|
+ if (formData.taskFlowUser) {
|
|
|
+ formData.taskFlowUser.forEach(element => {
|
|
|
+ taskFlowUserIds.push(element.id)
|
|
|
});
|
|
|
+ formData.taskFlowUser = JSON.stringify(formData.taskFlowUser);
|
|
|
}
|
|
|
-
|
|
|
- let noticeUserIds = [];
|
|
|
- if (this.addform.noticeUser) {
|
|
|
- this.addform.noticeUser.forEach(element => {
|
|
|
- noticeUserIds.push(element.id)
|
|
|
- });
|
|
|
- }
|
|
|
-
|
|
|
- //var formData = new FormData();
|
|
|
-
|
|
|
- //console.log(formData)
|
|
|
- // if(this.addInfoType == 2){
|
|
|
- // formData.append('id', this.addform.id)
|
|
|
- // formData.append('status', 2)//复核中
|
|
|
- // }
|
|
|
- // formData.append('cs', 1)//监理指令1 施工整改0
|
|
|
- // formData.append('contractName', this.addform.contractName)
|
|
|
- // formData.append('supervisionUnitName', this.addform.supervisionUnitName)
|
|
|
- // formData.append('contractorUnitName', this.addform.contractorUnitName)
|
|
|
- // formData.append('deadline', this.addform.deadline)
|
|
|
- // formData.append('startDate', this.$dayjs(this.addform.startDate).format('YYYY 年 MM 月 DD 日'))
|
|
|
- // formData.append('endDate', this.$dayjs(this.addform.endDate).format('YYYY 年 MM 月 DD 日'))
|
|
|
- // formData.append('checkName', this.addform.checkName)
|
|
|
- // formData.append('taskflowUserIds', taskflowUserIds.join(','))
|
|
|
- // formData.append('noticeUserIds', noticeUserIds.join(','))
|
|
|
- // formData.append('hiddenDanger', this.addform.hiddenDanger)
|
|
|
- // formData.append('modifyRequirements', this.addform.modifyRequirements)
|
|
|
-
|
|
|
- let formData = {};
|
|
|
- if (this.addInfoType == 2) {
|
|
|
- formData.id = this.addform.id;
|
|
|
- formData.status = 2;//复核中
|
|
|
- }
|
|
|
- formData.cs = 1;//监理指令1 施工整改0
|
|
|
- formData.contractName = this.addform.contractName;
|
|
|
- formData.supervisionUnitName = this.addform.supervisionUnitName;
|
|
|
- formData.contractorUnitName = this.addform.contractorUnitName;
|
|
|
- formData.deadline = this.addform.deadline;
|
|
|
- formData.startDate = this.$dayjs(this.addform.startDate).format('YYYY 年 MM 月 DD 日');
|
|
|
- formData.endDate = this.$dayjs(this.addform.endDate).format('YYYY 年 MM 月 DD 日');
|
|
|
- formData.checkName = this.addform.checkName;
|
|
|
- formData.taskflowUserIds = taskflowUserIds.join(',');
|
|
|
- formData.noticeUserIds = noticeUserIds.join(',');
|
|
|
- formData.hiddenDanger = this.addform.hiddenDanger;
|
|
|
- formData.modifyRequirements = this.addform.modifyRequirements;
|
|
|
-
|
|
|
- let fileLists = [];
|
|
|
- for (var i = 0; i < this.fileList.length; i++) {
|
|
|
- if (this.fileList[i].files && this.fileList[i].files.length) {
|
|
|
- this.fileList[i].files.forEach((file) => {
|
|
|
- fileLists.push({
|
|
|
- id: file.id,
|
|
|
- file: file,
|
|
|
- remark: this.fileList[i].remark,
|
|
|
- type: 1,
|
|
|
- groupType: i + 1,
|
|
|
- })
|
|
|
- })
|
|
|
- } else {
|
|
|
- fileLists.push({
|
|
|
- remark: this.fileList[i].remark,
|
|
|
- type: 1,
|
|
|
- groupType: i + 1,
|
|
|
- })
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- for (var i = 0; i < this.fileList2.length; i++) {
|
|
|
- if (this.fileList2[i].files && this.fileList2[i].files.length) {
|
|
|
- this.fileList2[i].files.forEach((file) => {
|
|
|
- fileLists.push({
|
|
|
- id: file.id,
|
|
|
- file: file,
|
|
|
- remark: this.fileList2[i].remark,
|
|
|
- type: 0,
|
|
|
- groupType: i + 1,
|
|
|
- });
|
|
|
- })
|
|
|
- } else {
|
|
|
- fileLists.push({
|
|
|
- remark: this.fileList2[i].remark,
|
|
|
- type: 0,
|
|
|
- groupType: i + 1,
|
|
|
- })
|
|
|
- }
|
|
|
+ formData.taskFlowUserIds = taskFlowUserIds.join(',');
|
|
|
+ //处理文件
|
|
|
+ if (formData.photoImages) {
|
|
|
+ console.log(formData.photoImages)
|
|
|
+ formData.photoImages.forEach((file, i) => {
|
|
|
+ console.log(file)
|
|
|
+ /*if (file.raw) {
|
|
|
+ formData.append(`orders[${index}].images[${i}].file`, file.raw);
|
|
|
+ }
|
|
|
+ formData.append(`orders[${index}].images[${i}].remark`, file.remark);
|
|
|
+ formData.append(`orders[${index}].images[${i}].type`, '1');
|
|
|
+ formData.append(`orders[${index}].images[${i}].groupType`, '1');*/
|
|
|
+ })
|
|
|
+ //formData.append(`orders[${index}].files`, JSON.stringify(item.files));
|
|
|
}
|
|
|
-
|
|
|
- //console.log(fileLists)
|
|
|
- // fileLists.forEach((file,i)=>{
|
|
|
- // if(file.file){
|
|
|
- // formData.append('images['+i+'].file',file.file);
|
|
|
- // }
|
|
|
- // formData.append('images['+i+'].remark',file.remark);
|
|
|
- // formData.append('images['+i+'].type',file.type);
|
|
|
- // formData.append('images['+i+'].groupType',file.groupType);
|
|
|
- // })
|
|
|
-
|
|
|
- // let jsonData = {};
|
|
|
- // //console.log(formData)
|
|
|
- // formData.forEach((value, key) => jsonData[key] = value);
|
|
|
- // jsonData.userId = this.userid;
|
|
|
- // jsonData.projectId = this.project.id;
|
|
|
- // jsonData.contractId = this.project.contractId;
|
|
|
- // console.log(jsonData)
|
|
|
- ////return;
|
|
|
-
|
|
|
- fileLists.forEach((file, i) => {
|
|
|
- //console.log(file)
|
|
|
- if (file.file && file.file.size) {
|
|
|
- formData['images[' + i + '].file'] = file.file;
|
|
|
- }
|
|
|
- if (file.id) {
|
|
|
- formData['images[' + i + '].id'] = file.id;
|
|
|
- }
|
|
|
- formData['images[' + i + '].remark'] = file.remark;
|
|
|
- formData['images[' + i + '].type'] = file.type;
|
|
|
- formData['images[' + i + '].groupType'] = file.groupType;
|
|
|
- })
|
|
|
- formData.userId = this.userid;
|
|
|
- formData.projectId = this.project.id;
|
|
|
- formData.contractId = this.project.contractId;
|
|
|
- console.log(formData)
|
|
|
- //return;
|
|
|
-
|
|
|
- const url = config.api;
|
|
|
+ console.log('formData', formData)
|
|
|
+ /*const url = config.api;
|
|
|
const token = uni.getStorageSync("token");
|
|
|
uni.showLoading({
|
|
|
title: '加载中'
|
|
@@ -500,10 +378,8 @@ export default {
|
|
|
}, complete() {
|
|
|
uni.hideLoading();
|
|
|
}
|
|
|
- })
|
|
|
-
|
|
|
+ })*/
|
|
|
},
|
|
|
-
|
|
|
backPage() {
|
|
|
uni.navigateBack({
|
|
|
delta: 1
|