2024-2-28需求调整

This commit is contained in:
曹磊 2024-03-15 09:49:29 +08:00
parent 5429da858b
commit 2adc9e4142
42 changed files with 2200 additions and 4500 deletions

View File

@ -1,5 +1,5 @@
{
"projectname": "project-manage-new",
"projectname": "yhjz_xcx",
"setting": {
"compileHotReLoad": true,
"urlCheck": false,

View File

@ -104,7 +104,8 @@
"businessplan/twoWeekPlan/main",
"businessplan/twoWeekPlan/addEdit/main",
"businessplan/twoWeekPlan/addEdit/detail/main",
"businessplan/twoWeekPlan/information/main"
"businessplan/twoWeekPlan/information/main",
"businessplan/uncommitted/main"
]
},
{
@ -117,7 +118,8 @@
"businesstotal/totalCopy/main",
"businesstotal/totalEdit/main",
"businesstotal/totalLyb/main",
"businesstotal/message/sgDetail/main"
"businesstotal/message/sgDetail/main",
"businesstotal/uncommitted/main"
]
}
],

View File

@ -8,16 +8,18 @@
<div style="display: flex;min-height: 30px;">
<div style="text-align: left;padding: 2% 0 1% 5%;width: 34%">原合同名称</div>
<div style="width: 50%;padding-top: 1%;">
<input disabled placeholder=" " style="text-align: left"
v-model="dataForm.contractName"></input>
<!-- <input disabled placeholder=" " style="text-align: left"-->
<!-- v-model="dataForm.contractName"></input>-->
<span>{{dataForm.contractName}}</span>
</div>
</div>
<div class="showDiv"></div>
<div style="display: flex">
<div style="text-align: left;padding: 1% 0 1% 5%;width: 34%">新合同名称</div>
<div style="width: 60%">
<input disabled placeholder=" " style="text-align: left"
v-model="dataForm.contractNewName"></input>
<!-- <input disabled placeholder=" " style="text-align: left"-->
<!-- v-model="dataForm.contractNewName"></input>-->
<span>{{dataForm.contractNewName}}</span>
</div>
</div>
<div class="showDiv"></div>

View File

@ -15,14 +15,14 @@
立项名称{{ dataFormProject.projectNewName }}<br></span>
<span v-else> 立项名称{{ dataFormProject.project }}<br></span>
<span> 建设单位{{ dataFormProject.jsdw }}<br></span>
<span> 施工地点{{ dataFormProject.sgdd }}<br></span>
<span> 年份{{ dataFormProject.projectYear }}<br></span>
<span> 开工时间{{ dataFormProject.projectStart }}<br></span>
<span> 竣工时间{{ dataFormProject.projectEnd==null?"": dataFormProject.projectEnd}}<br></span>
<span> 施工进度{{ dataFormProject.sgjd }}<br></span>
<span> 负责工长{{ dataFormProject.fzgz }}<br></span>
<span> 联络员{{ dataFormProject.lly }}<br></span>
<span> 工程类别{{ dataFormProject.gclb }}<br></span>
<!-- <span> 施工地点{{ dataFormProject.sgdd }}<br></span>-->
<span> 年份{{ dataFormProject.projectYear }}<br></span>
<span> 开工时间{{ dataFormProject.projectStart==null?"": dataFormProject.projectStart }}<br></span>
<span> 竣工时间{{ dataFormProject.projectEnd==null?"": dataFormProject.projectEnd}}<br></span>
<span> 施工进度{{ dataFormProject.sgjd }}<br></span>
<span> 负责工长{{ dataFormProject.fzgz }}<br></span>
<span> 联络员{{ dataFormProject.lly }}<br></span>
<span> 工程类别{{ dataFormProject.gclb }}<br></span>
</div>
<div v-else style="text-align: center;font-size: 12px;margin-top: 4%">暂无</div>
</div>

View File

@ -8,98 +8,35 @@
<div>
<tr style="display: flex;font-size: 12px;border: 2px solid #19be6b;font-weight: bold">
<td class="th-row" style="width: 10%;text-align: center">序号</td>
<td class="th-row" style="width: 38%;text-align: center">立项名称</td>
<td class="th-row" style="width: 37%;text-align: center">施工地点</td>
<td class="th-row" style="width: 75%;text-align: center">立项名称</td>
<td class="th-row" style="width: 14%;text-align: center">操作</td>
<!-- <td class="th-row" style="width: 5%;text-align: center">序号</td>
<td class="th-row" style="width: 9%;text-align: center">施工年份</td>
<td class="th-row" style="width: 15%;text-align: center">建设单位</td>
<td class="th-row" style="width: 15%;text-align: center">立项名称</td>
<td class="th-row" style="width: 15%;text-align: center">施工地点</td>
<td class="th-row" style="width: 9%;text-align: center">施工进度</td>
<td class="th-row" style="width: 9%;text-align: center">负责工长</td>
<td class="th-row" style="width: 9%;text-align: center">现场照片</td>
<td class="th-row" style="width: 9%;text-align: center">导入合同</td>
<td class="th-row" style="width: 5%;text-align: center">操作</td>-->
</tr>
</div>
<div v-for="(item,indexFa) in dataList" :key="indexFa" style="border-left: 2px solid #19be6b;border-right: 2px solid #19be6b;">
<div v-if="selectOneDataId === item.projectId" style="background-color: #19be6b" @click="selectOneData(item.projectId)">
<tr class="td-row" style="display: flex;font-size: 12px">
<td class="trTd" style="width: 10%;text-align: center">{{ indexFa + 1 }}</td>
<td class="trTd" style="width: 38%;text-align: center">
<td class="trTd" style="width: 75%;text-align: center">
<div v-if="item.projectNewName == null">{{ item.project }}</div>
<div v-else>{{ item.projectNewName }}</div>
</td>
<td class="trTd" style="width: 37%;text-align: center">
{{ item.sgdd != null ? item.sgdd : '暂无' }}
</td>
<td class="trTd" style="width: 14%;text-align: center;">
<div v-if="item.projectNewName === null" @click="goToo('/pages/businesssearchbyhtgz/projectInfo/main?title='+title+'-'+item.project+'&&id=' + item.projectId)">详情</div>
<div v-else @click="goToo('/pages/businesssearchbyhtgz/projectInfo/main?title='+title+'-'+item.projectNewName+'&&id=' + item.projectId)">详情</div>
</td>
<!-- <td class="trTd" style="width: 5%;text-align: center">{{ indexFa + 1 }}</td>
<td class="trTd" style="width: 9%;text-align: center">{{ item.projectYear }}</td>
<td class="trTd" style="width: 15%;text-align: center">
{{ item.jsdw != null ? item.jsdw : '暂无' }}
</td>
<td class="trTd" style="width: 15%;text-align: center">
<div v-if="item.projectNewName == null">{{ item.project }}</div>
<div v-else>{{ item.projectNewName }}</div>
</td>
<td class="trTd" style="width: 15%;text-align: center">
{{ item.sgdd != null ? item.sgdd : '暂无' }}
</td>
<td class="trTd" style="width: 9%;text-align: center">{{ item.sgjd != null ? item.sgjd : '暂无' }}
</td>
<td class="trTd" style="width: 9%;text-align: center">{{ item.fzgz != null ? item.fzgz : '暂无' }}
</td>
<td class="trTd" style="width: 9%;text-align: center">{{ item.projectPhotoConut }}</td>
<td v-if="item.isContant === 0" class="trTd" style="width: 9%;text-align: center">{{ "" }}</td>
<td v-else class="trTd" style="width: 9%;text-align: center">{{ "是" }}</td>
<td class="trTd" style="width: 5%;text-align: center;">
<div v-if="item.projectNewName === null" @click="goToo('/pages/businesssearchbyhtgz/projectInfo/main?title='+title+'-'+item.project+'&&id=' + item.projectId)">详情</div>
<div v-else @click="goToo('/pages/businesssearchbyhtgz/projectInfo/main?title='+title+'-'+item.projectNewName+'&&id=' + item.projectId)">详情</div>
</td>-->
</tr>
</div>
<div v-else @click="selectOneData(item.projectId)">
<tr class="td-row" style="display: flex;font-size: 12px">
<td class="trTd" style="width: 10%;text-align: center">{{ indexFa + 1 }}</td>
<td class="trTd" style="width: 38%;text-align: center">
<td class="trTd" style="width: 75%;text-align: center">
<div v-if="item.projectNewName == null">{{ item.project }}</div>
<div v-else>{{ item.projectNewName }}</div>
</td>
<td class="trTd" style="width: 37%;text-align: center">
{{ item.sgdd != null ? item.sgdd : '暂无' }}
</td>
<td class="trTd" style="width: 14%;text-align: center;">
<div v-if="item.projectNewName == null" @click="goToo('/pages/businesssearchbyhtgz/projectInfo/main?title='+title+'-'+item.project+'&&id=' + item.projectId)">详情</div>
<div v-else @click="goToo('/pages/businesssearchbyhtgz/projectInfo/main?title='+title+'-'+item.projectNewName+'&&id=' + item.projectId)">详情</div>
</td>
<!-- <td class="trTd" style="width: 5%;text-align: center">{{ indexFa + 1 }}</td>
<td class="trTd" style="width: 9%;text-align: center">{{ item.projectYear }}</td>
<td class="trTd" style="width: 15%;text-align: center">
{{ item.jsdw != null ? item.jsdw : '暂无' }}
</td>
<td class="trTd" style="width: 15%;text-align: center">
<div v-if="item.projectNewName == null">{{ item.project }}</div>
<div v-else>{{ item.projectNewName }}</div>
</td>
<td class="trTd" style="width: 15%;text-align: center">
{{ item.sgdd != null ? item.sgdd : '暂无' }}
</td>
<td class="trTd" style="width: 9%;text-align: center">{{ item.sgjd != null ? item.sgjd : '暂无' }}
</td>
<td class="trTd" style="width: 9%;text-align: center">{{ item.fzgz != null ? item.fzgz : '暂无' }}
</td>
<td class="trTd" style="width: 9%;text-align: center">{{ item.projectPhotoConut }}</td>
<td v-if="item.isContant === 0" class="trTd" style="width: 9%;text-align: center">{{ "" }}</td>
<td v-else class="trTd" style="width: 9%;text-align: center">{{ "是" }}</td>
<td class="trTd" style="width: 5%;text-align: center;">
<div v-if="item.projectNewName == null" @click="goToo('/pages/businesssearchbyhtgz/projectInfo/main?title='+title+'-'+item.project+'&&id=' + item.projectId)">详情</div>
<div v-else @click="goToo('/pages/businesssearchbyhtgz/projectInfo/main?title='+title+'-'+item.projectNewName+'&&id=' + item.projectId)">详情</div>
</td>-->
</tr>
</div>
</div>

View File

@ -11,21 +11,21 @@
<div class="arrowOpen"></div>
</div>
<div class="showDiv"></div>
<!-- <div class="showDiv"></div>
<div style="display: flex;min-height: 30px;" @click="showPicker(2)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">2&nbsp;施工地点(all)</div>
<div style="width: 54%">
<input disabled style="text-align: left" placeholder=" "
v-model="dataForm.projectSgdd"></input>
</div>
<div class="arrowOpen"></div>
</div>
<div style="display: flex;min-height: 30px;" @click="showPicker(2)">-->
<!-- <div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">2&nbsp;施工地点(all)</div>-->
<!-- <div style="width: 54%">-->
<!-- <input disabled style="text-align: left" placeholder=" "-->
<!-- v-model="dataForm.projectSgdd"></input>-->
<!-- </div>-->
<!-- <div class="arrowOpen"></div>-->
<!-- </div>-->
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px;">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">3&nbsp;施工年份(all)</div>
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">2&nbsp;施工年份(all)</div>
<div style="width: 54%;text-align: left">
<picker mode="date" :value="dataForm.projectYear" fields="year" @change="bindYearChange($event,1)">
<view class="picker">
@ -38,7 +38,7 @@
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px;" @click="showPicker(5)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">4&nbsp;负责工长(all)</div>
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">3&nbsp;负责工长(all)</div>
<div style="width: 54%;padding-top: 1%;">
<input disabled style="text-align: left"
v-model="dataForm.projectFzgz"></input>
@ -47,7 +47,7 @@
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px;" @click="showPicker(7)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">5&nbsp;联络员(all)</div>
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">4&nbsp;联络员(all)</div>
<div style="width: 54%;padding-top: 1%;">
<input disabled style="text-align: left"
v-model="dataForm.projectLly"></input>
@ -56,7 +56,7 @@
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px;" @click="showPicker(3)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">6&nbsp;工程类别(all)</div>
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">5&nbsp;工程类别(all)</div>
<div style="width: 54%;padding-top: 1%;">
<input disabled style="text-align: left" placeholder="可多选"
v-model="dataForm.projectGclb"></input>
@ -65,7 +65,7 @@
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px;" @click="showPicker(4)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">7&nbsp;导入合同(all)</div>
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">6&nbsp;导入合同(all)</div>
<div style="width: 54%;padding-top: 1%;">
<input disabled style="text-align: center" placeholder=" "
v-model="dataForm.contant"></input>
@ -74,7 +74,7 @@
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px;" @click="showPicker(6)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">8&nbsp;人员(all)</div>
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">7&nbsp;人员(all)</div>
<div style="width: 54%;padding-top: 1%;">
<input disabled style="text-align: left" placeholder="(包含离职人员)"
v-model="dataForm.gr"></input>
@ -83,7 +83,7 @@
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px;">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%;">9&nbsp;时间区间(all)</div>
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%;">8&nbsp;时间区间(all)</div>
<div style="width: 54%;padding-top: 1%;;display: flex;font-size: 12px">
<picker mode="date" :value="dataForm.projectYear" fields="day" @change="bindYearChange($event,2)">
<view class="picker">
@ -104,7 +104,7 @@
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px;">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 38%">10&nbsp;关键字(all)</div>
<div style="text-align: left;padding: 2% 0 1% 4%;width: 38%">9&nbsp;关键字(all)</div>
<div style="width: 52%;padding-top: 1%;">
<input style="padding-top: 1%;" v-model="dataForm.gjz" @input="searchList"></input>
</div>
@ -142,116 +142,34 @@
<div>
<tr style="display: flex;font-size: 12px;border: 2px solid #ED7D31;">
<td class="th-row" style="width: 10%;text-align: center">序号</td>
<td class="th-row" style="width: 38%;text-align: center">立项名称</td>
<td class="th-row" style="width: 37%;text-align: center">施工地点</td>
<td class="th-row" style="width: 75%;text-align: center">立项名称</td>
<td class="th-row" style="width: 14%;text-align: center">操作</td>
<!-- <td class="th-row" style="width: 5%;text-align: center">序号</td>
<td class="th-row" style="width: 9%;text-align: center">施工年份</td>
<td class="th-row" style="width: 15%;text-align: center">建设单位</td>
<td class="th-row" style="width: 15%;text-align: center">立项名称</td>
<td class="th-row" style="width: 15%;text-align: center">施工地点</td>
<td class="th-row" style="width: 9%;text-align: center">施工进度</td>
<td class="th-row" style="width: 9%;text-align: center">负责工长</td>
<td class="th-row" style="width: 9%;text-align: center">现场照片</td>
<td class="th-row" style="width: 9%;text-align: center">导入合同</td>
<td class="th-row" style="width: 5%;text-align: center">操作</td>-->
</tr>
</div>
<div v-for="(item,indexFa) in dataList" :key="indexFa" style="border-right: 2px solid #ED7D31;border-left: 2px solid #ED7D31;">
<tr v-if="selectOneDataId === item.projectId" class="td-row" style="display: flex;font-size: 12px;background-color: #ff8635" @click="selectOneData(item.projectId)">
<td class="trTd" style="width: 10%;text-align: center">{{ indexFa + 1 }}</td>
<td class="trTd" style="width: 38%;text-align: center">
<td class="trTd" style="width: 75%;text-align: center">
<div v-if="item.projectNewName == null">{{ item.project }}</div>
<div v-else>{{ item.projectNewName }}</div>
</td>
<td class="trTd" style="width: 37%;text-align: center">
<div v-for="(son, index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}</div>
<div v-if="item.projectSgddId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 14%;text-align: center">
<span
@click="addEdit('/pages/businesssearchbylx/projectDetail/main?id='+item.projectId)">详情</span>
</td>
<!-- <td class="trTd" style="width: 5%;text-align: center">{{ indexFa + 1 }}</td>
<td class="trTd" style="width: 9%;text-align: center">{{ item.projectYear }}</td>
<td class="trTd" style="width: 15%;text-align: center">
<div v-for="(son, index) in dicJsdwList" :key="index" v-if="son.dictId === item.projectJsdwId">{{ son.name }}</div>
<div v-if="item.projectJsdwId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 15%;text-align: center">
<div v-if="item.projectNewName == null">{{ item.project }}</div>
<div v-else>{{ item.projectNewName }}</div>
</td>
<td class="trTd" style="width: 15%;text-align: center">
<div v-for="(son, index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}</div>
<div v-if="item.projectSgddId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 9%;text-align: center">
<div v-for="(son, index) in dicJdList" :key="index" v-if="son.dictId === item.projectSgjdId">{{ son.name }}</div>
<div v-if="item.projectSgjdId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 9%;text-align: center">
<div v-for="(son, index) in serchList" :key="index" v-if="son.userId === item.projectFzgzId">{{ son.name }}</div>
<div v-if="item.projectFzgzId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 9%;text-align: center">{{ item.projectPhotoConut }}</td>
<td v-if="item.isContant === 0" class="trTd" style="width: 10%;text-align: center">{{ "" }}</td>
<td v-else class="trTd" style="width: 9%;text-align: center">{{ "是" }}</td>
<td class="trTd" style="width: 5%;text-align: center">
<span
@click="addEdit('/pages/businesssearchbylx/projectDetail/main?id='+item.projectId)">详情</span>
</td>-->
</tr>
<tr v-else class="td-row" style="display: flex;font-size: 12px" @click="selectOneData(item.projectId)">
<td class="trTd" style="width: 10%;text-align: center">{{ indexFa + 1 }}</td>
<td class="trTd" style="width: 38%;text-align: center">
<td class="trTd" style="width: 75%;text-align: center">
<div v-if="item.projectNewName == null">{{ item.project }}</div>
<div v-else>{{ item.projectNewName }}</div>
</td>
<td class="trTd" style="width: 37%;text-align: center">
<div v-for="(son, index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}</div>
<div v-if="item.projectSgddId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 14%;text-align: center">
<span
@click="addEdit('/pages/businesssearchbylx/projectDetail/main?id='+item.projectId +'&&title=立项详情-详情-' + item.project)">详情</span>
</td>
<!-- <td class="trTd" style="width: 5%;text-align: center">{{ indexFa + 1 }}</td>
<td class="trTd" style="width: 9%;text-align: center">{{ item.projectYear }}</td>
<td class="trTd" style="width: 15%;text-align: center">
<div v-for="(son, index) in dicJsdwList" :key="index" v-if="son.dictId === item.projectJsdwId">{{ son.name }}</div>
<div v-if="item.projectJsdwId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 15%;text-align: center">
<div v-if="item.projectNewName == null">{{ item.project }}</div>
<div v-else>{{ item.projectNewName }}</div>
</td>
<td class="trTd" style="width: 15%;text-align: center">
<div v-for="(son, index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}</div>
<div v-if="item.projectSgddId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 9%;text-align: center">
<div v-for="(son, index) in dicJdList" :key="index" v-if="son.dictId === item.projectSgjdId">{{ son.name }}</div>
<div v-if="item.projectSgjdId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 9%;text-align: center">
<div v-for="(son, index) in serchList" :key="index" v-if="son.userId === item.projectFzgzId">{{ son.name }}</div>
<div v-if="item.projectFzgzId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 9%;text-align: center">{{ item.projectPhotoConut }}</td>
<td v-if="item.isContant === 0" class="trTd" style="width: 10%;text-align: center">{{ "" }}</td>
<td v-else class="trTd" style="width: 9%;text-align: center">{{ "是" }}</td>
<td class="trTd" style="width: 5%;text-align: center">
<span
@click="addEdit('/pages/businesssearchbylx/projectDetail/main?id='+item.projectId +'&&title=立项详情-详情-' + item.project)">详情</span>
</td>-->
</tr>
</div>
<!-- </div>
</div>-->
<!-- <div v-if="dataList.length === 0 " style="text-align: center; padding-top: 10%">
<span>暂无数据</span>
</div>-->
<div style="border-bottom: 2px solid #ED7D31;text-align: center"></div>
</div>
</div>

View File

@ -14,14 +14,14 @@
立项名称{{ dataFormProject.projectNewName }}<br></span>
<span v-else> 立项名称{{ dataFormProject.project }}<br></span>
<span> 建设单位{{ dataFormProject.jsdw }}<br></span>
<span> 施工地点{{ dataFormProject.sgdd }}<br></span>
<span> 年份{{ dataFormProject.projectYear }}<br></span>
<span> 开工时间{{ dataFormProject.projectStart ==null?"":dataFormProject.projectStart}}<br></span>
<span> 竣工时间{{ dataFormProject.projectEnd ==null?"":dataFormProject.projectEnd}}<br></span>
<span> 施工进度{{ dataFormProject.sgjd }}<br></span>
<span> 负责工长{{ dataFormProject.fzgz }}<br></span>
<span> 联络员{{ dataFormProject.lly }}<br></span>
<span> 工程类别{{ dataFormProject.gclb }}<br></span>
<!-- <span> 施工地点{{ dataFormProject.sgdd }}<br></span>-->
<span> 年份{{ dataFormProject.projectYear }}<br></span>
<span> 开工时间{{ dataFormProject.projectStart ==null?"":dataFormProject.projectStart}}<br></span>
<span> 竣工时间{{ dataFormProject.projectEnd ==null?"":dataFormProject.projectEnd}}<br></span>
<span> 施工进度{{ dataFormProject.sgjd }}<br></span>
<span> 负责工长{{ dataFormProject.fzgz }}<br></span>
<span> 联络员{{ dataFormProject.lly }}<br></span>
<span> 工程类别{{ dataFormProject.gclb }}<br></span>
</div>
<div v-else style="text-align: center;font-size: 12px;margin-top: 4%">暂无</div>
</div>

View File

@ -31,299 +31,71 @@
<div style="text-align: left;padding: 2% 0 1% 2%;display: flex"><span style="font:bold 14px 新宋体;">基本信息</span>
</div>
<div style="display: flex;font-size: 12px">
<!-- width: 60%-->
<!-- <div style="border: 2px solid #ff0000">-->
<!-- <div class="jbDiv">-->
<!-- <div style="width: 33%">-->
<!-- <span style="width: 100%;padding-top: 1%">1.姓名</span>-->
<!-- <input style="width: 100%;" disabled placeholder=" " v-model="dataForm.name"></input>-->
<!-- </div>-->
<!-- <div style="width: 33%">-->
<!-- <span style="width: 100%;padding-top: 1%">2.性别</span>-->
<!-- <input style="width: 100%;" placeholder=" " disabled v-model="sex"></input>-->
<!-- </div>-->
<!-- <div style="width: 34%">-->
<!-- <span style="width: 100%;padding-top: 1%">3.排序</span>-->
<!-- <input style="width: 100%;" disabled placeholder=" " v-model="dataForm.orderNum"></input>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="jbDiv">-->
<!-- <div style="width: 33%">-->
<!-- <span style="width: 100%;padding-top: 1%">4.是否保险</span>-->
<!-- <input required style="width: 100%;" placeholder=" " disabled v-model="bx"></input>-->
<!-- </div>-->
<!-- <div style="width: 33%">-->
<!-- <span style="width: 100%;padding-top: 1%">5.出生年月</span>-->
<!-- <input style="width: 100%;" disabled placeholder=" " v-model="dataForm.birthday"></input>-->
<!-- </div>-->
<!-- <div style="width: 34%">-->
<!-- <span style="width: 100%;padding-top: 1%">6.年龄</span>-->
<!-- <input style="width: 100%;" disabled placeholder=" " v-model="dataForm.age"></input>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="jbDiv">-->
<!-- <div style="width: 33%">-->
<!-- <span style="width: 100%;padding-top: 1%">7.身高(cm):</span>-->
<!-- <input style="width: 100%;" disabled placeholder=" " v-model="dataForm.height"></input>-->
<!-- </div>-->
<!-- <div style="width: 33%">-->
<!-- <span style="width: 100%;padding-top: 1%">8.体重(kg):</span>-->
<!-- <input style="width: 100%;" disabled placeholder=" " v-model="dataForm.weight"></input>-->
<!-- </div>-->
<!-- <div style="width: 34%">-->
<!-- <span style="width: 100%;padding-top: 1%">9.户籍:</span>-->
<!-- <input style="width: 100%;" disabled placeholder=" " v-model="dataForm.register"></input>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="jbDiv">-->
<!-- <div style="width: 66%">-->
<!-- <span style="width: 100%;padding-top: 1%">10.电话:</span>-->
<!-- <input style="width: 100%;" disabled placeholder=" " v-model="dataForm.phone"></input>-->
<!-- </div>-->
<!-- <div style="width: 34%">-->
<!-- <span style="width: 100%;padding-top: 1%">11.文化程度:</span>-->
<!-- <input style="width: 100%;" disabled placeholder=" " v-model="dataForm.education"></input>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="jbDiv">-->
<!-- <div style="width: 100%">-->
<!-- <span style="width: 100%;padding-top: 1%">12.现住址:</span>-->
<!-- <input style="width: 100%;" disabled placeholder=" " v-model="dataForm.addr"></input>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="jbDiv">-->
<!-- <div style="width: 33%">-->
<!-- <span style="width:100%;padding-top: 1%">13.成本折算系数:</span>-->
<!-- <input style="width: 100%;" disabled placeholder=" " v-model="dataForm.cbzsxs"></input>-->
<!-- </div>-->
<!-- <div style="width: 33%">-->
<!-- <span style="width: 100%;padding-top: 1%">14.位置:</span>-->
<!-- <input style="width: 100%;" placeholder=" " disabled v-model="wz"></input>-->
<!-- </div>-->
<!-- <div style="width: 34%">-->
<!-- <span style="width: 100%;padding-top: 1%">15.职位:</span>-->
<!-- <input style="width: 100%;" placeholder=" " disabled v-model="zw"></input>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="jbDiv">-->
<!-- <div style="width: 33%">-->
<!-- <span style="width: 100%;padding-top: 1%" >16.工种:</span>-->
<!-- <input style="width: 100%;" disabled placeholder=" " v-model="gz"></input>-->
<!-- </div>-->
<!-- <div style="width: 33%">-->
<!-- <span style="width: 100%;padding-top: 1%">17.应急联系人:</span>-->
<!-- <input style="width: 100%;" disabled placeholder=" " v-model="dataForm.urgentName"></input>-->
<!-- </div>-->
<!-- <div style="width: 34%">-->
<!-- <span style="width: 100%;padding-top: 1%">18.与本人关系:</span>-->
<!-- <input style="width: 100%;" disabled placeholder=" " v-model="dataForm.urgentRelation"></input>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="jbDiv">-->
<!-- <span style="width: 100%;padding-top: 1%">19.应急联系电话:</span>-->
<!-- <input style="width: 100%;" disabled placeholder=" " v-model="dataForm.urgentPhone"></input>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div>-->
<!-- <div class="jbDiv">-->
<!-- <div style="width: 33%">-->
<!-- <span style="width: 15%;padding-top: 1%">1.姓名</span>-->
<!-- <span style="width: 50%;">{{dataForm.name}}</span>-->
<!-- </div>-->
<!-- <div style="width: 33%">-->
<!-- <span style="width: 15%;padding-top: 1%">2.性别</span>-->
<!-- <span style="width: 35%;">{{sex}}</span>-->
<!-- </div>-->
<!-- <div style="width: 34%">-->
<!-- <span style="width: 28%;padding-top: 1%">3.排序</span>-->
<!-- <span style="width: 22%;">{{dataForm.orderNum}}</span>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="jbDiv">-->
<!-- <div style="width: 33%">-->
<!-- <span style="width: 50%;padding-top: 1%">4.是否保险</span>-->
<!-- <span>{{bx}}</span>-->
<!-- </div>-->
<!-- <div style="width: 33%">-->
<!-- <span style="width: 15%;padding-top: 1%">5.出生年月</span>-->
<!-- <span style="width: 50%;"> {{dataForm.birthday}}</span>-->
<!-- </div>-->
<!-- <div style="width: 34%">-->
<!-- <span style="width: 15%;padding-top: 1%">6.年龄</span>-->
<!-- <span style="width: 35%;"> {{dataForm.age}}</span>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="jbDiv">-->
<!-- <div style="width: 33%">-->
<!-- <span style="width: 24%;padding-top: 1%">7.身高(cm)</span>-->
<!-- <span style="width: 26%;">{{dataForm.height}} </span>-->
<!-- </div>-->
<!-- <div style="width: 33%">-->
<!-- <span style="width: 24%;padding-top: 1%">8.体重(kg)</span>-->
<!-- <span style="width: 26%;"> {{dataForm.weight}}</span>-->
<!-- </div>-->
<!-- <div style="width: 34%">-->
<!-- <span style="width: 18%;padding-top: 1%">9.户籍</span>-->
<!-- <span style="width: 50%;">{{dataForm.register}} </span>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="jbDiv">-->
<!-- <div style="width: 66%">-->
<!-- <span style="width: 15%;padding-top: 1%">10.电话</span>-->
<!-- <span style="width: 85%;">{{dataForm.phone}}</span>-->
<!-- </div>-->
<!-- <div style="width: 34%">-->
<!-- <span style="width: 24%;padding-top: 1%">11.文化程度</span>-->
<!-- <span style="width: 26%;">{{dataForm.education}}</span>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="jbDiv">-->
<!-- <div style="width: 100%">-->
<!-- <span style="width: 30%;padding-top: 1%">12.现住址</span>-->
<!-- <span style="width: 70%;">{{dataForm.addr}}</span>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="jbDiv">-->
<!-- <div style="width: 33%">-->
<!-- <span style="width:60%;padding-top: 1%">13.成本折算系数:</span>-->
<!-- <span></span>-->
<!-- <input style="width: 20%;" disabled placeholder=" " v-model="dataForm.cbzsxs"></input>-->
<!-- </div>-->
<!-- <div style="width: 33%">-->
<!-- <span style="width: 30%;padding-top: 1%">14.位置:</span>-->
<!-- <input style="width: 35%;" placeholder=" " disabled v-model="wz"></input>-->
<!-- </div>-->
<!-- <div style="width: 34%">-->
<!-- <span style="width: 30%;padding-top: 1%">15.职位:</span>-->
<!-- <input style="width: 35%;" placeholder=" " disabled v-model="zw"></input>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="jbDiv">-->
<!-- <div style="width: 33%">-->
<!-- <span style="width: 18%;padding-top: 1%" >16.工种:</span>-->
<!-- <input style="width: 32%;" disabled placeholder=" " v-model="gz"></input>-->
<!-- </div>-->
<!-- <div style="width: 33%">-->
<!-- <span style="width: 28%;padding-top: 1%">17.应急联系人:</span>-->
<!-- <input style="width: 22%;" disabled placeholder=" " v-model="dataForm.urgentName"></input>-->
<!-- </div>-->
<!-- <div style="width: 34%">-->
<!-- <span style="width: 28%;padding-top: 1%">18.与本人关系:</span>-->
<!-- <input style="width: 22%;" disabled placeholder=" " v-model="dataForm.urgentRelation"></input>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="jbDiv">-->
<!-- <span style="width: 30%">19.应急联系电话:</span>-->
<!-- <span style="width: 70%;"> {{dataForm.urgentPhone}}</span>-->
<!-- </div>-->
<!-- </div>-->
<div>
<div class="jbDiv">
<span style="width: 15%;padding-top: 1%">1.姓名:</span>
<input style="width: 35%;" disabled placeholder=" " v-model="dataForm.name"></input>
<span style="width: 15%;padding-top: 1%">2.性别:</span>
<input style="width: 35%;" placeholder=" " disabled v-model="sex"></input>
<input style="width: 85%;" disabled placeholder=" " v-model="dataForm.name"></input>
<!-- <span style="width: 15%;padding-top: 1%">2.性别:</span>-->
<!-- <input style="width: 35%;" placeholder=" " disabled v-model="sex"></input>-->
</div>
<div class="jbDiv">
<span style="width: 15%;padding-top: 1%">3.电话:</span>
<span style="width: 15%;padding-top: 1%">2.电话:</span>
<input style="width: 85%;" disabled placeholder=" " v-model="dataForm.phone"></input>
</div>
<div class="jbDiv">
<span style="width: 20%;padding-top: 1%">4.现住址:</span>
<span style="width: 20%;padding-top: 1%">3.现住址:</span>
<input style="width: 80%;" disabled placeholder=" " v-model="dataForm.addr"></input>
</div>
<div class="jbDiv">
<span style="width: 24%;padding-top: 1%">5.出生年月:</span>
<span style="width: 24%;padding-top: 1%">4.出生年月:</span>
<input style="width: 26%;" disabled placeholder=" " v-model="dataForm.birthday"></input>
<span style="width: 15%;padding-top: 1%">6.年龄:</span>
<span style="width: 15%;padding-top: 1%">5.年龄:</span>
<input style="width: 35%;" disabled placeholder=" " v-model="dataForm.age"></input>
</div>
<div class="jbDiv">
<span style="width: 24%;padding-top: 1%">7.身高(cm):</span>
<span style="width: 24%;padding-top: 1%">6.身高(cm):</span>
<input style="width: 26%;" disabled placeholder=" " v-model="dataForm.height"></input>
<span style="width: 24%;padding-top: 1%">8.体重(kg):</span>
<span style="width: 24%;padding-top: 1%">7.体重(kg):</span>
<input style="width: 26%;" disabled placeholder=" " v-model="dataForm.weight"></input>
</div>
<div class="jbDiv">
<span style="width: 24%;padding-top: 1%">9.文化程度:</span>
<span style="width: 24%;padding-top: 1%">8.文化程度:</span>
<input style="width: 26%;" disabled placeholder=" " v-model="dataForm.education"></input>
<span style="width: 18%;padding-top: 1%">10.户籍:</span>
<span style="width: 18%;padding-top: 1%">9.户籍:</span>
<input style="width: 32%;" disabled placeholder=" " v-model="dataForm.register"></input>
</div>
<div class="jbDiv">
<span style="width: 15%;padding-top: 1%">11.位置:</span>
<span style="width: 15%;padding-top: 1%">10.位置:</span>
<input style="width: 35%;" placeholder=" " disabled v-model="wz"></input>
<span style="width: 15%;padding-top: 1%">12.职位:</span>
<span style="width: 15%;padding-top: 1%">11.职位:</span>
<input style="width: 35%;" placeholder=" " disabled v-model="zw"></input>
</div>
<div class="jbDiv">
<span style="width: 18%;padding-top: 1%" >13.工种:</span>
<input style="width: 32%;" disabled placeholder=" " v-model="gz"></input>
<span style="width:30%;padding-top: 1%">14.成本折算系数:</span>
<!-- <span style="width: 18%;padding-top: 1%" >13.工种:</span>-->
<!-- <input style="width: 32%;" disabled placeholder=" " v-model="gz"></input>-->
<span style="width: 15%;padding-top: 1%">12.性别:</span>
<input style="width: 35%;" placeholder=" " disabled v-model="sex"></input>
<span style="width:30%;padding-top: 1%">13.成本折算系数:</span>
<input style="width: 20%;" disabled placeholder=" " v-model="dataForm.cbzsxs"></input>
</div>
<div class="jbDiv">
<span style="width: 28%;padding-top: 1%">15.应急联系人:</span>
<span style="width: 28%;padding-top: 1%">14.应急联系人:</span>
<input style="width: 22%;" disabled placeholder=" " v-model="dataForm.urgentName"></input>
<span style="width: 28%;padding-top: 1%">16.与本人关系:</span>
<span style="width: 28%;padding-top: 1%">15.与本人关系:</span>
<input style="width: 22%;" disabled placeholder=" " v-model="dataForm.urgentRelation"></input>
</div>
<div class="jbDiv">
<span style="width: 28%;padding-top: 1%">17.是否保险:</span>
<span style="width: 28%;padding-top: 1%">16.是否保险:</span>
<input required style="width: 22%;" placeholder=" " disabled v-model="bx"></input>
<span style="width: 28%;padding-top: 1%">18.排序:</span>
<span style="width: 28%;padding-top: 1%">17.排序:</span>
<input style="width: 22%;" disabled placeholder=" " v-model="dataForm.orderNum"></input>
</div>
<div class="jbDiv">
<span style="width: 30%;padding-top: 1%">19.应急联系电话:</span>
<span style="width: 30%;padding-top: 1%">18.应急联系电话:</span>
<input style="width: 70%;" disabled placeholder=" " v-model="dataForm.urgentPhone"></input>
</div>
</div>
<!-- <div class="sc" style="width: 40%;">
<input style="width: 20vh;height: 24.6vh" v-if="files.length === 0" disabled
placeholder="小二寸照片(点击上传)"></input>
<div style="text-align: center;">
<div>
<div v-if="files.length > 0" style="text-align: center;width: 20vh;height: 24.6vh">
<block v-for="(item,index) in files" :key="index">
<div @click.stop="predivImage($event,1)" :id="item">
<image style="width: 20vh;height: 24.6vh;" :src="item"/>
</div>
</block>
</div>
</div>
</div>
</div>-->
</div>
<!-- <div>
<div class="jbDiv">
<span style="width: 26%;padding-top: 1%">11.应急联系人:</span>
<input style="width: 24%;" disabled placeholder=" " v-model="dataForm.urgentName"></input>
<span style="width: 26%;padding-top: 1%">12.与本人关系:</span>
<input style="width: 24%;" disabled placeholder=" " v-model="dataForm.urgentRelation"></input>
</div>
<div class="jbDiv">
<span style="width: 30%;padding-top: 1%">13.应急联系电话:</span>
<input style="width: 70%;" disabled placeholder=" " v-model="dataForm.urgentPhone"></input>
</div>-->
<!-- <div class="jbDiv">
<span style="width: 15%;padding-top: 1%">11.位置:</span>
<input style="width: 12%;" placeholder=" " disabled v-model="wz"></input>
<span style="width: 15%;padding-top: 1%">12.职位:</span>
<input style="width: 12%;" placeholder=" " disabled v-model="zw"></input>
<span style="width: 32%;padding-top: 1%">13.成本折算系数:</span>
<input style="width: 14%;" disabled placeholder=" " v-model="dataForm.cbzsxs"></input>
</div>
</div>-->
<div v-if="viewShow">
<div>
<div style="text-align: left;padding: 10% 0 1% 2%;font:bold 14px 新宋体">出勤记录</div>
@ -356,255 +128,24 @@
{{item.remark ? item.remark : ''}}
</td>
</tr>
<!-- <tr style="display: flex;margin-top: 0%">-->
<!-- <td class="tableCQXH">2</td>-->
<!-- <td class="tableCQTd">-->
<!-- <input disabled placeholder=" " v-model="dataFroMCQ2.dateDay"></input>-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ2.statusDay ? dataFroMCQ2.statusDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ2.fixDay ? dataFroMCQ2.fixDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ2.outWorkDay ? dataFroMCQ2.outWorkDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ2.salaried ? dataFroMCQ2.salaried : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQBZ">-->
<!-- {{dataFroMCQ2.remark ? dataFroMCQ2.remark : ''}}-->
<!-- </td>-->
<!-- </tr>-->
<!-- <tr style="display: flex;margin-top: 0%">-->
<!-- <td class="tableCQXH">3</td>-->
<!-- <td class="tableCQTd">-->
<!-- <input disabled placeholder=" " v-model="dataFroMCQ3.dateDay"></input>-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ3.statusDay ? dataFroMCQ3.statusDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ3.fixDay ? dataFroMCQ3.fixDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ3.outWorkDay ? dataFroMCQ3.outWorkDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ3.salaried ? dataFroMCQ3.salaried : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQBZ">-->
<!-- {{dataFroMCQ3.remark ? dataFroMCQ3.remark : ''}}-->
<!-- </td>-->
<!-- </tr>-->
<!-- <tr style="display: flex;margin-top: 0%">-->
<!-- <td class="tableCQXH">4</td>-->
<!-- <td class="tableCQTd">-->
<!-- <input disabled placeholder=" " v-model="dataFroMCQ4.dateDay"></input>-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ4.statusDay ? dataFroMCQ4.statusDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ4.fixDay ? dataFroMCQ4.fixDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ4.outWorkDay ? dataFroMCQ4.outWorkDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ4.salaried ? dataFroMCQ4.salaried : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQBZ">-->
<!-- {{dataFroMCQ4.remark ? dataFroMCQ4.remark : ''}}-->
<!-- </td>-->
<!-- </tr>-->
<!-- <tr style="display: flex;margin-top: 0%">-->
<!-- <td class="tableCQXH">5</td>-->
<!-- <td class="tableCQTd">-->
<!-- <input disabled placeholder=" " v-model="dataFroMCQ5.dateDay"></input>-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ5.statusDay ? dataFroMCQ5.statusDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ5.fixDay ? dataFroMCQ5.fixDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ5.outWorkDay ? dataFroMCQ5.outWorkDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ5.salaried ? dataFroMCQ5.salaried : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQBZ">-->
<!-- {{dataFroMCQ5.remark ? dataFroMCQ5.remark : ''}}-->
<!-- </td>-->
<!-- </tr>-->
<!-- <tr style="display: flex;margin-top: 0%">-->
<!-- <td class="tableCQXH">6</td>-->
<!-- <td class="tableCQTd">-->
<!-- <input disabled placeholder=" " v-model="dataFroMCQ6.dateDay"></input>-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ6.statusDay ? dataFroMCQ6.statusDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ6.fixDay ? dataFroMCQ6.fixDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ6.outWorkDay ? dataFroMCQ6.outWorkDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ6.salaried ? dataFroMCQ6.salaried : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQBZ">-->
<!-- {{dataFroMCQ6.remark ? dataFroMCQ6.remark : ''}}-->
<!-- </td>-->
<!-- </tr>-->
<!-- <tr style="display: flex;margin-top: 0%">-->
<!-- <td class="tableCQXH">7</td>-->
<!-- <td class="tableCQTd">-->
<!-- <input disabled placeholder=" " v-model="dataFroMCQ7.dateDay"></input>-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ7.statusDay ? dataFroMCQ7.statusDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ7.fixDay ? dataFroMCQ7.fixDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ7.outWorkDay ? dataFroMCQ7.outWorkDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ7.salaried ? dataFroMCQ7.salaried : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQBZ">-->
<!-- {{dataFroMCQ7.remark ? dataFroMCQ7.remark : ''}}-->
<!-- </td>-->
<!-- </tr>-->
<!-- <tr style="display: flex;margin-top: 0%">-->
<!-- <td class="tableCQXH">8</td>-->
<!-- <td class="tableCQTd">-->
<!-- <input disabled placeholder=" " v-model="dataFroMCQ8.dateDay"></input>-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ8.statusDay ? dataFroMCQ8.statusDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ8.fixDay ? dataFroMCQ8.fixDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ8.outWorkDay ? dataFroMCQ8.outWorkDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ8.salaried ? dataFroMCQ8.salaried : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQBZ">-->
<!-- {{dataFroMCQ8.remark ? dataFroMCQ8.remark : ''}}-->
<!-- </td>-->
<!-- </tr>-->
<!-- <tr style="display: flex;margin-top: 0%">-->
<!-- <td class="tableCQXH">9</td>-->
<!-- <td class="tableCQTd">-->
<!-- <input disabled placeholder=" " v-model="dataFroMCQ9.dateDay"></input>-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ9.statusDay ? dataFroMCQ9.statusDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ9.fixDay ? dataFroMCQ9.fixDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ9.outWorkDay ? dataFroMCQ9.outWorkDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ9.salaried ? dataFroMCQ9.salaried : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQBZ">-->
<!-- {{dataFroMCQ9.remark ? dataFroMCQ9.remark : ''}}-->
<!-- </td>-->
<!-- </tr>-->
<!-- <tr style="display: flex;margin-top: 0%">-->
<!-- <td class="tableCQXH">10</td>-->
<!-- <td class="tableCQTd">-->
<!-- <input disabled placeholder=" " v-model="dataFroMCQ10.dateDay"></input>-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ10.statusDay ? dataFroMCQ10.statusDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ10.fixDay ? dataFroMCQ10.fixDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ10.outWorkDay ? dataFroMCQ10.outWorkDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ10.salaried ? dataFroMCQ10.salaried : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQBZ">-->
<!-- {{dataFroMCQ10.remark ? dataFroMCQ10.remark : ''}}-->
<!-- </td>-->
<!-- </tr>-->
<!-- <tr style="display: flex;margin-top: 0%">-->
<!-- <td class="tableCQXH">11</td>-->
<!-- <td class="tableCQTd">-->
<!-- <input disabled placeholder=" " v-model="dataFroMCQ11.dateDay"></input>-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ11.statusDay ? dataFroMCQ11.statusDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ11.fixDay ? dataFroMCQ11.fixDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ11.outWorkDay ? dataFroMCQ11.outWorkDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ11.salaried ? dataFroMCQ11.salaried : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQBZ">-->
<!-- {{dataFroMCQ11.remark ? dataFroMCQ11.remark : ''}}-->
<!-- </td>-->
<!-- </tr>-->
<!-- <tr style="display: flex;margin-top: 0%">-->
<!-- <td class="tableCQXH">12</td>-->
<!-- <td class="tableCQTd">-->
<!-- <input disabled placeholder=" " v-model="dataFroMCQ12.dateDay"></input>-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ12.statusDay ? dataFroMCQ12.statusDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ12.fixDay ? dataFroMCQ12.fixDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ12.outWorkDay ? dataFroMCQ12.outWorkDay : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQTd">-->
<!-- {{dataFroMCQ12.salaried ? dataFroMCQ12.salaried : ''}}-->
<!-- </td>-->
<!-- <td class="tableCQBZ">-->
<!-- {{dataFroMCQ12.remark ? dataFroMCQ12.remark : ''}}-->
<!-- </td>-->
<!-- </tr>-->
<!-- </table>-->
</div>
</div>
<div style="border-bottom: 2px solid #FF0000"></div>
<view class="paging" style="display: flex;justify-content: space-between;align-items: center;">
<view class="page_btn" >
<button type="button" v-if="frontPage" size="mini" style="width: 100%;height: 100%;background-color: #FF0000;color: white" @click="clickFront">上一页</button>
</view>
<view class="page_num">{{thisPages}} {{pages}}</view>
<view class="page_btn">
<button type="button" v-if="nextPage" size="mini" style="width: 100%;height: 100%;background-color: #FF0000;color: white" @click="clickNext">下一页</button>
</view>
</view>
</div>
<div v-if="viewShow">
<div style="padding-top: 10%">
<div style="text-align: left;padding: 5% 0 1% 2%;font:bold 14px 新宋体">
<div style="padding-top: 0%">
<div style="text-align: left;padding: 10% 0 1% 2%;font:bold 14px 新宋体">
工资账目与保险
</div>
<!-- <div v-if="dataForm.status === 0" style="text-align: left;padding: 5% 0 1% 2%;font:bold 14px 新宋体">-->
<!-- 工资账目与保险-->
<!-- </div>-->
<!-- <div v-else-if="dataForm.status === 1" style="text-align: left;padding: 5% 0 1% 2%;font:bold 14px 新宋体">-->
<!-- 工资账目与保险-->
<!-- </div>-->
<div v-if="gzList.length !== 0">
<div v-for="(item,index) in gzList" :key="index" style="font-size: 12px; border-top: 2px solid #FF0000;">
<!-- 横线-->
@ -619,16 +160,45 @@
}}</span>
</div>
<div style="margin-top: 6%">
<span style="width: 80%;">保险购买情况<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ item.insurance ? item.insurance : ' ' }}</span>
<span style="width: 80%;">保险购买情况</span>
<div style="padding-left: 5%;">
<div v-html="bxgmqk">
{{cutbx(item.insurance)}}
</div>
</div>
</div>
<div style="margin-top: 6%">
<span style="width: 50%;">工资账目</span>
</div>
<div style="margin-top: 2%">
<div style="margin-top: 2%">1.借款明细<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ item.borrowingDetails ? item.borrowingDetails : ' ' }}</div>
<div style="margin-top: 2%">2.工资标准计算方式<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ item.gzjsfs ? item.gzjsfs : ' ' }}</div>
<div style="margin-top: 2%">3.工资结清及时间节点<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ item.gzjqjsjjd ? item.gzjqjsjjd : ' ' }}</div>
<div style="margin-top: 2%">4.备注<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ item.remark ? item.remark : ' ' }}</div>
<div style="margin-top: 2%">1.借款明细
<div style="padding-left: 5%;">
<div v-html="jkxxInfo">
{{cutjk(item.borrowingDetails)}}
</div>
</div>
</div>
<div style="margin-top: 2%">2.工资标准计算方式
<div style="padding-left: 5%;">
<div v-html="gzbzjsfs">
{{cutgzbz(item.gzjsfs)}}
</div>
</div>
</div>
<div style="margin-top: 2%">3.工资结清及时间节点
<div style="padding-left: 5%;">
<div v-html="gzjqjsjjd">
{{cutjq(item.gzjqjsjjd)}}
</div>
</div>
</div>
<div style="margin-top: 2%">4.备注
<div style="padding-left: 5%;">
<div v-html="gzzmbz">
{{cutbz(item.remark)}}
</div>
</div>
</div>
</div>
</div>
</div>
@ -639,49 +209,6 @@
</div>
</div>
</div>
<!--********************************************** 身份证 ************************************************-->
<!-- <div v-if="viewShow">
<div v-if="dataForm.status === 1"
style="text-align: left;padding: 10% 0 1% 2%;display: flex">
<span style="font: bold 14px 新宋体;">身份证</span>
</div>
<div v-else-if="dataForm.status === 0"
style="text-align: left;padding: 10% 0 1% 2%;display: flex;">
<span style="font: bold 14px 新宋体;">身份证</span>
</div>
<div style="border-bottom: 2px solid #FF0000"></div>
<div>
&lt;!&ndash; 身份证正面&ndash;&gt;
<div style="padding: 2vh 0 0 4vh">
<span style="text-align: center;padding-left: 30%">身份证正面照</span>
<div style="width: 42.8vh;height: 27vh">
<div
style="text-align: center;border-radius: 2px;border: 1px solid #FF0000;width: 43.2vh;height: 27.4vh">
<block v-for="(item,index) in filesPositive" :key="index">
<div @click.stop="predivImage($event,2)" :id="item">
<image class="upload_img" :src="item"/>
</div>
</block>
</div>
</div>
</div>
&lt;!&ndash; 身份证背面&ndash;&gt;
<div style="padding: 10vh 0 0 4vh">
<span style="text-align: center;padding-left: 30%">身份证背部照</span>
<div style="width: 42.8vh;height: 27vh">
<div
style="text-align: center;border-radius: 2px;border: 1px solid #FF0000;width: 43.2vh;height: 27.4vh">
<block v-for="(item,index) in filesBack" :key="index">
<div @click.stop="predivImage($event,3)" :id="item">
<image class="upload_img" :src="item"/>
</div>
</block>
</div>
</div>
</div>
</div>
<div style="border-bottom: 2px solid #FF0000;margin-top: 5%"></div>
</div>-->
</div>
</div>
</div>
@ -707,6 +234,11 @@ export default {
bx: "否",
sex: "",
xg: false,
bxgmqk: "",
jkxxInfo: "",
gzbzjsfs: "",
gzjqjsjjd: "",
gzzmbz: "",
fileList: [],
urls: [],
systemTime: '',//
@ -722,6 +254,13 @@ export default {
pickerValueArrayWZ: [],//
pickerValueArrayZW: [],//
pickerValueArraySex: [],//
//
frontPage: false,// truefalse
nextPage: false,// truefalse
pages: 0,//
thisPages: 1,//
rows: 10,//
total: 0,//
//
dataForm: {
@ -875,6 +414,83 @@ export default {
}
},
/********************************** 文件上传 ***************************************/
cutbx(cellValue){
let ret = "无";
if(cellValue!=null){
ret = cellValue.replaceAll(/\n/g,'<br/>')
}
this.bxgmqk = ret;
},
cutjk(cellValue){
let ret = "无";
if(cellValue!=null){
ret = cellValue.replaceAll(/\n/g,'<br/>')
}
this.jkxxInfo = ret;
},
cutgzbz(cellValue){
let ret = "无";
if(cellValue!=null){
ret = cellValue.replaceAll(/\n/g,'<br/>')
}
this.gzbzjsfs = ret;
},
cutjq(cellValue){
let ret = "无";
if(cellValue!=null){
ret = cellValue.replaceAll(/\n/g,'<br/>')
}
this.gzjqjsjjd = ret;
},
cutbz(cellValue){
let ret = "无";
if(cellValue!=null){
ret = cellValue.replaceAll(/\n/g,'<br/>')
}
this.gzzmbz = ret;
},
//
clickNext() {
this.thisPages = this.thisPages + 1;
this.searchCq();
},
//
clickFront() {
this.thisPages = this.thisPages - 1;
this.searchCq();
},
//
searchCq(){
this.$http.request({
url: this.$http.adornUrl('/business/businessworkercq/list'),
method: 'get',
params: this.$http.adornParams({
'userId': this.id,
"page": this.thisPages,
"limit": this.rows,
})
}).then(({data}) => {
if (data && data.code === 0) {
this.dataCQList = data.page.list;
this.total = data.page.totalCount;
this.pages = data.page.totalPage;
if(this.pages > 1){
this.frontPage = true
this.nextPage = true
}else{
this.frontPage = false
this.nextPage = false
}
if(data.page.currPage === data.page.totalPage){
this.nextPage = false
}
if(data.page.currPage === 1){
this.frontPage = false
}
}
})
}
},
onLoad(params) {
this.status = params.status;
@ -915,6 +531,15 @@ export default {
this.viewShow = false;
this.viewShow = isAuth("business:businessworkergz:list")
this.dataForm.status = 0;//
//
this.frontPage = false;// truefalse
this.nextPage = false;// truefalse
this.pages = 0;//
this.thisPages = 1;//
this.rows = 10;//
this.total = 0;//
this.title = params.title;
wx.setNavigationBarTitle({
title: params.title
@ -1035,75 +660,24 @@ export default {
//console.log(this.gzList);
})
//
this.$http.request({
url: this.$http.adornUrl('/business/businessworkercq/list'),
method: 'get',
params: this.$http.adornParams({
'userId': this.id,
})
}).then(({data}) => {
if (data && data.code === 0) {
this.dataCQList = data.page
// data.page.forEach((item, index) => {
// if (index === 0) {
// this.dataFroMCQ1 = {
// ...item
// };
// } else if (index === 1) {
// this.dataFroMCQ2 = {
// ...item
// };
// } else if (index === 2) {
// this.dataFroMCQ3 = {
// ...item
// };
// } else if (index === 3) {
// this.dataFroMCQ4 = {
// ...item
// };
// } else if (index === 4) {
// this.dataFroMCQ5 = {
// ...item
// };
// } else if (index === 5) {
// this.dataFroMCQ6 = {
// ...item
// };
// } else if (index === 6) {
// this.dataFroMCQ7 = {
// ...item
// };
// } else if (index === 7) {
// this.dataFroMCQ8 = {
// ...item
// };
// } else if (index === 8) {
// this.dataFroMCQ9 = {
// ...item
// };
// } else if (index === 9) {
// this.dataFroMCQ10 = {
// ...item
// };
// } else if (index === 10) {
// this.dataFroMCQ11 = {
// ...item
// };
// } else if (index === 11) {
// this.dataFroMCQ12 = {
// ...item
// };
// }
// })
}
})
this.searchCq();
// this.$http.request({
// url: this.$http.adornUrl('/business/businessworkercq/list'),
// method: 'get',
// params: this.$http.adornParams({
// 'userId': this.id,
// })
// }).then(({data}) => {
// if (data && data.code === 0) {
// this.dataCQList = data.page
// }
// })
}
} else {
this.closePage()
}
})
},
onUnload() {
}
}
@ -1205,4 +779,31 @@ export default {
.TBclass > tr > td{
border: 1px solid #efeded;
}
.paging{
width: 100%;
height: 80rpx;
font-size: 32rpx;
font-family: "PingFangSC";
color: #c79b4a;
line-height: 36rpx;
text-align: center;
}
.paging .page_btn{
width: 140rpx;
height: 60rpx;
font-size: 32rpx;
font-family: "PingFangSC";
color: #c79b4a;
}
.page_num{
font-size: 24rpx;
font-family: "PingFangSC";
/*color: #c79b4a;*/
color: #000;
/*margin: auto 10%;*/
}
</style>

View File

@ -35,7 +35,8 @@
<div style="width: 80%;padding-left: 10%;font-size: 12px">
<div class="showDiv"></div>
<div style="display: flex; height: 30px" @click="showPicker(1)">
<div style="text-align: left;padding: 2% 0 1% 4%;width:38%">1&nbsp;位置(all)</div>
<!-- <div style="text-align: left;padding: 2% 0 1% 4%;width:38%">1&nbsp;位置(all)</div>-->
<div style="text-align: left;padding: 2% 0 1% 4%;width:38%">1&nbsp;职位(all)</div>
<div style="width: 46%; padding-top: 1%">
<input disabled style="text-align: left" placeholder=" " v-model="wz"></input>
</div>
@ -49,7 +50,8 @@
<div class="showDiv"></div>
<div style="display: flex; height: 30px" @click="showPicker(2)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 38%">2&nbsp;职位(all)</div>
<!-- <div style="text-align: left;padding: 2% 0 1% 4%;width: 38%">2&nbsp;职位(all)</div>-->
<div style="text-align: left;padding: 2% 0 1% 4%;width: 38%">2&nbsp;岗位(all)</div>
<div style="width: 46%; padding-top: 1%">
<input disabled style="text-align: left" placeholder=" " v-model="zw"></input>
</div>
@ -61,20 +63,20 @@
@onConfirm="pickerConfirmZW"></mpvue-picker>
<div class="showDiv"></div>
<div style="display: flex;height: 30px" @click="showPicker(3)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 38%">3&nbsp;工种(all)</div>
<div style="width: 46%; padding-top: 1%">
<input disabled style="text-align: left" placeholder=" " v-model="gz"></input>
</div>
<div class="arrowOpen"></div>
</div>
<mpvue-picker v-if="isShow" ref="mpvuePickerGZ"
:pickerValueArray="pickerValueArrayGZ"
:pickerValueDefault='pickerValueDefaultGZ'
@onConfirm="pickerConfirmGZ"></mpvue-picker>
<div class="showDiv"></div>
<!-- <div style="display: flex;height: 30px" @click="showPicker(3)">-->
<!-- <div style="text-align: left;padding: 2% 0 1% 4%;width: 38%">3&nbsp;工种(all)</div>-->
<!-- <div style="width: 46%; padding-top: 1%">-->
<!-- <input disabled style="text-align: left" placeholder=" " v-model="gz"></input>-->
<!-- </div>-->
<!-- <div class="arrowOpen"></div>-->
<!-- </div>-->
<!-- <mpvue-picker v-if="isShow" ref="mpvuePickerGZ"-->
<!-- :pickerValueArray="pickerValueArrayGZ"-->
<!-- :pickerValueDefault='pickerValueDefaultGZ'-->
<!-- @onConfirm="pickerConfirmGZ"></mpvue-picker>-->
<!-- <div class="showDiv"></div>-->
<div style="display: flex; height: 30px" @click="showPicker(5)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 38%">4&nbsp;是否保险(all)</div>
<div style="text-align: left;padding: 2% 0 1% 4%;width: 38%">3&nbsp;是否保险(all)</div>
<div style="width: 46%; padding-top: 1%">
<input disabled style="text-align: left" placeholder=" " v-model="bx"></input>
</div>
@ -86,7 +88,7 @@
@onConfirm="pickerConfirmBX"></mpvue-picker>
<div class="showDiv"></div>
<div style="display: flex; height: 30px">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">5&nbsp;关键字(all)</div>
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">4&nbsp;关键字(all)</div>
<div style="width: 40%; padding-top: 1%">
<input v-model="gjz" @input="searchList"></input>
</div>
@ -103,13 +105,13 @@
<div>
<tr class="th-row" style="display: flex;font-size: 12px;border: 2px solid #FF0000;font-weight: bold">
<td class="trTd" style="width: 10%;text-align: center">序号</td>
<td class="trTd" style="width: 15%;text-align: center">姓名</td>
<td class="trTd" style="width: 45%;text-align: center">姓名</td>
<!-- <td class="trTd" style="width: 16%;text-align: center">位置</td>-->
<td class="trTd" style="width: 30%;text-align: center"></td>
<td class="trTd" style="width: 20%;text-align: center">工种</td>
<td class="trTd" style="width: 30%;text-align: center"></td>
<!-- <td class="trTd" style="width: 20%;text-align: center">工种</td>-->
<!-- <td class="trTd" style="width: 12%;text-align: center">入职时间</td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center">年龄</td>-->
<td class="trTd" style="width: 10%;text-align: center">保险</td>
<!-- <td class="trTd" style="width: 10%;text-align: center">保险</td>-->
<td class="trTd" style="width: 15%;text-align: center">操作</td>
</tr>
</div>
@ -117,14 +119,14 @@
<!-- <tr v-if="item.positionId==148" class="td-row" style="display: flex;font-size: 12px; background-color: #e3e3e3">-->
<tr v-if="item.positionId==148" class="td-row" style="display: flex;font-size: 12px;">
<td class="trTd" style="width: 10%;text-align: center">{{ indexList + 1 }}</td>
<td class="trTd" style="width: 15%;text-align: center">{{ item.name }}</td>
<td class="trTd" style="width: 45%;text-align: center">{{ item.name }}</td>
<!-- <td class="trTd" style="width: 16%;text-align: center">{{ item.position === null ? '暂无' : item.position }}</td>-->
<td class="trTd" style="width: 30%;text-align: center">{{ item.worker === null ? '暂无' : item.worker }}</td>
<td class="trTd" style="width: 20%;text-align: center">{{ item.job === null ? '暂无' : item.job }}</td>
<!-- <td class="trTd" style="width: 20%;text-align: center">{{ item.job === null ? '暂无' : item.job }}</td>-->
<!-- <td class="trTd" style="width: 12%;text-align: center">{{ item.startTime === null ? '暂无' : item.startTime }}</td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center">{{ item.age === null ? '暂无' : item.age }}</td>-->
<td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>
<td class="trTd" style="width: 10%;text-align: center" v-else></td>
<!-- <td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center" v-else></td>-->
<td class="trTd" style="width: 15%">
<span v-if="infoShow" @click="addEdit('/pages/businesssearchbyry/addEdit/main?status=0&&title=人员信息-在职-'+item.name+'&&id='+item.userId)">详情</span>
</td>
@ -132,28 +134,28 @@
<!-- <tr v-else-if="item.positionId==149" class="td-row" style="display: flex;font-size: 12px; background-color: #C9C9C9">-->
<tr v-else-if="item.positionId==149" class="td-row" style="display: flex;font-size: 12px;">
<td class="trTd" style="width: 10%;text-align: center">{{ indexList + 1 }}</td>
<td class="trTd" style="width: 15%;text-align: center">{{ item.name }}</td>
<td class="trTd" style="width: 45%;text-align: center">{{ item.name }}</td>
<!-- <td class="trTd" style="width: 16%;text-align: center">{{ item.position === null ? '暂无' : item.position }}</td>-->
<td class="trTd" style="width: 30%;text-align: center">{{ item.worker === null ? '暂无' : item.worker }}</td>
<td class="trTd" style="width: 20%;text-align: center">{{ item.job === null ? '暂无' : item.job }}</td>
<!-- <td class="trTd" style="width: 20%;text-align: center">{{ item.job === null ? '暂无' : item.job }}</td>-->
<!-- <td class="trTd" style="width: 12%;text-align: center">{{ item.startTime === null ? '暂无' : item.startTime }}</td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center">{{ item.age === null ? '暂无' : item.age }}</td>-->
<td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>
<td class="trTd" style="width: 10%;text-align: center" v-else></td>
<!-- <td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center" v-else></td>-->
<td class="trTd" style="width: 15%">
<span v-if="infoShow" @click="addEdit('/pages/businesssearchbyry/addEdit/main?status=0&&title=人员信息-在职-'+item.name+'&&id='+item.userId)">详情</span>
</td>
</tr>
<tr v-else-if="item.positionId==152" class="td-row" style="display: flex;font-size: 12px; background-color: #e3e3e3">
<td class="trTd" style="width: 10%;text-align: center">{{ indexList + 1 }}</td>
<td class="trTd" style="width: 15%;text-align: center">{{ item.name }}</td>
<td class="trTd" style="width: 45%;text-align: center">{{ item.name }}</td>
<!-- <td class="trTd" style="width: 16%;text-align: center">{{ item.position === null ? '暂无' : item.position }}</td>-->
<td class="trTd" style="width: 30%;text-align: center">{{ item.worker === null ? '暂无' : item.worker }}</td>
<td class="trTd" style="width: 20%;text-align: center">{{ item.job === null ? '暂无' : item.job }}</td>
<!-- <td class="trTd" style="width: 20%;text-align: center">{{ item.job === null ? '暂无' : item.job }}</td>-->
<!-- <td class="trTd" style="width: 12%;text-align: center">{{ item.startTime === null ? '暂无' : item.startTime }}</td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center">{{ item.age === null ? '暂无' : item.age }}</td>-->
<td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>
<td class="trTd" style="width: 10%;text-align: center" v-else></td>
<!-- <td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center" v-else></td>-->
<td class="trTd" style="width: 15%">
<span v-if="infoShow" @click="addEdit('/pages/businesssearchbyry/addEdit/main?status=0&&title=人员信息-在职-'+item.name+'&&id='+item.userId)">详情</span>
</td>
@ -161,42 +163,42 @@
<!-- <tr v-else-if="item.positionId==150" class="td-row" style="display: flex;font-size: 12px; background-color: #aaaaaa">-->
<tr v-else-if="item.positionId==150" class="td-row" style="display: flex;font-size: 12px;">
<td class="trTd" style="width: 10%;text-align: center">{{ indexList + 1 }}</td>
<td class="trTd" style="width: 15%;text-align: center">{{ item.name }}</td>
<td class="trTd" style="width: 45%;text-align: center">{{ item.name }}</td>
<!-- <td class="trTd" style="width: 16%;text-align: center">{{ item.position === null ? '暂无' : item.position }}</td>-->
<td class="trTd" style="width: 30%;text-align: center">{{ item.worker === null ? '暂无' : item.worker }}</td>
<td class="trTd" style="width: 20%;text-align: center">{{ item.job === null ? '暂无' : item.job }}</td>
<!-- <td class="trTd" style="width: 20%;text-align: center">{{ item.job === null ? '暂无' : item.job }}</td>-->
<!-- <td class="trTd" style="width: 12%;text-align: center">{{ item.startTime === null ? '暂无' : item.startTime }}</td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center">{{ item.age === null ? '暂无' : item.age }}</td>-->
<td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>
<td class="trTd" style="width: 10%;text-align: center" v-else></td>
<!-- <td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center" v-else></td>-->
<td class="trTd" style="width: 15%">
<span v-if="infoShow" @click="addEdit('/pages/businesssearchbyry/addEdit/main?status=0&&title=人员信息-在职-'+item.name+'&&id='+item.userId)">详情</span>
</td>
</tr>
<tr v-else-if="item.positionId==151" class="td-row" style="display: flex;font-size: 12px; background-color: #c5c8ce">
<td class="trTd" style="width: 10%;text-align: center">{{ indexList + 1 }}</td>
<td class="trTd" style="width: 15%;text-align: center">{{ item.name }}</td>
<td class="trTd" style="width: 45%;text-align: center">{{ item.name }}</td>
<!-- <td class="trTd" style="width: 16%;text-align: center">{{ item.position === null ? '暂无' : item.position }}</td>-->
<td class="trTd" style="width: 30%;text-align: center">{{ item.worker === null ? '暂无' : item.worker }}</td>
<td class="trTd" style="width: 20%;text-align: center">{{ item.job === null ? '暂无' : item.job }}</td>
<!-- <td class="trTd" style="width: 20%;text-align: center">{{ item.job === null ? '暂无' : item.job }}</td>-->
<!-- <td class="trTd" style="width: 12%;text-align: center">{{ item.startTime === null ? '暂无' : item.startTime }}</td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center">{{ item.age === null ? '暂无' : item.age }}</td>-->
<td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>
<td class="trTd" style="width: 10%;text-align: center" v-else></td>
<!-- <td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center" v-else></td>-->
<td class="trTd" style="width: 15%">
<span v-if="infoShow" @click="addEdit('/pages/businesssearchbyry/addEdit/main?status=0&&title=人员信息-在职-'+item.name+'&&id='+item.userId)">详情</span>
</td>
</tr>
<tr v-else class="td-row" style="display: flex;font-size: 12px">
<td class="trTd" style="width: 10%;text-align: center">{{ indexList + 1 }}</td>
<td class="trTd" style="width: 15%;text-align: center">{{ item.name }}</td>
<td class="trTd" style="width: 45%;text-align: center">{{ item.name }}</td>
<!-- <td class="trTd" style="width: 16%;text-align: center">{{ item.position === null ? '暂无' : item.position }}</td>-->
<td class="trTd" style="width: 30%;text-align: center">{{ item.worker === null ? '暂无' : item.worker }}</td>
<td class="trTd" style="width: 20%;text-align: center">{{ item.job === null ? '暂无' : item.job }}</td>
<!-- <td class="trTd" style="width: 20%;text-align: center">{{ item.job === null ? '暂无' : item.job }}</td>-->
<!-- <td class="trTd" style="width: 12%;text-align: center">{{ item.startTime === null ? '暂无' : item.startTime }}</td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center">{{ item.age === null ? '暂无' : item.age }}</td>-->
<td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>
<td class="trTd" style="width: 10%;text-align: center" v-else></td>
<!-- <td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center" v-else></td>-->
<td class="trTd" style="width: 15%">
<span v-if="infoShow" @click="addEdit('/pages/businesssearchbyry/addEdit/main?status=0&&title=人员信息-在职-'+item.name+'&&id='+item.userId)">详情</span>
</td>
@ -210,13 +212,13 @@
<div>
<tr class="th-row" style="display: flex;font-size: 12px;border: 2px solid #FF0000;font-weight: bold">
<td class="trTd" style="width: 10%;text-align: center">序号</td>
<td class="trTd" style="width: 15%;text-align: center">姓名</td>
<td class="trTd" style="width: 45%;text-align: center">姓名</td>
<!-- <td class="trTd" style="width: 16%;text-align: center">位置</td>-->
<td class="trTd" style="width: 30%;text-align: center"></td>
<td class="trTd" style="width: 20%;text-align: center">工种</td>
<td class="trTd" style="width: 30%;text-align: center"></td>
<!-- <td class="trTd" style="width: 20%;text-align: center">工种</td>-->
<!-- <td class="trTd" style="width: 12%;text-align: center">入职时间</td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center">年龄</td>-->
<td class="trTd" style="width: 10%;text-align: center">保险</td>
<!-- <td class="trTd" style="width: 10%;text-align: center">保险</td>-->
<td class="trTd" style="width: 15%;text-align: center">操作</td>
</tr>
</div>
@ -224,14 +226,14 @@
<!-- <tr v-if="item.positionId==148" class="td-row" style="display: flex;font-size: 12px; background-color: #e3e3e3">-->
<tr v-if="item.positionId==148" class="td-row" style="display: flex;font-size: 12px;">
<td class="trTd" style="width: 10%;text-align: center">{{ indexList + 1 }}</td>
<td class="trTd" style="width: 15%;text-align: center">{{ item.name }}</td>
<td class="trTd" style="width: 45%;text-align: center">{{ item.name }}</td>
<!-- <td class="trTd" style="width: 16%;text-align: center">{{ item.position === null ? '暂无' : item.position }}</td>-->
<td class="trTd" style="width: 30%;text-align: center">{{ item.worker === null ? '暂无' : item.worker }}</td>
<td class="trTd" style="width: 20%;text-align: center">{{ item.job === null ? '暂无' : item.job }}</td>
<!-- <td class="trTd" style="width: 20%;text-align: center">{{ item.job === null ? '暂无' : item.job }}</td>-->
<!-- <td class="trTd" style="width: 12%;text-align: center">{{ item.startTime === null ? '暂无' : item.startTime }}</td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center">{{ item.age === null ? '暂无' : item.age }}</td>-->
<td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>
<td class="trTd" style="width: 10%;text-align: center" v-else></td>
<!-- <td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center" v-else></td>-->
<td class="trTd" style="width: 15%">
<span v-if="infoShow" @click="addEdit('/pages/businesssearchbyry/addEdit/main?status=1&&title=人员信息-离职-'+item.name+'&&id='+item.userId)">详情</span>
</td>
@ -239,28 +241,28 @@
<!-- <tr v-else-if="item.positionId==149" class="td-row" style="display: flex;font-size: 12px; background-color: #C9C9C9">-->
<tr v-else-if="item.positionId==149" class="td-row" style="display: flex;font-size: 12px;">
<td class="trTd" style="width: 10%;text-align: center">{{ indexList + 1 }}</td>
<td class="trTd" style="width: 15%;text-align: center">{{ item.name }}</td>
<td class="trTd" style="width: 45%;text-align: center">{{ item.name }}</td>
<!-- <td class="trTd" style="width: 16%;text-align: center">{{ item.position === null ? '暂无' : item.position }}</td>-->
<td class="trTd" style="width: 30%;text-align: center">{{ item.worker === null ? '暂无' : item.worker }}</td>
<td class="trTd" style="width: 20%;text-align: center">{{ item.job === null ? '暂无' : item.job }}</td>
<!-- <td class="trTd" style="width: 20%;text-align: center">{{ item.job === null ? '暂无' : item.job }}</td>-->
<!-- <td class="trTd" style="width: 12%;text-align: center">{{ item.startTime === null ? '暂无' : item.startTime }}</td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center">{{ item.age === null ? '暂无' : item.age }}</td>-->
<td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>
<td class="trTd" style="width: 10%;text-align: center" v-else></td>
<!-- <td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center" v-else></td>-->
<td class="trTd" style="width: 15%">
<span v-if="infoShow" @click="addEdit('/pages/businesssearchbyry/addEdit/main?status=1&&title=人员信息-离职-'+item.name+'&&id='+item.userId)">详情</span>
</td>
</tr>
<tr v-else-if="item.positionId==152" class="td-row" style="display: flex;font-size: 12px; background-color: #e3e3e3">
<td class="trTd" style="width: 10%;text-align: center">{{ indexList + 1 }}</td>
<td class="trTd" style="width: 15%;text-align: center">{{ item.name }}</td>
<td class="trTd" style="width: 45%;text-align: center">{{ item.name }}</td>
<!-- <td class="trTd" style="width: 16%;text-align: center">{{ item.position === null ? '暂无' : item.position }}</td>-->
<td class="trTd" style="width: 30%;text-align: center">{{ item.worker === null ? '暂无' : item.worker }}</td>
<td class="trTd" style="width: 20%;text-align: center">{{ item.job === null ? '暂无' : item.job }}</td>
<!-- <td class="trTd" style="width: 20%;text-align: center">{{ item.job === null ? '暂无' : item.job }}</td>-->
<!-- <td class="trTd" style="width: 12%;text-align: center">{{ item.startTime === null ? '暂无' : item.startTime }}</td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center">{{ item.age === null ? '暂无' : item.age }}</td>-->
<td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>
<td class="trTd" style="width: 10%;text-align: center" v-else></td>
<!-- <td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center" v-else></td>-->
<td class="trTd" style="width: 15%">
<span v-if="infoShow" @click="addEdit('/pages/businesssearchbyry/addEdit/main?status=1&&title=人员信息-离职-'+item.name+'&&id='+item.userId)">详情</span>
</td>
@ -268,42 +270,42 @@
<!-- <tr v-else-if="item.positionId==150" class="td-row" style="display: flex;font-size: 12px; background-color: #aaaaaa">-->
<tr v-else-if="item.positionId==150" class="td-row" style="display: flex;font-size: 12px;">
<td class="trTd" style="width: 10%;text-align: center">{{ indexList + 1 }}</td>
<td class="trTd" style="width: 15%;text-align: center">{{ item.name }}</td>
<td class="trTd" style="width: 45%;text-align: center">{{ item.name }}</td>
<!-- <td class="trTd" style="width: 16%;text-align: center">{{ item.position === null ? '暂无' : item.position }}</td>-->
<td class="trTd" style="width: 30%;text-align: center">{{ item.worker === null ? '暂无' : item.worker }}</td>
<td class="trTd" style="width: 20%;text-align: center">{{ item.job === null ? '暂无' : item.job }}</td>
<!-- <td class="trTd" style="width: 20%;text-align: center">{{ item.job === null ? '暂无' : item.job }}</td>-->
<!-- <td class="trTd" style="width: 12%;text-align: center">{{ item.startTime === null ? '暂无' : item.startTime }}</td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center">{{ item.age === null ? '暂无' : item.age }}</td>-->
<td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>
<td class="trTd" style="width: 10%;text-align: center" v-else></td>
<!-- <td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center" v-else></td>-->
<td class="trTd" style="width: 15%">
<span v-if="infoShow" @click="addEdit('/pages/businesssearchbyry/addEdit/main?status=1&&title=人员信息-离职-'+item.name+'&&id='+item.userId)">详情</span>
</td>
</tr>
<tr v-else-if="item.positionId==151" class="td-row" style="display: flex;font-size: 12px; background-color: #c5c8ce">
<td class="trTd" style="width: 10%;text-align: center">{{ indexList + 1 }}</td>
<td class="trTd" style="width: 15%;text-align: center">{{ item.name }}</td>
<td class="trTd" style="width: 45%;text-align: center">{{ item.name }}</td>
<!-- <td class="trTd" style="width: 16%;text-align: center">{{ item.position === null ? '暂无' : item.position }}</td>-->
<td class="trTd" style="width: 30%;text-align: center">{{ item.worker === null ? '暂无' : item.worker }}</td>
<td class="trTd" style="width: 20%;text-align: center">{{ item.job === null ? '暂无' : item.job }}</td>
<!-- <td class="trTd" style="width: 20%;text-align: center">{{ item.job === null ? '暂无' : item.job }}</td>-->
<!-- <td class="trTd" style="width: 12%;text-align: center">{{ item.startTime === null ? '暂无' : item.startTime }}</td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center">{{ item.age === null ? '暂无' : item.age }}</td>-->
<td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>
<td class="trTd" style="width: 10%;text-align: center" v-else></td>
<!-- <td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center" v-else></td>-->
<td class="trTd" style="width: 15%">
<span v-if="infoShow" @click="addEdit('/pages/businesssearchbyry/addEdit/main?status=1&&title=人员信息-离职-'+item.name+'&&id='+item.userId)">详情</span>
</td>
</tr>
<tr v-else class="td-row" style="display: flex;font-size: 12px">
<td class="trTd" style="width: 10%;text-align: center">{{ indexList + 1 }}</td>
<td class="trTd" style="width: 15%;text-align: center">{{ item.name }}</td>
<td class="trTd" style="width: 45%;text-align: center">{{ item.name }}</td>
<!-- <td class="trTd" style="width: 16%;text-align: center">{{ item.position === null ? '暂无' : item.position }}</td>-->
<td class="trTd" style="width: 30%;text-align: center">{{ item.worker === null ? '暂无' : item.worker }}</td>
<td class="trTd" style="width: 20%;text-align: center">{{ item.job === null ? '暂无' : item.job }}</td>
<!-- <td class="trTd" style="width: 20%;text-align: center">{{ item.job === null ? '暂无' : item.job }}</td>-->
<!-- <td class="trTd" style="width: 12%;text-align: center">{{ item.startTime === null ? '暂无' : item.startTime }}</td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center">{{ item.age === null ? '暂无' : item.age }}</td>-->
<td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>
<td class="trTd" style="width: 10%;text-align: center" v-else></td>
<!-- <td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center" v-else></td>-->
<td class="trTd" style="width: 15%">
<span v-if="infoShow" @click="addEdit('/pages/businesssearchbyry/addEdit/main?status=1&&title=人员信息-离职-'+item.name+'&&id='+item.userId)">详情</span>
</td>

File diff suppressed because it is too large Load Diff

View File

@ -123,17 +123,19 @@
</div>
<div style="text-align: left;font: bold 12px 新宋体;;padding: 10% 0 1% 2%">4.工资统计</div>
<div style="overflow: auto">
<div style="width: 600px">
<div style="width: 100%">
<div style="border-bottom: 2px solid #FF00FF;"></div>
<div>
<tr class="th-row"
style="display: flex;font-size: 12px;border-bottom: 2px solid #FF00FF;font-weight: bold">
<td class="trTd" style="width: 10%;text-align: center;border-left: 2px solid #FF00FF"><div>序号</div></td>
<td class="trTd" style="width: 30%;text-align: center"><div>位置</div></td>
<td class="trTd" style="width: 25%;text-align: center"><div>实发工资</div></td>
<td class="trTd" style="width: 25%;text-align: center">人工成本折算</td>
<td class="trTd" style="width: 25%;text-align: center">差值</td>
<td class="trTd" style="width: 25%;text-align: center;border-right: 2px solid #FF00FF">实发占比</td>
<!-- <td class="trTd" style="width: 25%;text-align: center"><div>实发工资</div></td>-->
<!-- <td class="trTd" style="width: 25%;text-align: center">人工成本折算</td>-->
<!-- <td class="trTd" style="width: 25%;text-align: center">差值</td>-->
<!-- <td class="trTd" style="width: 25%;text-align: center;border-right: 2px solid #FF00FF">实发占比</td>-->
<td class="trTd" style="width: 40%;text-align: center"><div>总金额</div></td>
<td class="trTd" style="width: 20%;text-align: center;border-right: 2px solid #FF00FF">占比</td>
</tr>
</div>
<!-- 接收数组列表-->
@ -141,29 +143,29 @@
<tr class="th-row" style="display: flex;font-size: 12px;">
<td class="trTd" style="width: 10%;text-align: center">{{ index + 1 }}</td>
<td class="trTd" style="width: 30%;text-align: center">
{{ item.name }}
{{ item.NAME }}
</td>
<td class="trTd" style="width: 25%;text-align: center">
<td class="trTd" style="width: 40%;text-align: center">
{{ item.sfgz }}
</td>
<td class="trTd" style="width: 25%;text-align: center">
{{ item.money }}
</td>
<td class="trTd" style="width: 25%;text-align: center">
{{ item.cz }}
</td>
<td class="trTd" style="width: 25%;text-align: center">
<!-- <td class="trTd" style="width: 25%;text-align: center">-->
<!-- {{ item.money }}-->
<!-- </td>-->
<!-- <td class="trTd" style="width: 25%;text-align: center">-->
<!-- {{ item.cz }}-->
<!-- </td>-->
<td class="trTd" style="width: 20%;text-align: center">
{{ item.bfb }}
</td>
</tr>
</div>
<div style="border-bottom: 2px solid #FF00FF;border-right: 2px solid #FF00FF;border-left: 2px solid #FF00FF">
<tr class="th-row" style="display: flex;font-size: 12px;">
<td class="trTd" style="width: 40%;text-align: center;font-weight: 600;">合计</td>
<td class="trTd" style="width: 25%;text-align: center;font-weight: 600;">{{gzHj.hjsfgz}}</td>
<td class="trTd" style="width: 25%;text-align: center;font-weight: 600;">{{gzHj.hjmoney}}</td>
<td class="trTd" style="width: 25%;text-align: center;font-weight: 600;">{{gzHj.hjcz}}</td>
<td class="trTd" style="width: 25%;text-align: center;font-weight: 600;">100%</td>
<td class="trTd" style="width: 40%;text-align: center;font-weight: 600;">以上支出总和</td>
<td class="trTd" style="width: 40%;text-align: center;font-weight: 600;">{{gzHj.hjsfgz}}</td>
<!-- <td class="trTd" style="width: 25%;text-align: center;font-weight: 600;">{{gzHj.hjmoney}}</td>-->
<!-- <td class="trTd" style="width: 25%;text-align: center;font-weight: 600;">{{gzHj.hjcz}}</td>-->
<td class="trTd" style="width: 20%;text-align: center;font-weight: 600;">100%</td>
</tr>
</div>
</div>
@ -223,12 +225,11 @@ export default {
}),
async:false //
}).then(({data}) => {
//console.log("***********",data.page)
// console.log("***********",data.page)
this.gzList = data.page.list;
this.gzHj.hjsfgz = data.page.hjsfgz;
this.gzHj.hjmoney = data.page.hjmoney;
this.gzHj.hjcz = data.page.hjcz;
// this.gzHj.hjmoney = data.page.hjmoney;
// this.gzHj.hjcz = data.page.hjcz;
})
},
async getGlf(){
@ -248,8 +249,7 @@ export default {
},
getXmAndGlf(){
this.xmList = []
this.xmHj.zje = this.hj.hjzcje + this.glfHj.hjMoney;
console.log("++++++++++++++++++++"+this.glfHj.hjMoney)
this.xmHj.zje = (this.hj.hjzcje + this.glfHj.hjMoney).toFixed(2);
if(parseFloat(this.xmHj.zje) === 0){
let xmbfb = "0.00%";
let glfbfb = "0.00%";

View File

@ -26,7 +26,7 @@
<div style="display: flex;min-height: 30px;">
<div style="text-align: left;padding: 2% 0 1% 5%;width: 34%">合同名称</div>
<div style="width: 50%;padding-top: 1%;">
<input :disabled="approvalShow" placeholder=" " style="text-align: left"
<input :disabled="approvalShow" placeholder="(必填)" style="text-align: left"
v-model="dataForm.contractName"></input>
</div>
</div>
@ -34,7 +34,7 @@
<div style="display: flex">
<div style="text-align: left;padding: 2% 0 1% 5%;width: 34%">合同金额</div>
<div style="width: 60%">
<input :disabled="approvalShow" placeholder=" " style="text-align: left"
<input :disabled="approvalShow" placeholder="(必填)" style="text-align: left"
v-model="dataForm.excelContractMoney"></input>
</div>
</div>
@ -45,8 +45,9 @@
<div style="display: flex;min-height: 30px;">
<div style="text-align: left;padding: 2% 0 1% 5%;width: 34%">原合同名称</div>
<div style="width: 50%;padding-top: 1%;">
<input :disabled="approvalShow" placeholder=" " style="text-align: left"
v-model="dataForm.contractName"></input>
<!-- <input :disabled="approvalShow" placeholder=" " style="text-align: left"-->
<!-- v-model="dataForm.contractName"></input>-->
<span>{{dataForm.contractName}}</span>
</div>
</div>
<div class="showDiv"></div>
@ -85,7 +86,7 @@
<div style="display: flex;min-height: 30px;" @click="showPicker(6)">
<div style="text-align: left;padding: 2% 0 1% 5%;width: 32%">1.建设单位:</div>
<div style="width: 52%;padding-top: 1%">
<input disabled placeholder=" " style="text-align: left"
<input disabled placeholder="(必选)" style="text-align: left"
v-model="dataForm.contractJsdw"></input>
</div>
<div class="arrowOpen"></div>
@ -96,7 +97,7 @@
<div style="display: flex;min-height: 30px;" @click="showPicker(2)">
<div style="text-align: left;padding: 2% 0 1% 5%;width: 32%">2.施工单位:</div>
<div style="width: 52%;padding-top: 1%">
<input disabled placeholder=" " style="text-align: left"
<input disabled placeholder="(必选)" style="text-align: left"
v-model="dataForm.contractSgdw"></input>
</div>
<div class="arrowOpen"></div>
@ -109,7 +110,7 @@
<div style="width: 52%;padding-top: 1%">
<picker mode="date" :value="dataForm.contractYear" fields="year" @change="bindYearChange($event,999)">
<view class="picker">
<input disabled placeholder=" " style="text-align: left"
<input disabled placeholder="(必选)" style="text-align: left"
v-model="dataForm.contractYear"></input>
</view>
</picker>
@ -122,7 +123,7 @@
<div style="display: flex;min-height: 30px;" @click="showPicker(1)">
<div style="text-align: left;padding: 2% 0 1% 5%;width: 32%">4.直非友:</div>
<div style="width: 52%;padding-top: 1%">
<input disabled placeholder=" " style="text-align: left"
<input disabled placeholder="(必选)" style="text-align: left"
v-model="dataForm.contractZfy"></input>
</div>
<div class="arrowOpen"></div>
@ -133,7 +134,7 @@
<div style="display: flex;min-height: 30px;" @click="showPicker(3)">
<div style="text-align: left;padding: 2% 0 1% 5%;width: 32%">5.监理单位:</div>
<div style="width: 52%;padding-top: 1%">
<input disabled placeholder=" " style="text-align: left"
<input disabled placeholder="(必选)" style="text-align: left"
v-model="dataForm.contractJldw"></input>
</div>
<div class="arrowOpen"></div>
@ -144,7 +145,7 @@
<div style="display: flex;min-height: 30px;" @click="showPicker(4)">
<div style="text-align: left;padding: 2% 0 1% 5%;width: 32%">6.一审单位:</div>
<div style="width: 52%;padding-top: 1%">
<input disabled placeholder=" " style="text-align: left"
<input disabled placeholder="(必选)" style="text-align: left"
v-model="dataForm.contractYsdw"></input>
</div>
<div class="arrowOpen"></div>
@ -155,7 +156,7 @@
<div style="display: flex;min-height: 30px;" @click="showPicker(5)">
<div style="text-align: left;padding: 2% 0 1% 5%;width: 32%">7.二审单位:</div>
<div style="width: 52%;padding-top: 1%">
<input disabled placeholder=" " style="text-align: left"
<input disabled placeholder="(必选)" style="text-align: left"
v-model="dataForm.contractEsdw"></input>
</div>
<div class="arrowOpen"></div>
@ -215,33 +216,8 @@
</div>
</div>
</div>
<!-- 进项发票-->
<!-- <div v-if="approvalShow" style="font-size: 12px">
<div style="text-align: left;padding: 10% 0 1% 2%;font: bold 14px 新宋体">进项发票</div>
<div style="padding:0 0 1% 2%;text-align: left;">1相关描述</div>
<div style="margin: 0 1% 0 1%;border: 2px solid #19be6b;border-radius: 5px">
<textarea style="width: 96%;margin-left: 2%;overflow:auto;"
placeholder=" " maxlength="2000" v-model="dataForm.contractJxfp"></textarea>
</div>
<div style="padding: 10% 0 1% 2%;text-align: left;display: flex">
<div>2相关照片(限一张)</div>
<div style="padding-left: 10vw;padding-top: -2vh"><button type="button" size="mini" @click.stop="chooseImage(1)">修改</button></div>
</div>
<div style="border: 2px solid #19be6b;width: 96%;min-height: 14vh;display: flex;margin-left: 2%">
<div v-if="files.length === 0" class="sz" @click.stop="chooseImage(1)">
</div>
<div v-else style="width: 32%;height: 12vh;margin: 1% 1% 0 1%">
<div style="width: 32%;height: 12vh;">
<block v-for="(item,index) in files" :key="index">
<div @click.stop="predivImage($event,1)" :id="item">
<image class="upload_img" :src="item"/>
</div>
</block>
</div>
</div>
</div>
</div>-->
<!-- 送审进度-->
<!-- 送审进度-->
<div v-if="approvalShow">
<div style="text-align: left;padding: 10% 0 1% 2%;font: bold 14px 新宋体">送审进度</div>
<div>
@ -252,49 +228,7 @@
</tr>
<div style="text-align: center;font-size: 12px;">
<div style="display: flex">
<!--<div style="width: 40%">
<tr style="display: flex;height: 8vh">
<td class="tableClass" style="border-left: 2px solid #f7f7f7;background-color: #19be6b;font-weight: bold">合同名称</td>
<td class="tableClass" colspan="2">
<input disabled v-model="dataExcelForm.contractName"></input>
</td>
</tr>
<tr style="display: flex;height: 8vh">
<td class="tableClass" style="border-left: 2px solid #f7f7f7;background-color: #19be6b;font-weight: bold">建设单位</td>
<td class="tableClass" style="width:100%" colspan="2" @click="showPicker(6)">
&lt;!&ndash; <input disabled v-model="dataExcelForm.contractJsdw"></input>&ndash;&gt;
<template v-if="dataExcelForm.contractJsdw!=null">{{ dataExcelForm.contractJsdw }}</template>
</td>
</tr>
<tr style="display: flex;height: 8vh">
<td class="tableClass" style="border-left: 2px solid #f7f7f7;background-color: #19be6b;font-weight: bold">施工单位</td>
<td class="tableClass" style="width:100%" colspan="2" >
<input disabled v-model="dataExcelForm.contractSgdw"></input>
&lt;!&ndash; <template v-if="dataExcelForm.contractSgdw!=null" @click="showPicker(2)">{{ dataExcelForm.contractSgdw }}</template>&ndash;&gt;
</td>
</tr>
<tr style="display: flex;height: 8vh">
<td class="tableClass" style="border-left: 2px solid #f7f7f7;background-color: #19be6b;font-weight: bold">监理单位</td>
<td class="tableClass" style="width:100%" colspan="2">
<input disabled v-model="dataExcelForm.contractJldw"></input>
&lt;!&ndash; <template @click="showPicker(3)" v-if="dataExcelForm.contractJldw!=null">{{ dataExcelForm.contractJldw }}</template>&ndash;&gt;
</td>
</tr>
<tr style="display: flex;height: 16vh">
<td class="tableClass" style="border-left: 2px solid #f7f7f7;background-color: #19be6b;font-weight: bold">一审单位</td>
<td class="tableClass" style="width:100%" colspan="2" >
<input disabled v-model="dataExcelForm.contractYsdw"></input>
&lt;!&ndash; <template v-if="dataExcelForm.contractYsdw!=null" @click="showPicker(4)">{{ dataExcelForm.contractYsdw }}</template>&ndash;&gt;
</td>
</tr>
<tr style="display: flex;height: 16vh">
<td class="tableClass" style="border-left: 2px solid #f7f7f7;background-color: #19be6b;font-weight: bold">二审单位</td>
<td class="tableClass" style="width:100%" colspan="2" >
<input disabled v-model="dataExcelForm.contractEsdw"></input>
&lt;!&ndash; <template @click="showPicker(5)" v-if="dataExcelForm.contractEsdw!=null">{{ dataExcelForm.contractEsdw }}</template>&ndash;&gt;
</td>
</tr>
</div>-->
<div style="width: 100%">
<tr style="display: flex;height: auto">
<td class="tableClass" style="width: 25%;background-color: #19be6b;font-weight: bold">合同金额</td>
@ -305,9 +239,7 @@
<tr style="display: flex;height: auto">
<td class="tableClass" style="width: 25%"><input disabled v-model="dataForm.excelContractMoneyNew ? dataForm.excelContractMoneyNew : dataForm.excelContractMoney"></input>
</td>
<!-- <td class="tableClass" style="width: 25%" @click="showPickerExcel(1)">
<template v-if="dataExcelForm.excelContractQdtime!=null">{{ dataExcelForm.excelContractQdtime }}</template>
</td>-->
<td class="tableClass" style="width: 25%">
<picker style="width: 100%;" mode="date" :value="dataExcelForm.excelContractQdtime" fields="day"
@change="bindYearChange($event,1)">
@ -317,10 +249,7 @@
</picker>
</td>
<td class="tableClass" style="width: 25%"><input v-model="dataExcelForm.excelFkbl"></input></td>
<!-- <td class="tableClass" style="width: 25%;border-right: 2px solid #f7f7f7" @click="showPickerExcel(2)">-->
<!-- <picker style="width: 26%;" mode="date" :value="dataExcelForm.excelYsbl" fields="day" @change="bindYearChange($event,1)"></picker>
&lt;!&ndash; <input disabled v-model="dataExcelForm.excelYsbl"></input>&ndash;&gt;
<template v-if="dataExcelForm.excelYsbl!=null">{{ dataExcelForm.excelYsbl }}</template>-->
<td class="tableClass" style="width: 25%;border-right: 2px solid #f7f7f7">
<picker style="width: 100%;" mode="date" :value="dataExcelForm.excelYsbl" fields="day"
@change="bindYearChange($event,2)">
@ -337,18 +266,7 @@
<td class="tableClass" style="width: 25%;border-right: 2px solid #eeeeee;background-color: #19be6b;font-weight: bold">实际竣工时间</td>
</tr>
<tr style="display: flex;height: auto">
<!-- <td class="tableClass" style="width: 25%" @click="showPickerExcel(3)">
<template v-if="dataExcelForm.excelStartTime!=null">{{ dataExcelForm.excelStartTime }}</template>
</td>
<td class="tableClass" style="width: 25%" @click="showPickerExcel(4)">
<template v-if="dataExcelForm.excelEndTime!=null">{{ dataExcelForm.excelEndTime }}</template>
</td>
<td class="tableClass" style="width: 25%" @click="showPickerExcel(5)">
<template v-if="dataExcelForm.excelActualStart!=null">{{ dataExcelForm.excelActualStart }}</template>
</td>
<td class="tableClass" style="width: 25%;border-right: 2px solid #f7f7f7" @click="showPickerExcel(6)">
<template v-if="dataExcelForm.excelActualEnd!=null">{{ dataExcelForm.excelActualEnd }}</template>
</td>-->
<td class="tableClass" style="width: 25%">
<picker style="width: 100%;" mode="date" :value="dataExcelForm.excelStartTime" fields="day"
@change="bindYearChange($event,3)">
@ -392,9 +310,7 @@
<td class="tableClass" style="width: 25%"><input v-model="dataExcelForm.excelYstb"></input></td>
<td class="tableClass" style="width: 25%"><input v-model="dataExcelForm.excelYstz"></input></td>
<td class="tableClass" style="width: 25%"><input v-model="dataExcelForm.excelYsdz"></input></td>
<!-- <td class="tableClass" style="width: 25%;border-right: 2px solid #f7f7f7" @click="showPickerExcel(7)">
<template v-if="dataExcelForm.excelYssureTime!=null">{{ dataExcelForm.excelYssureTime }}</template>
</td>-->
<td class="tableClass" style="width: 25%;border-right: 2px solid #f7f7f7">
<picker style="width: 100%;" mode="date" :value="dataExcelForm.excelYssureTime" fields="day"
@change="bindYearChange($event,7)">
@ -414,9 +330,7 @@
<td class="tableClass" style="width: 25%"><input v-model="dataExcelForm.excelEstb"></input></td>
<td class="tableClass" style="width: 25%"><input v-model="dataExcelForm.excelEsjz"></input></td>
<td class="tableClass" style="width: 25%"><input v-model="dataExcelForm.excelEsdz"></input></td>
<!-- <td class="tableClass" style="width: 25%;border-right: 2px solid #f7f7f7" @click="showPickerExcel(8)">
<template v-if="dataExcelForm.excelEssureTime!=null">{{ dataExcelForm.excelEssureTime }}</template>
</td>-->
<td class="tableClass" style="width: 25%;border-right: 2px solid #f7f7f7">
<picker style="width: 100%;" mode="date" :value="dataExcelForm.excelEssureTime" fields="day"
@change="bindYearChange($event,8)">
@ -964,10 +878,82 @@ export default {
},
dataFormSubmit() {
//
if(!this.dataForm.contractName || !this.dataForm.contractJsdwId || !this.dataForm.contractSgdwId || !this.dataForm.contractYear
|| !this.dataForm.contractZfyId || !this.dataForm.contractJldwId || !this.dataForm.contractYsdwId || !this.dataForm.contractEsdwId) {
// if(!this.dataForm.contractName || !this.dataForm.contractJsdwId || !this.dataForm.contractSgdwId || !this.dataForm.contractYear
// || !this.dataForm.contractZfyId || !this.dataForm.contractJldwId || !this.dataForm.contractYsdwId || !this.dataForm.contractEsdwId) {
// wx.showToast({
// title: "",
// icon: "none",
// duration: 2000,
// })
// return;
// }
if(!this.dataForm.contractName) {
wx.showToast({
title: "表单信息均为必填!",
title: "请输入合同名称!",
icon: "none",
duration: 2000,
})
return;
}
if(!this.dataForm.excelContractMoney) {
wx.showToast({
title: "请输入合同金额!",
icon: "none",
duration: 2000,
})
return;
}
if(!this.dataForm.contractJsdwId) {
wx.showToast({
title: "请选择建设单位!",
icon: "none",
duration: 2000,
})
return;
}
if(!this.dataForm.contractSgdwId) {
wx.showToast({
title: "请选择施工单位!",
icon: "none",
duration: 2000,
})
return;
}
if(!this.dataForm.contractYear) {
wx.showToast({
title: "请选择合同年份!",
icon: "none",
duration: 2000,
})
return;
}
if(!this.dataForm.contractZfyId) {
wx.showToast({
title: "请选择非直友!",
icon: "none",
duration: 2000,
})
return;
}
if(!this.dataForm.contractJldwId) {
wx.showToast({
title: "请选择监理单位!",
icon: "none",
duration: 2000,
})
return;
}
if(!this.dataForm.contractYsdwId) {
wx.showToast({
title: "请选择一审单位!",
icon: "none",
duration: 2000,
})
return;
}
if(!this.dataForm.contractEsdwId) {
wx.showToast({
title: "请选择二审单位!",
icon: "none",
duration: 2000,
})

View File

@ -27,76 +27,6 @@
<div class="showDiv"></div>
<!--<div style="display: flex;min-height: 30px;" @click="showPicker(2)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">2&nbsp;直非友(all):</div>
<div style="width: 48%;padding-top: 1%;">
<input disabled style="text-align: left" placeholder=" "
v-model="dataForm.contractZfy"></input>
</div>
<div class="arrowOpen"></div>
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px;">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">3&nbsp;合同年份(all):</div>
<div style="width: 48%;padding-top: 1%;">
<picker mode="date" :value="dataForm.contractYear" fields="year" @change="bindYearChange">
<view class="picker">
<input disabled placeholder=" " style="text-align: left"
v-model="dataForm.contractYear"></input>
</view>
</picker>
</div>
<div class="arrowOpen"></div>
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px;" @click="showPicker(4)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">4&nbsp;施工单位(all):</div>
<div style="width: 48%;padding-top: 1%;">
<input disabled style="text-align: left" placeholder=" "
v-model="dataForm.contractSgdw"></input>
</div>
<div class="arrowOpen"></div>
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px;" @click="showPicker(5)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">5&nbsp;监理单位(all):</div>
<div style="width: 48%;padding-top: 1%;">
<input disabled style="text-align: left" placeholder=" "
v-model="dataForm.contractJldw"></input>
</div>
<div class="arrowOpen"></div>
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px;" @click="showPicker(6)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">6&nbsp;一审单位(all):</div>
<div style="width: 48%;padding-top: 1%;">
<input disabled style="text-align: left" placeholder=" "
v-model="dataForm.contractYsdw"></input>
</div>
<div class="arrowOpen"></div>
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px;" @click="showPicker(7)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">7&nbsp;二审单位(all):</div>
<div style="width: 48%;padding-top: 1%;">
<input disabled style="text-align: left" placeholder=" "
v-model="dataForm.contractEsdw"></input>
</div>
<div class="arrowOpen"></div>
</div>
<div class="showDiv"></div>-->
<div style="display: flex;min-height: 30px;">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">2&nbsp;关键字(all):</div>
<div style="width: 48%;padding-top: 1%;">
@ -122,8 +52,6 @@
<td class="th-row" style="width: 10%;text-align: center">年份</td>
<td class="th-row" style="width: 50%;text-align: center">合同名称</td>
<td class="th-row" style="width: 20%;text-align: center">合同金额</td>
<!-- <td class="th-row" style="width: 16%;text-align: center">签订时间</td>-->
<!-- <td class="th-row" style="width: 16%;text-align: center">验收时间</td>-->
<td class="th-row" style="width: 10%;text-align: center">操作</td>
</tr>
</div>
@ -133,11 +61,7 @@
<td class="trTd" style="width: 10%;text-align: center">{{ item.contractYear }}</td>
<td class="trTd" style="width: 50%;text-align: center">{{ item.contractNewName? item.contractNewName:item.contractName }}</td>
<td v-if="!item.excelContractMoney && !item.excelContractMoneyNew" class="trTd" style="width: 20%;text-align: center">{{ "暂无" }}</td>
<td v-else class="trTd" style="width: 18%;text-align: center">{{ item.excelContractMoneyNew ? item.excelContractMoneyNew : item.excelContractMoney }}</td>
<!--<td v-if="item.excelContractQdtime === null" class="trTd" style="width: 16%;text-align: center">{{ "暂无" }}</td>
<td v-else class="trTd" style="width: 16%;text-align: center">{{ item.excelContractQdtime }}</td>
<td v-if="item.excelYsbl === null" class="trTd" style="width: 16%;text-align: center">{{ "暂无" }}</td>
<td v-else class="trTd" style="width: 16%;text-align: center">{{ item.excelYsbl }}</td>-->
<td v-else class="trTd" style="width: 20%;text-align: center">{{ item.excelContractMoneyNew ? item.excelContractMoneyNew : item.excelContractMoney }}</td>
<td class="trTd" style="width: 10%;text-align: center">
<span v-if="editShow"
@click="addEdit('/pages/pagecontract/businesscontract/addEdit/main?title=合同管理-修改-'+item.contractJsdw+'-'+item.contractYear+'-'+item.contractName+'&&id='+item.id)">修改</span>
@ -477,6 +401,8 @@ export default {
display: flex;
justify-content: center;
align-items: center;
font-weight: bold;
border: 1px solid #efeded;
}
.trTd {

View File

@ -21,102 +21,42 @@
<div>
<tr class="th-row" style="display: flex;font-size: 12px;border: 2px solid #19be6b;">
<td class="th-row" style="width: 10%;text-align: center">序号</td>
<td class="th-row" style="width: 38%;text-align: center">立项名称</td>
<td class="th-row" style="width: 37%;text-align: center">施工地点</td>
<td class="th-row" style="width: 75%;text-align: center">立项名称</td>
<!-- <td class="th-row" style="width: 37%;text-align: center">施工地点</td>-->
<td class="th-row" style="width: 14%;text-align: center">操作</td>
<!-- <td class="th-row" style="width: 5%;text-align: center">序号</td>
<td class="th-row" style="width: 9%;text-align: center">施工年份</td>
<td class="th-row" style="width: 15%;text-align: center">建设单位</td>
<td class="th-row" style="width: 15%;text-align: center">立项名称</td>
<td class="th-row" style="width: 15%;text-align: center">施工地点</td>
<td class="th-row" style="width: 9%;text-align: center">施工进度</td>
<td class="th-row" style="width: 9%;text-align: center">负责工长</td>
<td class="th-row" style="width: 9%;text-align: center">现场照片</td>
<td class="th-row" style="width: 9%;text-align: center">导入合同</td>
<td class="th-row" style="width: 5%;text-align: center">操作</td>-->
</tr>
</div>
<div v-for="(item,indexFa) in dataList" :key="indexFa" style="border-left: 2px solid #19be6b;border-right: 2px solid #19be6b;">
<div v-if="selectOneDataId === item.projectId" style="background-color: #53ffa4" @click="selectOneData(item.projectId)">
<tr class="td-row" style="display: flex;font-size: 12px">
<td class="trTd" style="width: 10%;text-align: center">{{ indexFa + 1 }}</td>
<td class="trTd" style="width: 38%;text-align: center">
<td class="trTd" style="width: 75%;text-align: center">
<div v-if="item.projectNewName == null">{{ item.project }}</div>
<div v-else>{{ item.projectNewName }}</div>
</td>
<td class="trTd" style="width: 37%;text-align: center">
<div v-for="(son,index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}</div>
<div v-if="item.projectSgddId == null">{{ "暂无" }}</div>
</td>
<!-- <td class="trTd" style="width: 37%;text-align: center">-->
<!-- <div v-for="(son,index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}</div>-->
<!-- <div v-if="item.projectSgddId == null">{{ "暂无" }}</div>-->
<!-- </td>-->
<td class="trTd" style="width: 14%;text-align: center;" @click="deleteProject(indexFa,item.projectId)">
<div v-bind:class="isChecked[item.projectId]?'bgcolor xz':'xz'">删除</div>
</td>
<!-- <td class="trTd" style="width: 5%;text-align: center">{{ indexFa + 1 }}</td>
<td class="trTd" style="width: 9%;text-align: center">{{ item.projectYear }}</td>
<td class="trTd" style="width: 15%;text-align: center">
<div v-for="(son,index) in dicJsdwList" :key="index" v-if="son.dictId === item.projectJsdwId">{{ son.name }}</div>
<div v-if="item.projectJsdwId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 15%;text-align: center">
<div v-if="item.projectNewName == null">{{ item.project }}</div>
<div v-else>{{ item.projectNewName }}</div>
</td>
<td class="trTd" style="width: 15%;text-align: center">
<div v-for="(son,index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}</div>
<div v-if="item.projectSgddId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 9%;text-align: center">
<div v-for="(son,index) in dicJDList" :key="index" v-if="son.dictId === item.projectSgjdId">{{ son.name }}</div>
<div v-if="item.projectSgjdId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 9%;text-align: center">{{ item.fzgz ? item.fzgz : "暂无" }}</td>
<td class="trTd" style="width: 9%;text-align: center">{{ item.projectPhotoConut }}</td>
<td v-if="item.isContant === 0" class="trTd" style="width: 9%;text-align: center">{{ "" }}</td>
<td v-else class="trTd" style="width: 9%;text-align: center">{{ "是" }}</td>
<td class="trTd" style="width: 5%;text-align: center;" @click="deleteProject(indexFa,item.projectId)">
<div v-bind:class="isChecked[item.projectId]?'bgcolor xz':'xz'">删除</div>
</td>-->
</tr>
</div>
<div v-else @click="selectOneData(item.projectId)">
<tr class="td-row" style="display: flex;font-size: 12px">
<td class="trTd" style="width: 10%;text-align: center">{{ indexFa + 1 }}</td>
<td class="trTd" style="width: 38%;text-align: center">
<td class="trTd" style="width: 75%;text-align: center">
<div v-if="item.projectNewName == null">{{ item.project }}</div>
<div v-else>{{ item.projectNewName }}</div>
</td>
<td class="trTd" style="width: 37%;text-align: center">
<div v-for="(son,index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}</div>
<div v-if="item.projectSgddId == null">{{ "暂无" }}</div>
</td>
<!-- <td class="trTd" style="width: 37%;text-align: center">-->
<!-- <div v-for="(son,index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}</div>-->
<!-- <div v-if="item.projectSgddId == null">{{ "暂无" }}</div>-->
<!-- </td>-->
<td class="trTd" style="width: 14%;text-align: center;" @click="deleteProject(indexFa,item.projectId)">
<div v-bind:class="isChecked[item.projectId]?'bgcolor xz':'xz'">删除</div>
</td>
<!-- <td class="trTd" style="width: 5%;text-align: center">{{ indexFa + 1 }}</td>
<td class="trTd" style="width: 9%;text-align: center">{{ item.projectYear }}</td>
<td class="trTd" style="width: 15%;text-align: center">
<div v-for="(son,index) in dicJsdwList" :key="index" v-if="son.dictId === item.projectJsdwId">{{ son.name }}</div>
<div v-if="item.projectJsdwId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 15%;text-align: center">
<div v-if="item.projectNewName == null">{{ item.project }}</div>
<div v-else>{{ item.projectNewName }}</div>
</td>
<td class="trTd" style="width: 15%;text-align: center">
<div v-for="(son,index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}</div>
<div v-if="item.projectSgddId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 9%;text-align: center">
<div v-for="(son,index) in dicJDList" :key="index" v-if="son.dictId === item.projectSgjdId">{{ son.name }}</div>
<div v-if="item.projectSgjdId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 9%;text-align: center">{{ item.fzgz ? item.fzgz : "暂无" }}</td>
<td class="trTd" style="width: 9%;text-align: center">{{ item.projectPhotoConut }}</td>
<td v-if="item.isContant === 0" class="trTd" style="width: 9%;text-align: center">{{ "" }}</td>
<td v-else class="trTd" style="width: 9%;text-align: center">{{ "是" }}</td>
<td class="trTd" style="width: 5%;text-align: center;" @click="deleteProject(indexFa,item.projectId)">
<div v-bind:class="isChecked[item.projectId]?'bgcolor xz':'xz'">删除</div>
</td>-->
</tr>
</div>
</div>

View File

@ -29,72 +29,6 @@
<div class="showDiv"></div>
<!--<div style="display: flex;min-height: 30px;" @click="showPicker(2)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">2&nbsp;施工地点(all)</div>
<div style="width: 44%;padding-top: 1%;">
<input disabled style="text-align: left" placeholder=" "
v-model="dataForm.projectSgdd"></input>
</div>
<div class="arrowOpen"></div>
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px;">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">3&nbsp;施工年份(all)</div>
<div style="width: 44%;padding-top: 1%;">
<picker mode="date" :value="dataForm.projectYear" fields="year" @change="bindYearChange">
<view class="picker">
<input disabled placeholder=" " style="text-align: left"
v-model="dataForm.projectYear"></input>
</view>
</picker>
</div>
<div class="arrowOpen"></div>
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px;" @click="showPicker(3)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">4&nbsp;负责工长(all):</div>
<div style="width: 44%;padding-top: 1%;">
<input disabled style="text-align: left" placeholder=" "
v-model="dataForm.projectFzgz"></input>
</div>
<div class="arrowOpen"></div>
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px;" @click="showPicker(6)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 35%">5&nbsp;联络员(all)</div>
<div style="width: 45%;padding-top: 1%;">
<input disabled style="text-align: left"
v-model="dataForm.projectLly"></input>
</div>
<div class="arrowOpen"></div>
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px;" @click="showPicker(4)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">6&nbsp;工程类别(all)</div>
<div style="width: 44%;padding-top: 1%;">
<input disabled style="text-align: left" placeholder=" "
v-model="dataForm.projectGclb"></input>
</div>
<div class="arrowOpen"></div>
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px;" @click="showPicker(5)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">7&nbsp;施工进度(all):</div>
<div style="width: 44%;padding-top: 1%;">
<input disabled style="text-align: left" placeholder=" "
v-model="dataForm.projectSgjd"></input>
</div>
<div class="arrowOpen"></div>
</div>
<div class="showDiv"></div>-->
<div style="display: flex;min-height: 30px;">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">2&nbsp;关键字(all)</div>
<div style="width: 44%;padding-top: 1%;">
@ -123,102 +57,43 @@
<div>
<tr style="display: flex;font-size: 12px;border: 2px solid #19be6b;">
<td class="th-row" style="width: 10%;text-align: center">序号</td>
<td class="th-row" style="width: 38%;text-align: center">立项名称</td>
<td class="th-row" style="width: 37%;text-align: center">施工地点</td>
<td class="th-row" style="width: 75%;text-align: center">立项名称</td>
<!-- <td class="th-row" style="width: 37%;text-align: center">施工地点</td>-->
<td class="th-row" style="width: 14%;text-align: center">操作</td>
<!-- <td class="th-row" style="width: 5%;text-align: center">序号</td>
<td class="th-row" style="width: 9%;text-align: center">施工年份</td>
<td class="th-row" style="width: 15%;text-align: center">建设单位</td>
<td class="th-row" style="width: 15%;text-align: center">立项名称</td>
<td class="th-row" style="width: 15%;text-align: center">施工地点</td>
<td class="th-row" style="width: 9%;text-align: center">施工进度</td>
<td class="th-row" style="width: 9%;text-align: center">负责工长</td>
<td class="th-row" style="width: 9%;text-align: center">现场照片</td>
<td class="th-row" style="width: 9%;text-align: center">导入合同</td>
<td class="th-row" style="width: 5%;text-align: center">操作</td>-->
</tr>
</div>
<div v-for="(item,indexFa) in dataListCommons" :key="indexFa" style="border-right: 2px solid #19be6b;border-left: 2px solid #19be6b;">
<div v-if="selectOneDataId === item.projectId" style="background-color: #53ffa4" @click="selectOneData(item.projectId)">
<tr class="td-row" style="display: flex;font-size: 12px">
<td class="trTd" style="width: 10%;text-align: center">{{ indexFa + 1 }}</td>
<td class="trTd" style="width: 38%;text-align: center">
<td class="trTd" style="width: 75%;text-align: center">
<div v-if="item.projectNewName == null">{{ item.project }}</div>
<div v-else>{{ item.projectNewName }}</div>
</td>
<td class="trTd" style="width: 37%;text-align: center">
<div v-for="(son,index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}</div>
<div v-if="item.projectSgddId == null">{{ "暂无" }}</div>
</td>
<!-- <td class="trTd" style="width: 37%;text-align: center">-->
<!-- <div v-for="(son,index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}</div>-->
<!-- <div v-if="item.projectSgddId == null">{{ "暂无" }}</div>-->
<!-- </td>-->
<td class="trTd" style="width: 14%;text-align: center;" @click="tj(indexFa,item.projectId)">
<div v-bind:class="isChecked[item.projectId]?'bgColor xz':'xz'">添加</div>
</td>
<!-- <td class="trTd" style="width: 5%;text-align: center">{{ indexFa + 1 }}</td>
<td class="trTd" style="width: 9%;text-align: center">{{ item.projectYear }}</td>
<td class="trTd" style="width: 15%;text-align: center">
<div v-for="(son,index) in dicJsdwList" :key="index" v-if="son.dictId === item.projectJsdwId">{{ son.name }}</div>
<div v-if="item.projectJsdwId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 15%;text-align: center">
<div v-if="item.projectNewName == null">{{ item.project }}</div>
<div v-else>{{ item.projectNewName }}</div>
</td>
<td class="trTd" style="width: 15%;text-align: center">
<div v-for="(son,index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}</div>
<div v-if="item.projectSgddId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 9%;text-align: center">
<div v-for="(son,index) in dicJDList" :key="index" v-if="son.dictId === item.projectSgjdId">{{ son.name }}</div>
<div v-if="item.projectSgjdId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 9%;text-align: center">{{ item.fzgz ? item.fzgz : "暂无" }}</td>
<td class="trTd" style="width: 9%;text-align: center">{{ item.projectPhotoConut }}</td>
<td v-if="item.isContant === 0" class="trTd" style="width: 9%;text-align: center">{{ "" }}</td>
<td v-else class="trTd" style="width: 9%;text-align: center">{{ "是" }}</td>
<td class="trTd" style="width: 5%;text-align: center;" @click="tj(indexFa,item.projectId)">
<div v-bind:class="isChecked[item.projectId]?'bgColor xz':'xz'">添加</div>
</td>-->
</tr>
</div>
<div v-else @click="selectOneData(item.projectId)">
<tr class="td-row" style="display: flex;font-size: 12px">
<td class="trTd" style="width: 10%;text-align: center">{{ indexFa + 1 }}</td>
<td class="trTd" style="width: 38%;text-align: center">
<td class="trTd" style="width: 75%;text-align: center">
<div v-if="item.projectNewName == null">{{ item.project }}</div>
<div v-else>{{ item.projectNewName }}</div>
</td>
<td class="trTd" style="width: 37%;text-align: center">
<div v-for="(son,index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}</div>
<div v-if="item.projectSgddId == null">{{ "暂无" }}</div>
</td>
<!-- <td class="trTd" style="width: 37%;text-align: center">-->
<!-- <div v-for="(son,index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}</div>-->
<!-- <div v-if="item.projectSgddId == null">{{ "暂无" }}</div>-->
<!-- </td>-->
<td class="trTd" style="width: 14%;text-align: center;" @click="tj(indexFa,item.projectId)">
<div v-bind:class="isChecked[item.projectId]?'bgColor xz':'xz'">添加</div>
</td>
<!-- <td class="trTd" style="width: 5%;text-align: center">{{ indexFa + 1 }}</td>
<td class="trTd" style="width: 9%;text-align: center">{{ item.projectYear }}</td>
<td class="trTd" style="width: 15%;text-align: center">
<div v-for="(son,index) in dicJsdwList" :key="index" v-if="son.dictId === item.projectJsdwId">{{ son.name }}</div>
<div v-if="item.projectJsdwId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 15%;text-align: center">
<div v-if="item.projectNewName == null">{{ item.project }}</div>
<div v-else>{{ item.projectNewName }}</div>
</td>
<td class="trTd" style="width: 15%;text-align: center">
<div v-for="(son,index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}</div>
<div v-if="item.projectSgddId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 9%;text-align: center">
<div v-for="(son,index) in dicJDList" :key="index" v-if="son.dictId === item.projectSgjdId">{{ son.name }}</div>
<div v-if="item.projectSgjdId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 9%;text-align: center">{{ item.fzgz ? item.fzgz : "暂无" }}</td>
<td class="trTd" style="width: 9%;text-align: center">{{ item.projectPhotoConut }}</td>
<td v-if="item.isContant === 0" class="trTd" style="width: 9%;text-align: center">{{ "" }}</td>
<td v-else class="trTd" style="width: 9%;text-align: center">{{ "是" }}</td>
<td class="trTd" style="width: 5%;text-align: center;" @click="tj(indexFa,item.projectId)">
<div v-bind:class="isChecked[item.projectId]?'bgColor xz':'xz'">添加</div>
</td>-->
</tr>
</div>
</div>

View File

@ -40,6 +40,7 @@
<span style="margin-left: -46%" v-if="index === 1">{{ item.name }}</span>
<span style="margin-left: -46%" v-if="index === 2">{{ item.name }}</span>
<span style="margin-left: -46%" v-if="index === 3">{{ item.name }}</span>
<span style="margin-left: -46%" v-if="index === 4">{{ item.name }}</span>
</div>
<div style="width: 40%;display: flex">
<button type="button" size="mini" style="color: white;background-color: #00B0F0;width: 50px;height: 30px"
@ -70,6 +71,14 @@
style="color: white;background-color: #00B0F0;width: 50px;height: 30px"
@click="changB(index)">
</button>
<button v-if="buttonFlag5 === 0 && index === 4" type="button" size="mini"
style="color: white;background-color: #D9D9D9;width: 50px;height: 30px"
@click="changA(index)">
</button>
<button v-if="buttonFlag5 === 1 && index === 4" type="button" size="mini"
style="color: white;background-color: #00B0F0;width: 50px;height: 30px"
@click="changB(index)">
</button>
</div>
</div>
</div>
@ -187,6 +196,40 @@
</tr>
</div>
</div>
<div v-if="buttonFlag5 === 0 && index === 4">
<div style="width: 50%;">
<tr v-if="i % 2 === 0" class="td-row" style="display: flex;">
<td class="trTd" style="width: 20%;"><span>{{ i + 1 }}</span></td>
<td class="trTd" style="width: 80%;"><span class="spanClass">{{ val.name }}</span>
</td>
</tr>
</div>
<div style="width: 50%;float: right;margin-top: -6.8%">
<tr v-if="i % 2 === 1" class="td-row" style="display: flex;">
<td class="trTd" style="width: 20%;"><span>{{ i + 1 }}</span></td>
<td class="trTd" style="width: 80%;"><span class="spanClass">{{ val.name }}</span>
</td>
</tr>
</div>
</div>
<div v-if="buttonFlag5 === 1 && index === 4">
<div style="width: 50%;">
<tr v-if="i % 2 === 0" class="td-row" style="display: flex;"
@click="showModal(val,item.name)">
<td class="trTd" style="width: 20%;"><span>{{ i + 1 }}</span></td>
<td class="trTd" style="width: 80%;"><span class="spanClass">{{ val.name }}</span>
</td>
</tr>
</div>
<div style="width: 50%;float: right;margin-top: -6.8%">
<tr v-if="i % 2 === 1" class="td-row" style="display: flex;"
@click="showModal(val,item.name)">
<td class="trTd" style="width: 20%;"><span>{{ i + 1 }}</span></td>
<td class="trTd" style="width: 80%;"><span class="spanClass">{{ val.name }}</span>
</td>
</tr>
</div>
</div>
</div>
<div class="showDiv"></div>
</div>

View File

@ -2,22 +2,9 @@
<div style="background-color: #eeeeee;min-height: 100vh;">
<!-- 一级按钮-->
<div style="display: flex;padding: 4% 1% 4% 1%;">
<!-- <button disabled style="color: #d9d9d9" type="button" class="btn" size="mini">已有列表</button>-->
<!-- <button type="button" class="btn" style="background-color: #FF00FF;" size="mini">新增-->
<!-- </button>-->
<!-- <button disabled style="color: #d9d9d9" type="button" class="btn" size="mini">综述复制-->
<!-- </button>-->
<!-- <button disabled style="color: #d9d9d9" type="button" class="btn" size="mini">提料-->
<!-- </button>-->
<!-- <button disabled style="color: #d9d9d9" type="button" class="btn" size="mini">2周计划</button>-->
</div>
<!-- <div v-else style="display: flex;padding: 4% 4% 4% 4%;">
<button type="button" class="btnBt" style="background-color: #FFFF00;" size="mini">已有列表</button>
<button type="button" class="btnBt" size="mini">新增立项</button>
<button type="button" class="btnBt" size="mini">计划综述</button>
<button type="button" class="btnBt" size="mini">内容复制</button>
</div>-->
<!-- 搜索条件-->
<div style="width: 80%;padding-left: 10%;font-size: 12px">
<!-- <div class="showDiv" style="padding: 1%"></div>-->
@ -31,65 +18,7 @@
<div class="arrowOpen"></div>
</div>
<div class="showDiv"></div>
<!--<div style="display: flex" @click="showPicker(2)">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 36%">2.地点(all)</div>
<div style="width: 44%">
<input disabled style="text-align: left" placeholder=" "
v-model="dataForm.projectSgdd"></input>
</div>
<div class="arrowOpen"></div>
</div>
<div class="showDiv"></div>
<div style="display: flex">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 36%">3.年份(all)</div>
<div style="width: 44%">
<picker mode="date" :value="dataForm.projectYear" fields="year" @change="bindYearChange">
<view class="picker">
<input disabled placeholder=" " style="text-align: left"
v-model="dataForm.projectYear"></input>
</view>
</picker>
</div>
<div class="arrowOpen"></div>
</div>
<div class="showDiv"></div>
<div style="display: flex" @click="showPicker(5)">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 36%">4.负责工长(all)</div>
<div style="width: 44%">
<input disabled placeholder=" " style="text-align: left"
v-model="dataForm.projectFzgz"></input>
</div>
<div class="arrowOpen"></div>
</div>
<div class="showDiv"></div>
<div style="display: flex" @click="showPicker(6)">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 36%">5.联络员(all)</div>
<div style="width: 44%">
<input disabled placeholder=" " style="text-align: left"
v-model="dataForm.projectLly"></input>
</div>
<div class="arrowOpen"></div>
</div>
<div class="showDiv"></div>
<div style="display: flex" @click="showPicker(3)">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 36%">6.工程类别(all)</div>
<div style="width: 44%">
<input disabled style="text-align: left" placeholder=" "
v-model="dataForm.projectGclb"></input>
</div>
<div class="arrowOpen"></div>
</div>
<div class="showDiv"></div>
<div style="display: flex" @click="showPicker(4)">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 36%">7.导入合同(all)</div>
<div style="width: 44%">
<input disabled style="text-align: left" placeholder=" "
v-model="dataForm.contant"></input>
</div>
<div class="arrowOpen"></div>
</div>
<div class="showDiv"></div>-->
<div style="display: flex">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 36%">2.关键字(all)</div>
<div style="width: 44%">
@ -125,7 +54,7 @@
</div>
<!-- 主数据-->
<div style="padding: 0% 2% 0% 2%;width: 94%;margin-top: 10%">
<div style="background-color: white;border-radius: 1px;padding: 2% 0% 0% 0%;min-height: 10vh;border: 2px solid #FF00FF">
<div style="background-color: white;border-radius: 1px;padding: 0% 0% 0% 0%;min-height: 10vh;border: 2px solid #FF00FF">
<!-- <div style="border-bottom: 2px solid #FF00FF;text-align: center;padding-top: 2%"></div>-->
<!-- <div style="overflow: auto;">
<div style="width: 600px;">-->
@ -133,13 +62,7 @@
<tr class="th-row"
style="display: flex;font-size: 12px;border-bottom: 2px solid #FF00FF;font-weight: bold">
<td class="trTd" style="width: 10%;text-align: center">序号</td>
<!-- <td class="trTd" style="width: 12%;text-align: center">施工年份</td>-->
<!-- <td class="trTd" style="width: 12%;text-align: center">建设单位</td>-->
<td class="trTd" style="width: 38%;text-align: center">立项名称</td>
<td class="trTd" style="width: 37%;text-align: center">施工地点</td>
<!-- <td class="trTd" style="width: 12%;text-align: center">施工进度</td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center">现场照片</td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center">导入合同</td>-->
<td class="trTd" style="width: 75%;text-align: center">立项名称</td>
<td class="trTd" style="width: 14%;text-align: center">操作</td>
</tr>
</div>
@ -148,32 +71,10 @@
@click="selectOneData(item.projectId, item)">
<tr class="td-row" style="display: flex;font-size: 12px">
<td class="trTd" style="width: 10%;text-align: center">{{ indexFa + 1 }}</td>
<!-- <td class="trTd" style="width: 12%;text-align: center">{{ item.projectYear }}</td>-->
<!-- <td class="trTd" style="width: 12%;text-align: center"-->
<!-- v-for="(son,index) in dicJsdwList" :key="index" v-if="son.dictId === item.projectJsdwId">{{-->
<!-- son.name-->
<!-- }}-->
<!-- </td>-->
<!-- <td v-if="item.projectJsdwId === null" class="trTd" style="width: 12%;text-align: center">{{ "暂无" }}-->
<!-- </td>-->
<td v-if="item.projectNewName === null" class="trTd" style="width: 38%;text-align: center">
{{ item.project }}
</td>
<td v-else class="trTd" style="width: 38%;text-align: center">{{ item.projectNewName }}</td>
<td class="trTd" style="width: 37%;text-align: center"
v-for="(son,index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}
</td>
<td v-if="item.projectSgddId === null" class="trTd" style="width: 37%;text-align: center">{{ "暂无" }}
</td>
<!--<td class="trTd" style="width: 12%;text-align: center"
v-for="(son,index) in dicJdList" :key="index" v-if="son.dictId === item.projectSgjdId">{{ son.name }}
</td>
<td v-if="item.projectSgjdId === null" class="trTd" style="width: 12%;text-align: center">{{ "暂无" }}
</td>
<td class="trTd" style="width: 10%;text-align: center">{{ item.projectPhotoConut }}</td>
<td v-if="item.isContant === 0" class="trTd" style="width: 10%;text-align: center">{{ "" }}</td>
<td v-else class="trTd" style="width: 10%;text-align: center">{{ "是" }}</td>-->
<td v-else class="trTd" style="width: 75%;text-align: center">{{ item.projectNewName }}</td>
<td class="trTd" style="width: 14%;text-align: center;" @click="tj(item)">
<div :class="projectId == item.projectId?'bgcolor':''" class="xz">添加</div>
</td>
@ -183,31 +84,10 @@
<div v-else @click="selectOneData(item.projectId, item)">
<tr class="td-row" style="display: flex;font-size: 12px">
<td class="trTd" style="width: 10%;text-align: center">{{ indexFa + 1 }}</td>
<!-- <td class="trTd" style="width: 12%;text-align: center">{{ item.projectYear }}</td>-->
<!-- <td class="trTd" style="width: 12%;text-align: center"-->
<!-- v-for="(son,index) in dicJsdwList" :key="index" v-if="son.dictId === item.projectJsdwId">{{-->
<!-- son.name-->
<!-- }}-->
<!-- </td>-->
<!-- <td v-if="item.projectJsdwId === null" class="trTd" style="width: 12%;text-align: center">{{ "暂无" }}-->
<!-- </td>-->
<td v-if="item.projectNewName === null" class="trTd" style="width: 38%;text-align: center">
{{ item.project }}
</td>
<td v-else class="trTd" style="width: 38%;text-align: center">{{ item.projectNewName }}</td>
<td class="trTd" style="width: 37%;text-align: center"
v-for="(son,index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}
</td>
<td v-if="item.projectSgddId === null" class="trTd" style="width: 37%;text-align: center">{{ "暂无" }}
</td>
<!--<td class="trTd" style="width: 12%;text-align: center"
v-for="(son,index) in dicJdList" :key="index" v-if="son.dictId === item.projectSgjdId">{{ son.name }}
</td>
<td v-if="item.projectSgjdId === null" class="trTd" style="width: 12%;text-align: center">{{ "暂无" }}
</td>
<td class="trTd" style="width: 10%;text-align: center">{{ item.projectPhotoConut }}</td>
<td v-if="item.isContant === 0" class="trTd" style="width: 10%;text-align: center">{{ "" }}</td>
<td v-else class="trTd" style="width: 10%;text-align: center">{{ "是" }}</td>-->
<td v-else class="trTd" style="width: 75%;text-align: center">{{ item.projectNewName }}</td>
<td class="trTd" style="width: 14%;text-align: center;" @click="tj(item)">
<div :class="projectId == item.projectId?'bgcolor':''" class="xz">添加</div>
</td>

View File

@ -9,6 +9,7 @@
<div style="display: flex;min-height: 30px;vertical-align: middle;">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 32%">1.日期</div>
<div style="width: 52%">
<!--收支时间不可进行修改操作否则数据回乱-->
<input disabled placeholder=" " style="text-align: left" v-if="dataOIForm.id"
v-model="dataOIForm.outinDate"></input>
<picker v-else mode="date" :value="dataOIForm.outinDate" fields="day" @change="bindChange($event,1)">
@ -99,9 +100,15 @@
<div style="display: flex;min-height: 30px;vertical-align: middle;">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 32%">1.日期</div>
<div style="width: 52%">
<input disabled placeholder=" " style="text-align: left" v-if="dataOForm.id"
v-model="dataOForm.outTime"></input>
<picker v-else mode="date" :value="dataOForm.outTime" fields="day" @change="bindChange($event,2)">
<!-- <input disabled placeholder=" " style="text-align: left" v-if="dataOForm.id"-->
<!-- v-model="dataOForm.outTime"></input>-->
<!-- <picker v-else mode="date" :value="dataOForm.outTime" fields="day" @change="bindChange($event,2)">-->
<!-- <view class="picker">-->
<!-- <input disabled placeholder="日期"-->
<!-- v-model="dataOForm.outTime"></input>-->
<!-- </view>-->
<!-- </picker>-->
<picker mode="date" :value="dataOForm.outTime" fields="day" @change="bindChange($event,2)">
<view class="picker">
<input disabled placeholder="日期"
v-model="dataOForm.outTime"></input>
@ -167,7 +174,7 @@
<div class="showDiv"></div>
<!-- <div style="display: flex;min-height: 30px;vertical-align: middle;" @click="showPicker(5)">-->
<div style="display: flex;min-height: 30px;vertical-align: middle;"
@click="goToo('/pages/pageoutin/businessoutin/addEdit/importProject/main?title=支出明细-立项归属选取')">
@click="goToo('/pages/pageoutin/businessoutin/addEdit/importProject/main?title=每日支出-立项归属选取')">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 32%">6.立项归属</div>
<div style="width: 52%">
<input disabled placeholder="点击此处选择" style="text-align: left"
@ -176,18 +183,19 @@
<div class="arrowOpen"></div>
</div>
</div>
<div v-if="dataOForm.outType == 141" style="width: 84%;padding-left: 8%;">
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px;vertical-align: middle;" @click="showPicker(6)">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 32%">7.收款人</div>
<div style="width: 52%">
<input disabled placeholder=" " style="text-align: left"
v-model="OSKName"></input>
</div>
<div class="arrowOpen"></div>
</div>
</div>
<div v-else-if="dataOForm.outType == 146 && (authenticName == '侯吉光' || authenticName == '管理员')" style="width: 84%;padding-left: 8%;">
<!-- <div v-if="dataOForm.outType == 141" style="width: 84%;padding-left: 8%;">-->
<!-- <div class="showDiv"></div>-->
<!-- <div style="display: flex;min-height: 30px;vertical-align: middle;" @click="showPicker(6)">-->
<!-- <div style="text-align: left;padding: 1% 0 1% 4%;width: 32%">7.收款人</div>-->
<!-- <div style="width: 52%">-->
<!-- <input disabled placeholder=" " style="text-align: left"-->
<!-- v-model="OSKName"></input>-->
<!-- </div>-->
<!-- <div class="arrowOpen"></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div v-else-if="dataOForm.outType == 146 && (authenticName == '侯吉光' || authenticName == '管理员')" style="width: 84%;padding-left: 8%;">-->
<div v-if="dataOForm.outType == 146 && (authenticName == '侯吉光' || authenticName == '管理员')" style="width: 84%;padding-left: 8%;">
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px;vertical-align: middle;" @click="showPicker(2)">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 32%">7.收款人</div>
@ -198,46 +206,49 @@
<div class="arrowOpen"></div>
</div>
</div>
<div v-else style="width: 84%;padding-left: 8%;">
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px;vertical-align: middle;">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 32%">7.收款人</div>
<div style="width: 52%">
<input placeholder=" " style="text-align: left"
v-model="dataOForm.outPayee"></input>
</div>
</div>
</div>
<!-- <div v-else style="width: 84%;padding-left: 8%;">-->
<!-- <div class="showDiv"></div>-->
<!-- <div style="display: flex;min-height: 30px;vertical-align: middle;">-->
<!-- <div style="text-align: left;padding: 1% 0 1% 4%;width: 32%">7.收款人</div>-->
<!-- <div style="width: 52%">-->
<!-- <input placeholder=" " style="text-align: left"-->
<!-- v-model="dataOForm.outPayee"></input>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div style="width: 84%;padding-left: 8%;">-->
<!-- <div class="showDiv"></div>-->
<!-- <div style="display: flex;min-height: 30px;vertical-align: middle;">-->
<!-- <div style="text-align: left;padding: 1% 0 1% 4%;width: 32%">8.地址</div>-->
<!-- <div style="width: 52%">-->
<!-- <input placeholder=" " style="text-align: left" :disabled="otherZclbDisabled"-->
<!-- v-model="dataOForm.outPayeeAddress"></input>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div style="width: 84%;padding-left: 8%;">-->
<!-- <div class="showDiv"></div>-->
<!-- <div style="display: flex;min-height: 30px;vertical-align: middle;">-->
<!-- <div style="text-align: left;padding: 1% 0 1% 4%;width: 32%">9.电话</div>-->
<!-- <div style="width: 52%">-->
<!-- <input placeholder=" " style="text-align: left" :disabled="otherZclbDisabled"-->
<!-- v-model="dataOForm.outPayeePhone"></input>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div style="width: 84%;padding-left: 8%;">-->
<!-- <div class="showDiv"></div>-->
<!-- <div>-->
<!-- <div style="text-align: left;padding: 1% 0 1% 4%;width: 32%">10.备注</div>-->
<!-- <div>-->
<!-- <textarea maxlength="-1" placeholder=" " style="text-align: left;border: 1px dashed black;width: 99%"-->
<!-- v-model="dataOForm.outRemark"></textarea>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div style="margin-top: 2%" class="showDiv"></div>-->
<!-- </div>-->
<div style="width: 84%;padding-left: 8%;">
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px;vertical-align: middle;">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 32%">8.地址</div>
<div style="width: 52%">
<input placeholder=" " style="text-align: left" :disabled="otherZclbDisabled"
v-model="dataOForm.outPayeeAddress"></input>
</div>
</div>
</div>
<div style="width: 84%;padding-left: 8%;">
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px;vertical-align: middle;">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 32%">9.电话</div>
<div style="width: 52%">
<input placeholder=" " style="text-align: left" :disabled="otherZclbDisabled"
v-model="dataOForm.outPayeePhone"></input>
</div>
</div>
</div>
<div style="width: 84%;padding-left: 8%;">
<div class="showDiv"></div>
<div>
<div style="text-align: left;padding: 1% 0 1% 4%;width: 32%">10.备注</div>
<div>
<textarea maxlength="-1" placeholder=" " style="text-align: left;border: 1px dashed black;width: 99%"
v-model="dataOForm.outRemark"></textarea>
</div>
</div>
<div style="margin-top: 2%" class="showDiv"></div>
</div>
</div>
</div>
@ -289,7 +300,7 @@ export default {
OIWayName: '',
//
outType: '',
//
//
OWayName: '', //
OWayLB: '', //
OProjectName: '', //
@ -322,7 +333,7 @@ export default {
writeUserId: '',//id
approval: '',
},
//form
//form
dataOOldForm: {
id: '',
outTime: '',
@ -397,7 +408,7 @@ export default {
},
showPicker(num) {
//1-/() 2- 3- 4-/() 5-
//1-/() 2- 3- 4-/() 5-
this.pickerValueArray = [];
this.pickerValueDefault = [];
this.flag = num;
@ -505,7 +516,7 @@ export default {
},
pickerConfirm(e) {
//1-/() 2- 3- 4-/()
//1-/() 2- 3- 4-/()
if (this.flag == 1) {
this.OIWayName = e.label;
this.dataOIForm.outinCreditingWay = e.value[0];
@ -707,9 +718,25 @@ export default {
}
})
}*/
if(!this.dataOForm.outTime || !this.dataOForm.outMoney) {
if(!this.dataOForm.outTime) {
wx.showToast({
title: '缺少必填项!',
title: '请选择日期!',
icon: 'none',
duration: 4000//
})
return;
}
if(!this.dataOForm.outMoney) {
wx.showToast({
title: '请填写金额!',
icon: 'none',
duration: 4000//
})
return;
}
if(!this.dataOForm.outType) {
wx.showToast({
title: '请选择支出类别!',
icon: 'none',
duration: 4000//
})
@ -768,7 +795,7 @@ export default {
//
this.OIWayName = ''
this.outType = ''
//
//
this.OWayName = '' //
this.OWayLB = '' //
this.OProjectName = '' //
@ -904,7 +931,7 @@ export default {
}
})*/
}
} else if (params.isLink == '1') { //
} else if (params.isLink == '1') { //
this.mxbShow = true;
//
this.$http.request({
@ -912,9 +939,10 @@ export default {
method: 'get'
}).then(({data}) => {
if(data && data.code == 0){
this.dataOOldForm = {
...data.businessOutlay
}
//
// this.dataOOldForm = {
// ...data.businessOutlay
// }
this.dataOForm = {
...data.businessOutlay
}
@ -1013,6 +1041,7 @@ export default {
width: 25%;
margin-top: 4%;
background-color: #FF00FF;
color: #FFFFFF;
height: 5vh;
border-radius: 5px;
font-size: 14px;

View File

@ -5,7 +5,7 @@
<div>
<div v-if="authenticName !== '侯吉光'">
<div style="text-align: center;margin: 2% 0">
<span class="searchClass">{{ sysYear }}年度收支总结表</span>
<span class="searchClass">{{ sysYear }}年度每日收支总结表</span>
</div>
<!-- 搜索框-->
<div style="display: flex">
@ -26,10 +26,10 @@
</div>
</div>
<div class="showDiv"></div>-->
<div style="float: left">
<button v-if="!lsitAllShow" type="button" size="mini" style="width: 70px;height: 30px;background-color: #FF00FF;color: white" @click="searchZJBBN(true)">展开</button>
<button v-else type="button" size="mini" style="width: 70px;height: 30px;background-color: #FF00FF;color: white" @click="searchZJBBN(false)">收起</button>
</div>
<!-- <div style="float: left">-->
<!-- <button v-if="!lsitAllShow" type="button" size="mini" style="width: 70px;height: 30px;background-color: #FF00FF;color: white" @click="searchZJBBN(true)">展开</button>-->
<!-- <button v-else type="button" size="mini" style="width: 70px;height: 30px;background-color: #FF00FF;color: white" @click="searchZJBBN(false)">收起</button>-->
<!-- </div>-->
</div>
<div style="width: 30%;margin-left: 8%">
<div style="float: left">
@ -39,13 +39,13 @@
</div>
<div style="overflow: auto">
<div style="margin:1% 0 5% 0;width: 800px;">
<div style="margin:1% 0 0% 0;width: 800px;">
<div style="border-bottom: 2px solid #FF00FF;"></div>
<div>
<tr class="th-row"
style="display: flex;font-size: 12px;border-bottom: 2px solid #FF00FF;font-weight: bold">
<td class="trTd" style="width: 4%;border-left: 2px solid #FF00FF;">序号</td>
<td class="trTd" style="width: 10%;">日期</td>
<td class="trTd" style="width: 7%;border-left: 2px solid #FF00FF;">序号</td>
<td class="trTd" style="width: 12%;">日期</td>
<td class="trTd" style="width: 12%;">昨日余额</td>
<td class="trTd" style="width: 12%;">今日收入</td>
<td class="trTd" style="width: 12%;">今日支出</td>
@ -60,8 +60,8 @@
<div v-if="selectOneDataIdZjb === item.id" style="background-color: #ffb4ff"
@click="selectOneData(item.id,1)">
<tr style="display: flex;font-size: 12px;">
<td class="trTd" style="width: 4%;border-left: 2px solid #FF00FF;">{{ index + 1 }}</td>
<td class="trTd" style="width: 10%;">{{ item.outinDate }}</td>
<td class="trTd" style="width: 7%;border-left: 2px solid #FF00FF;">{{ index + 1 }}</td>
<td class="trTd" style="width: 12%;">{{ item.outinDate }}</td>
<td class="trTd" style="width: 12%;">{{ item.outinYdayBalance !== null ? item.outinYdayBalance : '' }}</td>
<td class="trTd" style="width: 12%;">{{ item.outinTdayIncome !== null ? item.outinTdayIncome : '' }}</td>
<td class="trTd" style="width: 12%;">{{ item.outinTdayOut !== null ? item.outinTdayOut : '' }}</td>
@ -87,8 +87,8 @@
</div>
<div v-else @click="selectOneData(item.id,1)">
<tr style="display: flex;font-size: 12px;">
<td class="trTd" style="width: 4%;border-left: 2px solid #FF00FF;">{{ index + 1 }}</td>
<td class="trTd" style="width: 10%;">{{ item.outinDate }}</td>
<td class="trTd" style="width: 7%;border-left: 2px solid #FF00FF;">{{ index + 1 }}</td>
<td class="trTd" style="width: 12%;">{{ item.outinDate }}</td>
<td class="trTd" style="width: 12%;">{{ item.outinYdayBalance !== null ? item.outinYdayBalance : '' }}</td>
<td class="trTd" style="width: 12%;">{{ item.outinTdayIncome !== null ? item.outinTdayIncome : '' }}</td>
<td class="trTd" style="width: 12%;">{{ item.outinTdayOut !== null ? item.outinTdayOut : '' }}</td>
@ -156,34 +156,22 @@
</div>
</div>
<div>
<div style="text-align: center;margin: 10% 0 2% 0"><span class="searchClass">{{ sysYear }}年度支出明细表</span></div>
<view class="paging" style="display: flex;justify-content: space-between;align-items: center">
<view class="page_btn">
<button v-if="frontTotalPage" type="button" size="mini" style="width: 100%;height: 100%;background-color: #FF00FF;color: white" @click="clickTotalFront">上一页</button>
</view>
<view class="page_num">{{thisTotalPages}} {{totalPages}}</view>
<view class="page_btn">
<button v-if="nextTotalPage" type="button" size="mini" style="width: 100%;height: 100%;background-color: #FF00FF;color: white" @click="clickTotalNext">下一页</button>
</view>
</view>
<div style="text-align: center;margin: 10% 0 2% 0"><span class="searchClass">{{ sysYear }}年度每日支出表</span></div>
<!-- 搜索框-->
<div style="display: flex">
<div style="padding-top:1%;width: 70%;margin-left: 5%">
<!--<div class="showDiv"></div>
<div style="font-size: 12px">
<div style="display: flex">
<div style="text-align: left;padding: 1% 0 1% 4%;width:45%">起始位置日期</div>
<div style="width: 50%;;">
<picker mode="date" :value="dataOForm.start" fields="day" @change="bindYearChange($event,4)">
<view class="picker">
<input disabled placeholder=" " style="text-align: left"
v-model="dataOForm.start"></input>
</view>
</picker>
</div>
<div class="arrowOpen"></div>
</div>
</div>
<div class="showDiv"></div>-->
<!-- <div style="float: left">-->
<!-- <button v-if="!lsitAllShowMXBBN" type="button" size="mini" style="width: 70px;height: 30px;background-color: #FF00FF;color: white" @click="searchMXBBN(true)">展开</button>-->
<!-- <button v-else type="button" size="mini" style="width: 70px;height: 30px;background-color: #FF00FF;color: white" @click="searchMXBBN(false)">收起</button>-->
<!-- </div>-->
</div>
<div style="width: 30%;margin-left: 8%">
<!-- <button type="button" size="mini" style="width: 70px;height: 30px;background-color: #FF00FF;color: white" @click="mxbShow = true">新增</button>-->
<button type="button" size="mini" style="width: 70px;height: 30px;background-color: #FF00FF;color: white" @click="addEdit('/pages/pageoutin/businessoutin/addEdit/main?title=支出管理-支出明细新增&&isLink=1')">新增</button>
<button type="button" size="mini" style="width: 70px;height: 30px;background-color: #FF00FF;color: white" @click="addEdit('/pages/pageoutin/businessoutin/addEdit/main?title=支出管理-每日支出新增&&isLink=1')">新增</button>
</div>
</div>
<div style="overflow: auto">
@ -193,17 +181,17 @@
<tr style="display: flex;font-size: 12px;border-bottom: 2px solid #FF00FF;font-weight: bold">
<td class="trTd" style="width: 4%;border-left: 2px solid #FF00FF;">序号</td>
<td class="trTd" style="width: 8%;">日期</td>
<td class="trTd" style="width: 6%;">支出金额</td>
<td class="trTd" style="width: 20%;">内容</td>
<td class="trTd" style="width: 6%;">执行人</td>
<td class="trTd" style="width: 6%;">支付方式</td>
<td class="trTd" style="width: 6%;">支出类别</td>
<td class="trTd" style="width: 10%;">立项归属</td>
<td class="trTd" style="width: 6%;">收款人</td>
<td class="trTd" style="width: 15%;">地址</td>
<td class="trTd" style="width: 8%;">电话</td>
<td class="trTd" style="width: 15%;">备注</td>
<td class="trTd" style="width: 5%;border-right: 2px solid #FF00FF;">操作</td>
<td class="trTd" style="width: 8%;">支出金额</td>
<td class="trTd" style="width: 25%;">内容</td>
<td class="trTd" style="width: 7%;">执行人</td>
<td class="trTd" style="width: 7%;">支付方式</td>
<td class="trTd" style="width: 10%;">支出类别</td>
<td class="trTd" style="width: 25%;">立项归属</td>
<td v-if="authenticName == '侯吉光' || authenticName == '管理员'" class="trTd" style="width: 6%;">收款人</td>
<!-- <td class="trTd" style="width: 15%;">地址</td>-->
<!-- <td class="trTd" style="width: 8%;">电话</td>-->
<!-- <td class="trTd" style="width: 15%;">备注</td>-->
<td class="trTd" style="width: 6%;border-right: 2px solid #FF00FF;">操作</td>
</tr>
</div>
<div v-for="(item,index) in mxbList" :key="index">
@ -212,33 +200,32 @@
<tr style="display: flex;font-size: 12px;">
<td class="trTd" style="width: 4%;border-left: 2px solid #FF00FF;">{{ index + 1 }}</td>
<td class="trTd" style="width: 8%;">{{ item.outTime }}</td>
<td class="trTd" style="width: 6%;">{{ item.outMoney !== null ? item.outMoney : ''}}</td>
<td class="trTd" style="width: 20%;">{{ item.outNr !== null ? item.outNr : ''}}</td>
<td class="trTd" style="width: 6%;">{{ item.writeUserStr !== null ? item.writeUserStr : '' }}</td>
<td class="trTd" style="width: 6%;">
<td class="trTd" style="width: 8%;">{{ item.outMoney !== null ? item.outMoney : ''}}</td>
<td class="trTd" style="width: 25%;">{{ item.outNr !== null ? item.outNr : ''}}</td>
<td class="trTd" style="width: 7%;">{{ item.writeUserStr != null ? item.writeUserStr : '' }}</td>
<td class="trTd" style="width: 7%;">
<span v-for="(itemCh,i) in payList" :key="i" v-if="itemCh.dictId === item.outWay">{{
itemCh.name
}}</span>
</td>
<td class="trTd" style="width: 6%;">
<td class="trTd" style="width: 10%;">
<span v-for="(itemCh,i) in expenseList" :key="i" v-if="itemCh.dictId === item.outType" style="font-weight: bold">
{{itemCh.name }}
</span>
</td>
<td class="trTd" style="width: 10%;">
<td class="trTd" style="width: 25%;">
<div v-for="(itemCh,i) in projectList" :key="i" v-if="itemCh.projectId === item.outProject">
<span v-if="itemCh.projectNewName !== null">{{ itemCh.projectNewName }}</span>
<span v-else>{{ itemCh.project }}</span>
</div>
</td>
<td class="trTd" style="width: 6%;">
<span>{{ item.outPayee ? item.outPayee:' ' }}</span></td>
<td class="trTd" style="width: 15%;">{{ item.outPayeeAddress !== null ? item.outPayeeAddress : '' }}</td>
<td class="trTd" style="width: 8%;">{{ item.outPayeePhone !== null ? item.outPayeePhone : '' }}</td>
<td class="trTd" style="width: 15%;">{{ item.outRemark !== null ? item.outRemark : '' }}</td>
<td class="trTd" style="width: 5%;border-right: 2px solid #FF00FF;">
<td v-if="authenticName == '侯吉光' || authenticName == '管理员'" class="trTd" style="width: 6%;"><span>{{ item.outPayee ? item.outPayee:' ' }}</span></td>
<!-- <td class="trTd" style="width: 15%;">{{ item.outPayeeAddress !== null ? item.outPayeeAddress : '' }}</td>-->
<!-- <td class="trTd" style="width: 8%;">{{ item.outPayeePhone !== null ? item.outPayeePhone : '' }}</td>-->
<!-- <td class="trTd" style="width: 15%;">{{ item.outRemark !== null ? item.outRemark : '' }}</td>-->
<td class="trTd" style="width: 6%;border-right: 2px solid #FF00FF;">
<span v-if="item.approval != 2"
@click="addEdit('/pages/pageoutin/businessoutin/addEdit/main?title=支出管理-支出明细修改&&id='+item.id+'&&isLink=1')">修改</span>
@click="addEdit('/pages/pageoutin/businessoutin/addEdit/main?title=支出管理-每日支出修改&&id='+item.id+'&&isLink=1')">修改</span>
</td>
</tr>
</div>
@ -246,100 +233,48 @@
<tr style="display: flex;font-size: 12px;">
<td class="trTd" style="width: 4%;border-left: 2px solid #FF00FF;">{{ index + 1 }}</td>
<td class="trTd" style="width: 8%;">{{ item.outTime }}</td>
<td class="trTd" style="width: 6%;">{{ item.outMoney !== null ? item.outMoney : '' }}</td>
<td class="trTd" style="width: 20%;">{{ item.outNr !== null ? item.outNr : '' }}</td>
<td class="trTd" style="width: 6%;">{{ item.writeUserStr !== null ? item.writeUserStr : '' }}</td>
<td class="trTd" style="width: 6%;">
<td class="trTd" style="width: 8%;">{{ item.outMoney !== null ? item.outMoney : '' }}</td>
<td class="trTd" style="width: 25%;">{{ item.outNr !== null ? item.outNr : '' }}</td>
<td class="trTd" style="width: 7%;">{{ item.writeUserStr != null ? item.writeUserStr : '' }}</td>
<td class="trTd" style="width: 7%;">
<span v-for="(itemCh,i) in payList" :key="i" v-if="itemCh.dictId === item.outWay">
{{itemCh.name}}
</span>
</td>
<td class="trTd" style="width: 6%;">
<td class="trTd" style="width: 10%;">
<span v-for="(itemCh,i) in expenseList" :key="i" v-if="itemCh.dictId === item.outType" style="font-weight: bold">
{{itemCh.name }}
</span>
</td>
<td class="trTd" style="width: 10%;">
<td class="trTd" style="width: 25%;">
<div v-for="(itemCh,i) in projectList" :key="i" v-if="itemCh.projectId === item.outProject">
<span v-if="itemCh.projectNewName !== null">{{ itemCh.projectNewName }}</span>
<span v-else>{{ itemCh.project }}</span>
</div>
</td>
<td class="trTd" style="width: 6%;">
<span>{{ item.outPayee ? item.outPayee:' ' }}</span></td>
<td class="trTd" style="width: 15%;">{{ item.outPayeeAddress !== null ? item.outPayeeAddress : '' }}</td>
<td class="trTd" style="width: 8%;">{{ item.outPayeePhone !== null ? item.outPayeePhone : '' }}</td>
<td class="trTd" style="width: 15%;">{{ item.outRemark !== null ? item.outRemark : '' }}</td>
<td class="trTd" style="width: 5%;border-right: 2px solid #FF00FF;">
<td v-if="authenticName == '侯吉光' || authenticName == '管理员'" class="trTd" style="width: 6%;"><span>{{ item.outPayee ? item.outPayee:' ' }}</span></td>
<!-- <td class="trTd" style="width: 15%;">{{ item.outPayeeAddress !== null ? item.outPayeeAddress : '' }}</td>-->
<!-- <td class="trTd" style="width: 8%;">{{ item.outPayeePhone !== null ? item.outPayeePhone : '' }}</td>-->
<!-- <td class="trTd" style="width: 15%;">{{ item.outRemark !== null ? item.outRemark : '' }}</td>-->
<td class="trTd" style="width: 6%;border-right: 2px solid #FF00FF;">
<span v-if="item.approval != 2"
@click="addEdit('/pages/pageoutin/businessoutin/addEdit/main?title=支出管理-支出明细修改&&id='+item.id+'&&isLink=1')">修改</span>
@click="addEdit('/pages/pageoutin/businessoutin/addEdit/main?title=支出管理-每日支出修改&&id='+item.id+'&&isLink=1')">修改</span>
</td>
</tr>
</div>
</div>
<!-- <div v-if="!hdsMxList.length > 0" style="text-align: left;font-size: 12px;padding-left:12%">-->
<!-- 暂无数据-->
<!-- </div>-->
<div v-if="mxbShow">
<tr style="display: flex;font-size: 12px;">
<td class="trTd" style="width: 4%;"><span>{{ mxbList.length + 1 }}</span></td>
<td class="trTd" style="width: 8%;">
<picker mode="date" :value="dataOForm.outTime" fields="day" @change="bindYearChange($event,2)">
<view class="picker">
<input disabled placeholder="日期" style=""
v-model="dataOForm.outTime"></input>
</view>
</picker>
</td>
<td class="trTd" style="width: 6%;">
<input v-model="dataOForm.outMoney" placeholder="支出金额"></input>
</td>
<td class="trTd" style="width: 10%;">
<input placeholder="内容" v-model="dataOForm.outNr"></input>
</td>
<td class="trTd" style="width: 6%;" @click="showPicker(4)">
<input disabled placeholder="支付方式" v-model="dataOForm.outWayName"></input>
</td>
<td class="trTd" style="width: 6%;" @click="showPicker(3)">
<input disabled placeholder="支出类别" v-model="dataOForm.outTypeName"></input>
</td>
<td class="trTd" style="width: 10%;" @click="showPicker(5)">
<input disabled placeholder="立项归属" v-model="dataOForm.outProjectName"></input>
</td>
<td v-if="dataOForm.outType === 141" class="trTd" style="width: 6%;"
@click="showPicker(6)">
<input disabled placeholder="收款人" v-model="dataOForm.outPayeeName"></input>
</td>
<td v-else-if="dataOForm.outType === 146 && authenticName === '侯吉光'" class="trTd" style="width: 6%;"
@click="showPicker(2)">
<input disabled placeholder="收款人" v-model="dataOForm.outPayeeName"></input>
</td>
<td v-else class="trTd" style="width: 6%;">
<input placeholder="收款人" v-model="dataOForm.outPayee"></input>
</td>
<td class="trTd" style="width: 15%;">
<input placeholder="地址" v-model="dataOForm.outPayeeAddress"></input>
</td>
<td class="trTd" style="width: 8%;">
<input placeholder="电话" v-model="dataOForm.outPayeePhone"></input>
</td>
<td class="trTd" style="width: 20%;">
<input placeholder="备注" v-model="dataOForm.outRemark"></input>
</td>
</tr>
</div>
<div style="border-bottom: 2px solid #FF00FF;"></div>
</div>
</div>
<view class="paging" style="display: flex;justify-content: space-between;align-items: center">
<view class="page_btn">
<!-- <view class="up_page" v-if="frontPage" @click="clickFront">上一页</view>-->
<button type="button" size="mini" style="width: 100%;height: 100%;background-color: #FF00FF;color: white" @click="clickFront">上一页</button>
<button v-if="frontPage" type="button" size="mini" style="width: 100%;height: 100%;background-color: #FF00FF;color: white" @click="clickFront">上一页</button>
</view>
<view class="page_num">{{thisPages}} {{pages}}</view>
<view class="page_btn">
<!-- <view class="down_page" v-if="nextPage" @click="clickNext">下一页</view>-->
<button type="button" size="mini" style="width: 100%;height: 100%;background-color: #FF00FF;color: white" @click="clickNext">下一页</button>
<button v-if="nextPage" type="button" size="mini" style="width: 100%;height: 100%;background-color: #FF00FF;color: white" @click="clickNext">下一页</button>
</view>
</view>
<div style="text-align: center;"></div>
@ -390,7 +325,7 @@ export default {
writeUserId: '',//id
approval: '',
},
//form
//form
dataOForm: {
start: '',//
outTime: '',
@ -420,7 +355,14 @@ export default {
pickerValueArray: [],
pickerValueDefault: [],
flag: 0,
//
//
frontTotalPage: false,// truefalse
nextTotalPage: false,// truefalse
totalPages: 0,//
thisTotalPages: 1,//
totalRows: 10,//
totalTotal: 0,//
//
frontPage: false,// truefalse
nextPage: false,// truefalse
pages: 0,//
@ -438,16 +380,16 @@ export default {
},
methods: {
addEdit(url) {
console.log("路由"+url);
// console.log(""+url);
wx.navigateTo({
url: url
})
},
//--------------------------- 线 --------------------------
bindYearChange: function (e, num) {
console.log(typeof e.mp.detail.value.substring(0, 4));
console.log(typeof this.sysYear);
console.log(this.sysYear.toString() === e.mp.detail.value.substring(0, 4));
// console.log(typeof e.mp.detail.value.substring(0, 4));
// console.log(typeof this.sysYear);
// console.log(this.sysYear.toString() === e.mp.detail.value.substring(0, 4));
if (num === 1 || num === 2) {
}
@ -484,7 +426,7 @@ export default {
},
showPicker(num) {
//1-/() 2- 3- 4-/() 5-
//1-/() 2- 3- 4-/() 5-
this.pickerValueArray = [];
this.pickerValueDefault = [];
this.flag = num;
@ -569,7 +511,7 @@ export default {
},
pickerConfirm(e) {
//1-/() 2- 3- 4-/()
//1-/() 2- 3- 4-/()
if (this.flag === 1) {
this.dataOIForm.outinCreditingWayName = e.label;
this.dataOIForm.outinCreditingWay = e.value[0];
@ -702,11 +644,11 @@ export default {
method: 'get',
params: this.$http.adornParams({
"start": this.dataOIForm.start,
"writeUserId": this.userId
"writeUserId": this.userId,
})
}).then(({data}) => {
// console.log(data);
console.log("asdasdasdasd"+this.authenticName);
// console.log("asdasdasdasd"+this.authenticName);
if (data && data.code === 0) {
if (this.authenticName === '管理员') {
data.page.forEach((item) => {
@ -829,26 +771,49 @@ export default {
});
this.$forceUpdate();
},
//
clickTotalNext() {
this.thisTotalPages = this.thisTotalPages + 1;
this.searchZJBBN()
},
//
clickTotalFront() {
this.thisTotalPages = this.thisTotalPages - 1;
this.searchZJBBN()
},
//
searchZJBBN(lsitAllShow) {
searchZJBBN() {
//
this.zjbList = [];
// console.log("asdasdasdasd"+this.authenticName);
this.$http.request({
url: this.$http.adornUrl('/business/businessoutlayincome/listNowTime'),
// url: this.$http.adornUrl('/business/businessoutlayincome/list'),
url: this.$http.adornUrl('/business/businessoutlayincome/list'),
method: 'get',
params: this.$http.adornParams({
"writeUserId": this.userId
// "page": this.thisPages,
// "limit": this.rows,
"writeUserId": this.userId,
"page": this.thisTotalPages,
"limit": this.totalRows,
})
}).then(({data}) => {
// console.log(data);
console.log("asdasdasdasd"+this.authenticName);
if (data && data.code === 0) {
this.totalTotal = data.page.totalCount;
this.totalPages = data.page.totalPage;
if(this.totalPages > 1){
this.frontTotalPage = true
this.nextTotalPage = true
}else{
this.frontTotalPage = false
this.nextTotalPage = false
}
if(data.page.currPage === data.page.totalPage){
this.nextTotalPage = false
}
if(data.page.currPage === 1){
this.frontTotalPage = false
}
if (this.authenticName === '管理员') {
data.page.forEach((item) => {
data.page.list.forEach((item) => {
if (item.outinCreditingWay !== null) {
this.recipientList.forEach((itemCH)=>{
if(itemCH.dictId.toString() === item.outinCreditingWay){
@ -864,15 +829,9 @@ export default {
})
}
this.zjbList.push(item);
this.lsitAllShow = lsitAllShow;
if(!lsitAllShow){
console.log(lsitAllShow)
this.zjbList = this.zjbList.slice(0,3)
}
})
} else {
data.page.forEach((item) => {
data.page.list.forEach((item) => {
//
if (item.writeUserId === this.userId) {
if (item.outinCreditingWay !== null) {
@ -883,13 +842,6 @@ export default {
})
}
this.zjbList.push(item);
this.lsitAllShow = lsitAllShow;
if(!lsitAllShow){
console.log(lsitAllShow)
if(this.zjbList.length >= 3){
this.zjbList = this.zjbList.slice(0,3)
}
}
}
})
}
@ -926,7 +878,7 @@ export default {
"limit": this.rows,
})
}).then(({data}) => {
console.log(data);
// console.log(data);
if (data && data.code === 0) {
if (this.authenticName === '管理员') {
// data.page.forEach((item) => {
@ -973,7 +925,7 @@ export default {
if(data.page.currPage === 1){
this.frontPage = false
}
console.log(this.mxbList);
// console.log(this.mxbList);
} else if (this.authenticName === '侯吉光') {
// data.page.forEach((item) => {
// if (item.writeUserId === this.userId) {
@ -1093,7 +1045,7 @@ export default {
}
},
handleReachBottom(){
console.log("来吧")
// console.log("")
// const {pageNum, totalPage} = this.data
// //
// if(pageNum+1 > totalPage) return
@ -1103,7 +1055,19 @@ export default {
}
},
onLoad () {
this.frontTotalPage = false;// truefalse
this.nextTotalPage = false;// truefalse
this.totalPages = 0;//
this.thisTotalPages = 1;//
this.totalRows = 10;//
this.totalTotal = 0;//
//
this.frontPage = false;// truefalse
this.nextPage = false;// truefalse
this.pages = 0;//
this.thisPages = 1;//
this.rows = 10;//
this.total = 0;//
},
onShow() {
wx.setNavigationBarTitle({
@ -1197,7 +1161,7 @@ export default {
this.userId = data.user.userId;
//
this.searchZJBBN();
//
//
this.searchMXBBN();
}
});

View File

@ -21,20 +21,20 @@
<span v-for="(itemDic,index) in dicJsdwList" :key="index"
v-if="itemChildren.projectJsdwId == itemDic.dictId">{{ itemDic.name }}</span><br>
</span>
<span> 施工地点
<span v-for="(itemDic,index) in dicSgddList" :key="index"
v-if="itemChildren.projectSgddId == itemDic.dictId">{{ itemDic.name }}</span><br>
</span>
<span> 年份{{ itemChildren.projectYear ? itemChildren.projectYear : "" }}<br></span>
<span>开工时间{{ itemChildren.projectStart? itemChildren.projectStart : "" }}<br></span>
<span> 竣工时间{{ itemChildren.projectEnd ? itemChildren.projectEnd : "" }}<br></span>
<span> 施工进度
<!-- <span> 施工地点-->
<!-- <span v-for="(itemDic,index) in dicSgddList" :key="index"-->
<!-- v-if="itemChildren.projectSgddId == itemDic.dictId">{{ itemDic.name }}</span><br>-->
<!-- </span>-->
<span> 年份{{ itemChildren.projectYear ? itemChildren.projectYear : "" }}<br></span>
<span>开工时间{{ itemChildren.projectStart? itemChildren.projectStart : "" }}<br></span>
<span> 竣工时间{{ itemChildren.projectEnd ? itemChildren.projectEnd : "" }}<br></span>
<span> 施工进度
<span v-for="(itemDic,index) in dicSgjdList" :key="index"
v-if="itemChildren.projectSgjdId == itemDic.dictId">{{ itemDic.name }}</span><br>
</span>
<span> 负责工长{{ itemChildren.fzgz ? itemChildren.fzgz : "" }}<br></span>
<span> 联络员{{ itemChildren.lly ? itemChildren.lly : "" }}<br></span>
<span> 工程类别
<span> 负责工长{{ itemChildren.fzgz ? itemChildren.fzgz : "" }}<br></span>
<span> 联络员{{ itemChildren.lly ? itemChildren.lly : "" }}<br></span>
<span> 工程类别
<span v-for="(itemDic,index) in dicGclbList" :key="index"
v-if="itemChildren.projectGclbId == itemDic.dictId">{{ itemDic.name }}</span><br>
</span>
@ -111,30 +111,35 @@
<div class="showDivDo" style="padding: 1%"></div>
<div>
<div style="padding: 1% 0">
<span>1施工内容输入</span>
<div>1内容</div>
<div style="font-size: 11px">每日完成的工程量(用数字表达)进度百分比及待完成的工程内容</div>
</div>
<div>
<textarea :disabled="approvalShow" v-model="dataForm.planSgSummary" placeholder="主要写出施工内容,延续以前内容即可;" maxlength="4000"
<textarea :disabled="approvalShow" v-model="dataForm.planSgSummary" placeholder="每日完成的工程量,进度百分比及待完成的工程内容" maxlength="4000"
style="border: 1px dashed black;padding-top: 1%;width:100%"></textarea>
</div>
</div>
<div>
<div style="padding: 10% 0 1% 0">
<span>2材料</span>
<div>2材料机械及工具</div>
<div style="font-size: 11px">需不落项且具体到数量</div>
</div>
<div>
<textarea :disabled="approvalShow" v-model="dataForm.planCl" placeholder="主要涉及到材料及工具,若没有想到,可以空着不写" maxlength="4000"
<textarea :disabled="approvalShow" v-model="dataForm.planCl" placeholder="主要涉及到材料、机械及工具,具体到使用数量,若没有想到,可以空着不写" maxlength="4000"
style="border: 1px dashed black;padding-top: 1%;width:100%"></textarea>
</div>
</div>
<div>
<div style="padding: 10% 0 1% 0">
<span>3机械</span>
<div>3自检总结</div>
<div style="font-size: 11px">①计划派工不为1的情况说明(多数为离职未更改请假临时换人施工项目更改等)</div>
<div style="font-size: 11px">②实际派工不为1的情况说明(多数为加班或者突发情况临时请假等)</div>
<div style="font-size: 11px">③完成工程量与人员匹配情况是否正常若不正常给予情况说明</div>
</div>
<div>
<textarea :disabled="approvalShow" v-model="dataForm.planJx" placeholder="主要涉及机械使用,若没有想到,可以空着不写" maxlength="4000"
<textarea :disabled="approvalShow" v-model="dataForm.planJx" placeholder="主要涉及计划派工、实际派工、工程量匹配,若没有想到,可以空着不写" maxlength="4000"
style="border: 1px dashed black;padding-top: 1%;width:100%"></textarea>
</div>
</div>

View File

@ -1,22 +1,5 @@
<template>
<div style="background-color: #eeeeee;min-height: 100vh;">
<!-- 一级按钮-->
<!-- <div style="display: flex;padding: 4% 1% 4% 1%;">-->
<!-- <button disabled style="color: #d9d9d9" type="button" class="btn" size="mini">已有列表</button>-->
<!-- <button type="button" class="btn" style="background-color: #fde866;" size="mini">新增-->
<!-- </button>-->
<!-- <button disabled style="color: #d9d9d9" type="button" class="btn" size="mini">综述复制-->
<!-- </button>-->
<!-- <button disabled style="color: #d9d9d9" type="button" class="btn" size="mini">提料-->
<!-- </button>-->
<!-- <button disabled style="color: #d9d9d9" type="button" class="btn" size="mini">2周计划</button>-->
<!-- </div>-->
<!-- <div v-else style="display: flex;padding: 4% 4% 4% 4%;">
<button type="button" class="btnBt" style="background-color: #FFFF00;" size="mini">已有列表</button>
<button type="button" class="btnBt" size="mini">新增立项</button>
<button type="button" class="btnBt" size="mini">计划综述</button>
<button type="button" class="btnBt" size="mini">内容复制</button>
</div>-->
<!-- 搜索条件-->
<div style="width: 80%;padding-left: 10%;font-size: 12px">
@ -76,8 +59,7 @@
style="display: flex;font-size: 12px;border: 2px solid #FDE866;font-weight: bold">
<td class="trTd" style="width: 10%;text-align: center">序号</td>
<td class="trTd" style="width: 40%;text-align: center">立项名称</td>
<td class="trTd" style="width: 40%;text-align: center">施工地点</td>
<td class="trTd" style="width: 80%;text-align: center">立项名称</td>
<td class="trTd" style="width: 10%;text-align: center">操作</td>
</tr>
@ -87,15 +69,10 @@
@click="selectOneData(item.projectId)">
<tr class="td-row" style="display: flex;font-size: 12px">
<td class="trTd" style="width: 10%;text-align: center">{{ indexFa + 1 }}</td>
<td v-if="item.projectNewName === null" class="trTd" style="width: 40%;text-align: center">
<td v-if="item.projectNewName === null" class="trTd" style="width: 80%;text-align: center">
{{ item.project }}
</td>
<td v-else class="trTd" style="width: 40%;text-align: center">{{ item.projectNewName }}</td>
<td class="trTd" style="width: 40%;text-align: center"
v-for="(son,index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}
</td>
<td v-if="item.projectSgddId === null" class="trTd" style="width: 40%;text-align: center">{{ "暂无" }}
</td>
<td v-else class="trTd" style="width: 80%;text-align: center">{{ item.projectNewName }}</td>
<td class="trTd" style="width: 10%;text-align: center;" @click="tj(item.projectId)">
<div :class="projectId == item.projectId?'bgcolor':''" class="xz">添加</div>
</td>
@ -106,15 +83,10 @@
<tr class="td-row" style="display: flex;font-size: 12px">
<td class="trTd" style="width: 10%;text-align: center">{{ indexFa + 1 }}</td>
<td v-if="item.projectNewName === null" class="trTd" style="width: 40%;text-align: center">
<td v-if="item.projectNewName === null" class="trTd" style="width: 80%;text-align: center">
{{ item.project }}
</td>
<td v-else class="trTd" style="width: 40%;text-align: center">{{ item.projectNewName }}</td>
<td class="trTd" style="width: 40%;text-align: center"
v-for="(son,index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}
</td>
<td v-if="item.projectSgddId === null" class="trTd" style="width: 40%;text-align: center">{{ "暂无" }}
</td>
<td v-else class="trTd" style="width: 80%;text-align: center">{{ item.projectNewName }}</td>
<td class="trTd" style="width: 10%;text-align: center;" @click="tj(item.projectId)">
<div :class="projectId == item.projectId?'bgcolor':''" class="xz">添加</div>

View File

@ -5,7 +5,7 @@
<div style="width: 80%;padding-left: 10%;font-size: 12px">
<div class="showDiv"></div>
<div style="display: flex; height: 30px" @click="showPicker(1)">
<div style="text-align: left;padding: 2% 0 1% 4%;width:43%">1&nbsp;(all)</div>
<div style="text-align: left;padding: 2% 0 1% 4%;width:43%">1&nbsp;(all)</div>
<div style="width: 37%; padding-top: 1%">
<input disabled style="text-align: left" placeholder=" " v-model="wz"></input>
</div>
@ -15,21 +15,21 @@
:pickerValueArray="pickerValueArrayWz"
:pickerValueDefault='pickerValueDefaultWz'
@onConfirm="pickerConfirmWz"></mpvue-picker>
<div class="showDiv"></div>
<div style="display: flex; height: 30px" @click="showPicker(4)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 43%">2&nbsp;工种(all)</div>
<div style="width: 37%; padding-top: 1%">
<input disabled style="text-align: left" placeholder=" " v-model="gz"></input>
</div>
<div class="arrowOpen"></div>
</div>
<!-- <div class="showDiv"></div>-->
<!-- <div style="display: flex; height: 30px" @click="showPicker(4)">-->
<!-- <div style="text-align: left;padding: 2% 0 1% 4%;width: 43%">2&nbsp;工种(all)</div>-->
<!-- <div style="width: 37%; padding-top: 1%">-->
<!-- <input disabled style="text-align: left" placeholder=" " v-model="gz"></input>-->
<!-- </div>-->
<!-- <div class="arrowOpen"></div>-->
<!-- </div>-->
<div class="showDiv"></div>
<mpvue-picker v-if="isShow" ref="mpvuePickerGz"
:pickerValueArray="pickerValueArrayGz"
:pickerValueDefault='pickerValueDefaultGz'
@onConfirm="pickerConfirmGz"></mpvue-picker>
<div style="display: flex; height: 30px" @click="showPicker(5)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 43%">3&nbsp;是否保险(all)</div>
<div style="text-align: left;padding: 2% 0 1% 4%;width: 43%">2&nbsp;是否保险(all)</div>
<div style="width: 37%; padding-top: 1%">
<input disabled style="text-align: left" placeholder=" " v-model="bx"></input>
</div>
@ -42,7 +42,7 @@
@onConfirm="pickerConfirmBX"></mpvue-picker>
<div style="display: flex; height: 30px">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 40%">4&nbsp;关键字(all)</div>
<div style="text-align: left;padding: 2% 0 1% 4%;width: 40%">3&nbsp;关键字(all)</div>
<div style="width: 40%; padding-top: 1%">
<input style="text-align: left" v-model="gjz" @input ="searchList"></input>
</div>
@ -58,43 +58,39 @@
<div>
<tr class="th-row" style="display: flex;font-size: 12px;border: 2px solid #FDE866;font-weight: bold;min-height: 20px">
<td class="trTd" style="width: 10%;text-align: center">序号</td>
<td class="trTd" style="width: 15%;text-align: center">姓名</td>
<td class="trTd" style="width: 30%;text-align: center">姓名</td>
<!-- <importWorker class="trTd" style="width: 16%;text-align: center">位置</importWorker>-->
<td class="trTd" style="width: 20%;text-align: center"></td>
<td class="trTd" style="width: 15%;text-align: center">工种</td>
<td class="trTd" style="width: 20%;text-align: center"></td>
<!-- <td class="trTd" style="width: 15%;text-align: center">工种</td>-->
<td class="trTd" style="width: 12%;text-align: center">工时</td>
<!-- <td class="trTd" style="width: 10%;text-align: center">年龄</td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center">保险</td>-->
<td class="trTd" style="width: 25%;text-align: center">操作</td>
</tr>
</div>
<div v-for="(item,indexList) in dataList" :key="indexList" style="border-left: 2px solid #FDE866;border-right: 2px solid #FDE866;">
<tr class="td-row" style="display: flex;font-size: 12px">
<td class="trTd" style="width: 10%;text-align: center">{{ indexList + 1 }}</td>
<td class="trTd" style="width: 15%;text-align: center">{{ item.name }}</td>
<td class="trTd" style="width: 30%;text-align: center">{{ item.name }}</td>
<td class="trTd" style="width: 20%;text-align: center"
v-for="(zw,index) in dataListDic" :key="index" v-if="zw.dictId === item.workId">
{{ zw.name }}
</td>
<td class="trTd" style="width: 20%;text-align: center"
v-if="item.workId === '' || item.workId === null || item.workId === undefined">
无职位
</td>
<td class="trTd" style="width: 15%;text-align: center"
v-for="(jb,index) in pickerValueArrayGz" :key="index" v-if="jb.value === item.jobId">
{{ jb.label }}
</td>
<td class="trTd" style="width: 15%;text-align: center"
v-if="item.jobId === '' || item.jobId === null || item.jobId === undefined">
暂无
无岗位
</td>
<!-- <td class="trTd" style="width: 15%;text-align: center"-->
<!-- v-for="(jb,index) in pickerValueArrayGz" :key="index" v-if="jb.value === item.jobId">-->
<!-- {{ jb.label }}-->
<!-- </td>-->
<!-- <td class="trTd" style="width: 15%;text-align: center"-->
<!-- v-if="item.jobId === '' || item.jobId === null || item.jobId === undefined">-->
<!-- 暂无-->
<!-- </td>-->
<td class="trTd" style="width: 12%;text-align: center">
{{workerDay[item.name]*2? workerDay[item.name]: 0}}
</td>
<!-- <td class="trTd" style="width: 10%;text-align: center">{{ item.age === null ? '暂无' : item.age }}</td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center" v-else></td>-->
<!-- <td class="trTd" style="width: 12%;text-align: center;" @click="tj(item)">-->
<td class="trTd" style="width: 25%;text-align: center;" >
<div class="div">
<span class="span1" @click="tj(item)">+</span>

View File

@ -7,9 +7,9 @@
<button v-else type="button" class="btn" size="mini">未总结</button>
<button v-if="dataList.length!=0 && dataList[0].type==1" type="button" class="btn" style="background-color: #fde866;" size="mini">完工总结</button>
<button v-else type="button" class="btn" size="mini">完工总结</button>
<button v-if="tlShow" type="button" class="btn" size="mini" @click="addEdit('/pages/pageplan/businessplan/tLiao/main')">提料
<button v-if="uncommittedShow" type="button" class="btn" size="mini" @click="addEdit('/pages/pageplan/businessplan/uncommitted/main')">状态查询
</button>
<button v-else disabled style="color: #d9d9d9" type="button" class="btn" size="mini">提料</button>
<button v-else disabled style="color: #d9d9d9" type="button" class="btn" size="mini">状态查询</button>
<button v-if="twoShow" type="button" class="btn" size="mini" @click="addEdit('/pages/pageplan/businessplan/twoWeekPlan/main')">2周计划
</button>
<button v-else disabled style="color: #d9d9d9" type="button" class="btn" size="mini">2周计划</button>
@ -29,33 +29,47 @@
</div>
<div style="padding-left: 1%;padding-right: 1%">
<tr style="display: flex;font-size: 5px;font-weight: bold;border: 2px solid #FDE866;">
<td class="th-row" style="width: 7%;text-align: center">序号</td>
<td class="th-row" style="width: 12%;text-align: center">姓名</td>
<td class="th-row" style="width: 7%;text-align: center;padding-right: 8%">状态</td>
<!-- <td class="th-row" style="width: 7%;text-align: center">序号</td>-->
<!-- <td class="th-row" style="width: 12%;text-align: center">姓名</td>-->
<!-- <td class="th-row" style="width: 7%;text-align: center;padding-right: 8%">状态</td>-->
<td class="th-row" style="width: 7%;text-align: center">序号</td>
<td class="th-row" style="width: 12%;text-align: center">姓名</td>
<td class="th-row" style="width: 7%;text-align: center;padding-right: 8%">状态</td>
<!-- <td class="th-row" style="width: 7%;text-align: center">序号</td>-->
<!-- <td class="th-row" style="width: 12%;text-align: center">姓名</td>-->
<!-- <td class="th-row" style="width: 7%;text-align: center;padding-right: 8%">状态</td>-->
<td class="th-row" style="width: 7%;text-align: center">序号</td>
<td class="th-row" style="width: 12%;text-align: center">姓名</td>
<td class="th-row" style="width: 7%;text-align: center;padding-right: 2%">状态</td>
<!-- <td class="th-row" style="width: 7%;text-align: center">序号</td>-->
<!-- <td class="th-row" style="width: 12%;text-align: center">姓名</td>-->
<!-- <td class="th-row" style="width: 7%;text-align: center;padding-right: 2%">状态</td>-->
<td class="th-row" style="width: 7%;text-align: center;padding:0;">序号</td>
<td class="th-row" style="width: 35%;text-align: center;padding:0;">姓名</td>
<td class="th-row" style="width: 8%;text-align: center;padding:0;;">状态</td>
<td class="th-row" style="width: 7%;text-align: center;padding:0;">序号</td>
<td class="th-row" style="width: 35%;text-align: center;padding:0;">姓名</td>
<td class="th-row" style="width: 8%;text-align: center;padding:0;">状态</td>
</tr>
</div>
<div style="padding-left: 1%;padding-right: 1%">
<div v-for='i in workerNum' :key='i' style="border-left: 2px solid #FDE866;border-right: 2px solid #FDE866;">
<tr style="display: flex;font-size: 5px;font-weight: bold;border-bottom: 2px solid #eaeaea">
<td class="trTdBT" style="width: 7%;text-align: center">{{i*3+1}}</td>
<td class="trTdBT" style="width: 12%;text-align: center">{{workerIdList[i*3]}}</td>
<td class="trTdBT" style="width: 7%;text-align: center;padding-right: 8%; color: #ff0b0b">{{ workerDay[workerIdList[i*3]] }}</td>
<!-- <td class="trTdBT" style="width: 7%;text-align: center">{{i*3+1}}</td>-->
<!-- <td class="trTdBT" style="width: 12%;text-align: center">{{workerIdList[i*3]}}</td>-->
<!-- <td class="trTdBT" style="width: 7%;text-align: center;padding-right: 8%; color: #ff0b0b">{{ workerDay[workerIdList[i*3]] }}</td>-->
<td class="trTdBT" style="width: 7%;text-align: center">{{workerIdList[i*3+1]==undefined?"":i*3+2}}</td>
<td class="trTdBT" style="width: 12%;text-align: center">{{workerIdList[i*3+1]}}</td>
<td class="trTdBT" style="width: 7%;text-align: center;padding-right: 8%; color: #ff0b0b">{{ workerDay[workerIdList[i*3+1]] }}</td>
<!-- <td class="trTdBT" style="width: 7%;text-align: center">{{workerIdList[i*3+1]==undefined?"":i*3+2}}</td>-->
<!-- <td class="trTdBT" style="width: 12%;text-align: center">{{workerIdList[i*3+1]}}</td>-->
<!-- <td class="trTdBT" style="width: 7%;text-align: center;padding-right: 8%; color: #ff0b0b">{{ workerDay[workerIdList[i*3+1]] }}</td>-->
<!-- <td class="trTdBT" style="width: 7%;text-align: center">{{workerIdList[i*3+2]==undefined?"":i*3+3}}</td>-->
<!-- <td class="trTdBT" style="width: 12%;text-align: center">{{workerIdList[i*3+2]}}</td>-->
<!-- <td class="trTdBT" style="width: 7%;text-align: center;padding-right: 2%; color: #ff0b0b">{{ workerDay[workerIdList[i*3+2]] }}</td>-->
<td class="trTdBT" style="width: 7%;text-align: center;padding:0;">{{i*2+1}}</td>
<td class="trTdBT" style="width: 35%;text-align: center;padding:0;">{{workerIdList[i*2]}}</td>
<td class="trTdBT" style="width: 8%;text-align: center;padding:0; color: #ff0b0b">{{ workerDay[workerIdList[i*2]] }}</td>
<td class="trTdBT" style="width: 7%;text-align: center;padding:0;">{{workerIdList[i*2+1]==undefined?"":i*2+2}}</td>
<td class="trTdBT" style="width: 35%;text-align: center;padding:0;">{{workerIdList[i*2+1]}}</td>
<td class="trTdBT" style="width: 8%;text-align: center;padding:0; color: #ff0b0b">{{ workerDay[workerIdList[i*2+1]] }}</td>
<td class="trTdBT" style="width: 7%;text-align: center">{{workerIdList[i*3+2]==undefined?"":i*3+3}}</td>
<td class="trTdBT" style="width: 12%;text-align: center">{{workerIdList[i*3+2]}}</td>
<td class="trTdBT" style="width: 7%;text-align: center;padding-right: 2%; color: #ff0b0b">{{ workerDay[workerIdList[i*3+2]] }}</td>
</tr>
</div>
</div>
@ -87,16 +101,16 @@
{{item.projectNewName==null?"":item.projectNewName}}
</div>
</div>
<!-- <div class="showDiv"></div>-->
<!-- <div style="display: flex;min-height: 20px;">-->
<!-- <div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">2.施工地点:</div>-->
<!-- <div style="width: 50%;text-align: left;">-->
<!-- {{item.planSgdd}}-->
<!-- </div>-->
<!-- </div>-->
<div class="showDiv"></div>
<div style="display: flex;min-height: 20px;">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">2.施工地点:</div>
<div style="width: 50%;text-align: left;">
{{item.planSgdd}}
</div>
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 20px;">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">3.负责工长:</div>
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">2.负责工长:</div>
<div style="width: 50%">
<input disabled placeholder=" " style="text-align: left"
v-model="item.planFzgz"></input>
@ -104,7 +118,7 @@
</div>
<div class="showDiv"></div>
<div v-if="item.show==1" style="display: flex;min-height: 20px;" @click="showPicker">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">4.是否一天:</div>
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">3.是否一天:</div>
<div style="width: 50%">
<input disabled placeholder=" " style="text-align: left"
v-model="item.isOne"></input>
@ -112,7 +126,7 @@
<div class="arrowOpen"></div>
</div>
<div v-else style="display: flex;min-height: 20px;">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">4.是否一天:</div>
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">3.是否一天:</div>
<div style="width: 50%">
<input disabled placeholder=" " style="text-align: left"
v-model="item.isOne"></input>
@ -122,7 +136,7 @@
<div v-if="item.show==1" style="display: flex;min-height: 20px;"
@click="selectWorker('/pages/pageplan/businessplan/addEdit/importWorker/main?title=明日计划-施工人员选取&planId='+dataForm.planId+'&planTime='+planTime+'&isOneDay='+dataForm.isOneDay+'&&projectId='+dataForm.projectId+'&workerDay='+JSON.stringify(workerDay))">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">5.施工人员:</div>
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">4.施工人员:</div>
<div style="width: 50%;text-align: left;">
<!-- <textarea disabled style="text-align: left;max-height:50px;width: 100%">{{item.selectPersion==null?"":item.selectPersion}}</textarea>-->
{{item.selectPersion==null?"":item.selectPersion}}
@ -130,7 +144,7 @@
<div class="arrowOpen"></div>
</div>
<div v-else style="display: flex;min-height: 20px;">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">5.施工人员:</div>
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">4.施工人员:</div>
<div style="width: 50%;text-align: left;">
{{item.selectPersion==null?"":item.selectPersion}}
</div>
@ -176,31 +190,31 @@
<input disabled style="text-align: left;width: 100%"></input>
</div>
</div>
<!-- <div class="showDiv"></div>-->
<!-- <div style="display: flex;min-height: 30px;">-->
<!-- <div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">2.施工地点:</div>-->
<!-- <div style="width: 50%">-->
<!--&lt;!&ndash; <textarea disabled style="text-align: left; max-height: 90px;width: 100%"></textarea>&ndash;&gt;-->
<!-- <input disabled style="text-align: left;width: 100%"></input>-->
<!-- </div>-->
<!-- </div>-->
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px;">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">2.施工地点:</div>
<div style="width: 50%">
<!-- <textarea disabled style="text-align: left; max-height: 90px;width: 100%"></textarea>-->
<input disabled style="text-align: left;width: 100%"></input>
</div>
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px;">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">3.负责工长:</div>
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">2.负责工长:</div>
<div style="width: 50%">
<input disabled placeholder=" " style="text-align: left"></input>
</div>
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px;">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">4.是否一天:</div>
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">3.是否一天:</div>
<div style="width: 50%">
</div>
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px;">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">5.施工人员:</div>
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">4.施工人员:</div>
<div style="width: 50%">
<!-- <textarea disabled style="text-align: left; max-height: 50px;width: 100%"></textarea>-->
<input disabled style="text-align: left;width: 100%"></input>
@ -278,6 +292,7 @@ export default {
editShow: false,
delShow: false,
tlShow: false,
uncommittedShow: false,
twoShow: false,
motto: 'Hello miniprograme',
dataList: [],
@ -657,9 +672,11 @@ export default {
this.dataList = [];
this.dataForm = {};
this.pickerValueArray = [];
this.tlShow = false
this.twoShow = false
this.tlShow = false;
this.uncommittedShow = false;
this.twoShow = false;
this.tlShow = isAuth('business:businessplantl:list')
this.uncommittedShow = isAuth('business:businessplan:list')
this.twoShow = isAuth('business:businessplantwo:list')
this.addShow = isAuth('business:businessplan:save')
this.editShow = isAuth('business:businessplan:update')

View File

@ -27,7 +27,7 @@
<div style="display: flex">
<div style="text-align: left;padding: 1% 0 1% 8%;width: 28%">1.编写日期:</div>
<div style="width: 50%">
<input disabled placeholder="请选择年份" style="text-align: left"
<input disabled placeholder="" style="text-align: left"
v-model="dataForm.nowTime"></input>
</div>
</div>
@ -59,8 +59,8 @@
<td class="trTdBT" style="width: 10%">序号</td>
<!-- <td class="trTdBT" style="width: 10%">施工年份</td>-->
<!-- <td class="trTdBT" style="width: 15%"><span class="spanClass">建设单位</span></td>-->
<td class="trTdBT" style="width: 40%"><span class="spanClass">立项名称</span></td>
<td class="trTdBT" style="width: 40%"><span class="spanClass">施工地点</span></td>
<td class="trTdBT" style="width: 80%"><span class="spanClass">立项名称</span></td>
<!-- <td class="trTdBT" style="width: 40%"><span class="spanClass">施工地点</span></td>-->
<!-- <td class="trTdBT" style="width: 12%">施工进度</td>-->
<!-- <td class="trTdBT" style="width: 12%">负责工长</td>-->
<td class="trTdBT" style="width: 10%">操作</td>
@ -79,14 +79,14 @@
<span class="spanClass">{{ item.project }}</span>
</importWorker>
<importWorker v-else style="width: 16%"><span class="spanClass">{{ item.projectNewName }}</span></importWorker>-->
<td class="trTd" style="width: 40%">
<td class="trTd" style="width: 80%">
<div v-if="item.projectNewName === null">{{ item.project }}</div>
<div v-else>{{ item.projectNewName }}</div>
</td>
<td class="trTd" style="width: 40%">
<!-- <span class="spanClass">{{ item.sgdd }}</span>-->
{{ item.sgdd }}
</td>
<!-- <td class="trTd" style="width: 40%">-->
<!-- &lt;!&ndash; <span class="spanClass">{{ item.sgdd }}</span>&ndash;&gt;-->
<!-- {{ item.sgdd }}-->
<!-- </td>-->
<!-- <td style="width: 12%">{{ item.sgjd }}</td>-->
<!-- <td style="width: 12%">{{ item.fzgz }}</td>-->
<td style="width: 10%">
@ -111,14 +111,14 @@
<span class="spanClass">{{ item.project }}</span>
</importWorker>
<importWorker v-else style="width: 16%"><span class="spanClass">{{ item.projectNewName }}</span></importWorker>-->
<td class="trTd" style="width: 40%">
<td class="trTd" style="width: 80%">
<div v-if="item.projectNewName === null">{{ item.project }}</div>
<div v-else>{{ item.projectNewName }}</div>
</td>
<td class="trTd" style="width: 40%">
<!-- <span class="spanClass">{{ item.sgdd }}</span>-->
{{ item.sgdd }}
</td>
<!-- <td class="trTd" style="width: 40%">-->
<!-- &lt;!&ndash; <span class="spanClass">{{ item.sgdd }}</span>&ndash;&gt;-->
<!-- {{ item.sgdd }}-->
<!-- </td>-->
<!-- <td style="width: 12%">{{ item.sgjd }}</td>-->
<!-- <td style="width: 12%">{{ item.fzgz }}</td>-->
<td style="width: 10%">
@ -183,10 +183,10 @@ export default {
this.$http.request({
url: this.$http.adornUrl('/business/businessplantwo/list'),
method: 'get',
params: this.$http.adornParams({
"startTime": this.dataForm.startTime,
"endTime": this.dataForm.endTime,
})
// params: this.$http.adornParams({
// "startTime": this.dataForm.startTime,
// "endTime": this.dataForm.endTime,
// })
}).then(({data}) => {
console.log(data);
if (data && data.code === 0) {
@ -275,6 +275,9 @@ export default {
params: this.$http.adornParams({
"saveIds": saveIds,
"deleteIds": this.delIds.toString(),
"twoEditTime":this.dataForm.nowTime,
"twoStart":this.dataForm.startTime,
"twoEnd":this.dataForm.endTime,
})
}).then(({data}) => {
if (data && data.code === 0) {

View File

@ -134,8 +134,8 @@
<td class="trTd" style="width: 10%;text-align: center">序号</td>
<!-- <td class="trTd" style="width: 9%;text-align: center">施工年份</td>
<td class="trTd" style="width: 15%;text-align: center">建设单位</td>-->
<td class="trTd" style="width: 38%;text-align: center">立项名称</td>
<td class="trTd" style="width: 37%;text-align: center">施工地点</td>
<td class="trTd" style="width: 75%;text-align: center">立项名称</td>
<!-- <td class="trTd" style="width: 37%;text-align: center">施工地点</td>-->
<!-- <td class="trTd" style="width: 9%;text-align: center">施工进度</td>
<td class="trTd" style="width: 9%;text-align: center">负责工长</td>
<td class="trTd" style="width: 9%;text-align: center">现场照片</td>
@ -163,7 +163,7 @@
<span class="spanClass">{{ item.project }}</span>
</importWorker>
<importWorker v-else class="trTd" style="width: 15%;text-align: center"><span class="spanClass">{{ item.projectNewName }}</span></importWorker>-->
<td class="trTd" style="width: 38%;text-align: center">
<td class="trTd" style="width: 75%;text-align: center">
<div v-if="item.projectNewName == null">{{ item.project }}</div>
<div v-else>{{ item.projectNewName }}</div>
</td>
@ -172,10 +172,10 @@
</importWorker>
<importWorker v-if="item.projectSgddId === null" class="trTd" style="width: 15%;text-align: center">{{ "暂无" }}
</importWorker>-->
<td class="trTd" style="width: 37%;text-align: center">
<div v-for="(son,index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}</div>
<div v-if="item.projectSgddId == null">{{ "暂无" }}</div>
</td>
<!-- <td class="trTd" style="width: 37%;text-align: center">-->
<!-- <div v-for="(son,index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}</div>-->
<!-- <div v-if="item.projectSgddId == null">{{ "暂无" }}</div>-->
<!-- </td>-->
<!-- <importWorker class="trTd" style="width: 9%;text-align: center"
v-for="son in dicJdList" :key="son.dictId" v-if="son.dictId === item.projectSgjdId">{{ son.name }}
</importWorker>
@ -219,7 +219,7 @@
<span class="spanClass"> {{ item.project }}</span>
</importWorker>
<importWorker v-else class="trTd" style="width: 15%;text-align: center"><span class="spanClass">{{ item.projectNewName }}</span></importWorker>-->
<td class="trTd" style="width: 38%;text-align: center">
<td class="trTd" style="width: 75%;text-align: center">
<div v-if="item.projectNewName == null">{{ item.project }}</div>
<div v-else>{{ item.projectNewName }}</div>
</td>
@ -228,10 +228,10 @@
</importWorker>
<importWorker v-if="item.projectSgddId === null" class="trTd" style="width: 15%;text-align: center">{{ "暂无" }}
</importWorker>-->
<td class="trTd" style="width: 37%;text-align: center">
<div v-for="(son,index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}</div>
<div v-if="item.projectSgddId == null">{{ "暂无" }}</div>
</td>
<!-- <td class="trTd" style="width: 37%;text-align: center">-->
<!-- <div v-for="(son,index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}</div>-->
<!-- <div v-if="item.projectSgddId == null">{{ "暂无" }}</div>-->
<!-- </td>-->
<!-- <importWorker class="trTd" style="width: 9%;text-align: center"
v-for="son in dicJdList" :key="son.dictId" v-if="son.dictId === item.projectSgjdId">{{ son.name }}
</importWorker>

View File

@ -14,8 +14,8 @@
<div style="padding: 0 0 10% 4%;width: 92%">
<div style="background-color: white;border-radius: 10px;padding: 5% 5% 5% 5%;min-height: 78vh">
<div>
<div style="text-align: left;padding: 4% 0 0 4%;font: bold 16px 新宋体">立项名称</div>
<div style="width: 84%;padding-left: 8%;font-size: 14px">
<div style="text-align: left;padding: 4% 0 0 4%;font: bold 14px 新宋体">立项名称</div>
<div style="width: 84%;padding-left: 8%;font-size: 12px">
<div class="showDiv" style="padding: 1%"></div>
<div style="display: flex">
<div style="text-align: left;padding: 2% 0 2% 4%;width: 34%">立项名称</div>
@ -26,7 +26,7 @@
</div>
<div class="showDiv" style="padding: 1%"></div>
</div>
<div style="width: 84%;padding-left: 8%;font-size: 14px">
<div style="width: 84%;padding-left: 8%;font-size: 12px">
<div style="display: flex">
<div style="text-align: left;padding: 2% 0 2% 4%;width: 34%">新立项名称</div>
<div style="width: 60%">
@ -39,8 +39,8 @@
</div>
<!-- 属性定义-->
<div>
<div style="text-align: left;padding: 8% 0 0 4%;font: bold 16px 新宋体">属性定义</div>
<div style="width: 84%;padding-left: 8%;font-size: 14px">
<div style="text-align: left;padding: 8% 0 0 4%;font: bold 14px 新宋体">属性定义</div>
<div style="width: 84%;padding-left: 8%;font-size: 12px">
<div class="showDiv" style="padding: 1%"></div>
<div style="display: flex">
<div style="text-align: left;padding: 2% 0 2% 4%;width: 32%">1.建设单位</div>
@ -51,19 +51,19 @@
</div>
<div class="showDiv" style="padding: 1%"></div>
</div>
<div style="width: 84%;padding-left: 8%;font-size: 14px">
<!-- <div style="width: 84%;padding-left: 8%;font-size: 14px">-->
<!-- <div style="display: flex">-->
<!-- <div style="text-align: left;padding: 2% 0 2% 4%;width: 32%">2.施工地点</div>-->
<!-- <div style="width: 52%">-->
<!-- <input disabled style="padding-top: 3%;text-align: left"-->
<!-- v-model="dataForm.sgdd"></input>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="showDiv" style="padding: 1%"></div>-->
<!-- </div>-->
<div style="width: 84%;padding-left: 8%;font-size: 12px">
<div style="display: flex">
<div style="text-align: left;padding: 2% 0 2% 4%;width: 32%">2.施工地点</div>
<div style="width: 52%">
<input disabled style="padding-top: 3%;text-align: left"
v-model="dataForm.sgdd"></input>
</div>
</div>
<div class="showDiv" style="padding: 1%"></div>
</div>
<div style="width: 84%;padding-left: 8%;font-size: 14px">
<div style="display: flex">
<div style="text-align: left;padding: 2% 0 2% 4%;width: 32%">3.施工年份</div>
<div style="text-align: left;padding: 2% 0 2% 4%;width: 32%">2.施工年份</div>
<div style="width: 52%">
<input disabled style="padding-top: 3%;text-align: left"
v-model="dataForm.projectYear"></input>
@ -71,9 +71,9 @@
</div>
<div class="showDiv" style="padding: 1%"></div>
</div>
<div style="width: 84%;padding-left: 8%;font-size: 14px">
<div style="width: 84%;padding-left: 8%;font-size: 12px">
<div style="display: flex">
<div style="text-align: left;padding: 2% 0 2% 4%;width: 32%">4.开工时间</div>
<div style="text-align: left;padding: 2% 0 2% 4%;width: 32%">3.开工时间</div>
<div style="width: 52%">
<input disabled style="padding-top: 3%;text-align: left"
v-model="dataForm.projectStart"></input>
@ -81,9 +81,9 @@
</div>
<div class="showDiv" style="padding: 1%"></div>
</div>
<div style="width: 84%;padding-left: 8%;font-size: 14px">
<div style="width: 84%;padding-left: 8%;font-size: 12px">
<div style="display: flex">
<div style="text-align: left;padding: 2% 0 2% 4%;width: 32%">5.竣工时间</div>
<div style="text-align: left;padding: 2% 0 2% 4%;width: 32%">4.竣工时间</div>
<div style="width: 52%">
<input disabled style="padding-top: 3%;text-align: left"
v-model="dataForm.projectEnd"></input>
@ -91,9 +91,9 @@
</div>
<div class="showDiv" style="padding: 1%"></div>
</div>
<div style="width: 84%;padding-left: 8%;font-size: 14px">
<div style="width: 84%;padding-left: 8%;font-size: 12px">
<div style="display: flex">
<div style="text-align: left;padding: 2% 0 2% 4%;width: 32%">6.施工进度</div>
<div style="text-align: left;padding: 2% 0 2% 4%;width: 32%">5.施工进度</div>
<div style="width: 52%">
<input disabled style="padding-top: 3%;text-align: left"
v-model="dataForm.sgjd"></input>
@ -102,9 +102,9 @@
<div class="showDiv" style="padding: 1%"></div>
</div>
<div style="width: 84%;padding-left: 8%;font-size: 14px">
<div style="width: 84%;padding-left: 8%;font-size: 12px">
<div style="display: flex">
<div style="text-align: left;padding: 2% 0 2% 4%;width: 32%">7.负责工长</div>
<div style="text-align: left;padding: 2% 0 2% 4%;width: 32%">6.负责工长</div>
<div style="width: 52%">
<input disabled style="padding-top: 3%;text-align: left"
v-model="dataForm.fzgz"></input>
@ -112,9 +112,9 @@
</div>
<div class="showDiv" style="padding: 1%"></div>
</div>
<div style="width: 91%;padding-left: 8%;font-size: 14px">
<div style="width: 84%;padding-left: 8%;font-size: 12px">
<div style="display: flex">
<div style="text-align: left;padding: 2% 0 2% 4%;width: 32%">8.工程类别</div>
<div style="text-align: left;padding: 2% 0 2% 4%;width: 32%">7.工程类别</div>
<div style="width: 45%">
<input disabled style="padding-top: 3%;text-align: left"
v-model="dataForm.gclb"></input>
@ -126,7 +126,7 @@
</div>
<!-- 内容简述-->
<div>
<div style="text-align: left;padding: 8% 0 0 4%;font: bold 16px 新宋体"> 内容简述</div>
<div style="text-align: left;padding: 8% 0 0 4%;font: bold 14px 新宋体"> 内容简述</div>
<div style="margin: 4% 1% 0 1%;border: 2px solid #FFFF00;border-radius: 5px">
<textarea disabled style="width: 98%;margin-left: 2%;overflow:auto"
maxlength="2000" v-model="dataForm.projectNrjy"></textarea>
@ -134,7 +134,7 @@
</div>
<!-- 施工照片上传三张以内-->
<div>
<div style="text-align: left;padding: 8% 0 0 4%;font: bold 16px 新宋体">施工照片</div>
<div style="text-align: left;padding: 8% 0 0 4%;font: bold 14px 新宋体">施工照片</div>
<div style="margin: 4% 1% 0 1%;border: 1px solid #FFFF00;width: 98%;min-height: 14vh;display: flex">
<div style="width: 32%;height: 12vh;margin: 1% 1% 0 1%">
<div style="width: 32%;height: 12vh;">

View File

@ -7,7 +7,7 @@
</button>
<button disabled style="color: #d9d9d9" type="button" class="btn" size="mini">完工总结
</button>
<button disabled style="color: #d9d9d9" type="button" class="btn" size="mini">提料
<button disabled style="color: #d9d9d9" type="button" class="btn" size="mini">状态查询
</button>
<button type="button" class="btn" style="background-color: #fde866;" size="mini">2周计划</button>
</div>
@ -27,7 +27,7 @@
<div style="width: 50%">
<picker mode="date" :value="dataForm.nowTime" fields="day" @change="bindYearChange">
<view class="picker">
<input disabled placeholder="请选择年份" style="text-align: left"
<input disabled placeholder=" " style="text-align: left"
v-model="dataForm.nowTime"></input>
</view>
</picker>
@ -54,11 +54,11 @@
<td class="trTdBT" style="width: 10%">序号</td>
<!-- <td class="trTdBT" style="width: 10%">施工年份</td>-->
<!-- <td class="trTdBT" style="width: 15%"><span class="spanClass">建设单位</span></td>-->
<td class="trTdBT" style="width: 38%"><span class="spanClass">立项名称</span></td>
<td class="trTdBT" style="width: 37%"><span class="spanClass">施工地点</span></td>
<td class="trTdBT" style="width: 89%"><span class="spanClass">立项名称</span></td>
<!-- <td class="trTdBT" style="width: 37%"><span class="spanClass">施工地点</span></td>-->
<!-- <td class="trTdBT" style="width: 12%">施工进度</td>-->
<!-- <td class="trTdBT" style="width: 12%">负责工长</td>-->
<td class="trTdBT" style="width: 14%">操作</td>
<!-- <td class="trTdBT" style="width: 14%">操作</td>-->
</tr>
</div>
<div v-for="(item,indexFa) in dataList" :key="indexFa" style="border-right: 2px solid #FDE866; border-left: 2px solid #FDE866; ">
@ -71,17 +71,17 @@
{{ item.project }}
</importWorker>
<importWorker v-else class="th-importWorker" style="width: 16%">{{ item.projectNewName }}</importWorker>-->
<td class="trTd" style="width: 38%">
<td class="trTd" style="width: 89%">
<div v-if="item.projectNewName === null">{{ item.project }}</div>
<div v-else>{{ item.projectNewName }}</div>
</td>
<td class="trTd" style="width: 37%">{{ item.sgdd }}</td>
<!-- <td class="trTd" style="width: 37%">{{ item.sgdd }}</td>-->
<!-- <td class="th-td" style="width: 12%">{{ item.sgjd }}</td>-->
<!-- <td class="th-td" style="width: 13%">{{ item.fzgz }}</td>-->
<td class="trTd" style="width: 14%">
<span
@click="goToo('/pages/pageplan/businessplan/twoWeekPlan/information/main?title=明日计划-2周计划-详情&&id='+item.twoProjectId)">详情</span>
</td>
<!-- <td class="trTd" style="width: 14%">-->
<!-- <span-->
<!-- @click="goToo('/pages/pageplan/businessplan/twoWeekPlan/information/main?title=明日计划-2周计划-详情&&id='+item.twoProjectId)">详情</span>-->
<!-- </td>-->
</tr>
</div>
<div v-else style="background-color: #fdfad5" @click="selectOneData(item.projectId)">
@ -93,21 +93,21 @@
{{ item.project }}
</importWorker>
<importWorker v-else class="th-importWorker" style="width: 16%">{{ item.projectNewName }}</importWorker>-->
<td class="trTd" style="width: 38%">
<td class="trTd" style="width: 89%">
<div v-if="item.projectNewName === null">{{ item.project }}</div>
<div v-else>{{ item.projectNewName }}</div>
</td>
<td class="trTd" style="width: 37%">{{ item.sgdd }}</td>
<!-- <td class="trTd" style="width: 37%">{{ item.sgdd }}</td>-->
<!-- <td class="th-td" style="width: 12%">{{ item.sgjd }}</td>-->
<!-- <td class="th-td" style="width: 13%">{{ item.fzgz }}</td>-->
<td class="trTd" style="width: 14%">
<span
@click="goToo('/pages/pageplan/businessplan/twoWeekPlan/information/main?title=明日计划-2周计划-详情&&id='+item.twoProjectId)">详情</span>
</td>
<!-- <td class="trTd" style="width: 14%">-->
<!-- <span-->
<!-- @click="goToo('/pages/pageplan/businessplan/twoWeekPlan/information/main?title=明日计划-2周计划-详情&&id='+item.twoProjectId)">详情</span>-->
<!-- </td>-->
</tr>
</div>
</div>
<div v-if="!dataList.length > 0" style="text-align: center;font-size: 14px;">
<div v-if="!dataList.length > 0" style="text-align: center;font-size: 12px;">
暂无数据
</div>
<div style="border-bottom: 2px solid #FDE866"></div>
@ -155,13 +155,18 @@ export default {
this.$http.request({
url: this.$http.adornUrl('/business/businessplantwo/list'),
method: 'get',
params: this.$http.adornParams({
"startTime": this.dataForm.startTime,
"endTime": this.dataForm.endTime,
})
// params: this.$http.adornParams({
// "startTime": this.dataForm.startTime,
// "endTime": this.dataForm.endTime,
// })
}).then(({data}) => {
if (data && data.code === 0) {
this.dataList = data.page;
if(this.dataList.length>0){
this.dataForm.nowTime = this.dataList[0].twoEditTime;
this.dataForm.startTime = this.dataList[0].twoStart;
this.dataForm.endTime = this.dataList[0].twoEnd;
}
}
})
},

View File

@ -0,0 +1,12 @@
import Vue from 'vue'
import App from './uncommitted'
// add this to handle exception
Vue.config.errorHandler = function (err) {
if (console && console.error) {
console.error(err)
}
}
const app = new Vue(App)
app.$mount()

View File

@ -0,0 +1,119 @@
<template>
<div style="background-color: #eeeeee;min-height: 100vh;">
<div style="display: flex;padding: 4% 1% 4% 1%;">
<button disabled style="color: #d9d9d9" type="button" class="btn" size="mini">提前计划</button>
<button disabled style="color: #d9d9d9" type="button" class="btn" size="mini">未总结
</button>
<button disabled style="color: #d9d9d9" type="button" class="btn" size="mini">完工总结
</button>
<button type="button" class="btn" style="background-color: #fde866;" size="mini">状态查询
</button>
<button disabled style="color: #d9d9d9" type="button" class="btn" size="mini">2周计划</button>
</div>
<div style="padding: 0 0 10% 4%;width: 92%">
<div style="background-color: white;border-radius: 10px;padding: 4% 4% 5% 4%;min-height: 78vh">
<!-- 列表部分-->
<div>
<div>
<tr class="th-row"
style="display: flex;font-size: 12px;border: 2px solid #FDE866;font-weight: bold">
<td class="th-td" style="width: 30%;">序号</td>
<td class="th-td" style="width: 70%;">未总结时间</td>
</tr>
</div>
<div v-for="(item,index) in dataList" :key="index"
style="border-right: 2px solid #fde866;border-left: 2px solid #fde866;">
<tr class="th-row">
<td class="th-td" style="width: 30%;">{{ index + 1 }}</td>
<td class="th-td" style="width: 70%;">{{ item.planTime }}</td>
</tr>
</div>
<div v-if="!dataList.length > 0" style="text-align: center;font-size: 14px;">
暂无数据
</div>
<div style="border-bottom: 2px solid #fde866"></div>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
name: "状态查询",
data() {
return {
//
dataList: []
}
},
methods: {
addEdit(url) {
//console.log(url);
wx.navigateTo({
url: url
})
},
closePage() {
wx.navigateBack({
delta: 1
})
},
//
searList() {
this.dataList = [];
this.$http.request({
url: this.$http.adornUrl('/business/businessplan/uncommittedList'),
method: 'get',
}).then(({data}) => {
if (data && data.code === 0) {
this.dataList = data.page;
} else {
this.closePage();
}
})
}
},
onLoad() {
wx.setNavigationBarTitle({
title: '明日计划-状态查询'
})
this.searList();
},
onShow () {
this.searList();
}
}
</script>
<style scoped>
.btn {
text-align: center;
border-radius: 8px;
width: 20%;
height: 25px;
font-size: 11px;
font-weight: bold;
display: flex;
justify-content: center;
align-items: center;
}
/************** 列表 ****************/
.th-row {
display: flex;
font-size: 12px;
border: 1px solid #efeded;
}
.th-td {
min-height: 20px;
display: flex;
justify-content: center;
align-items: center;
font-size: 12px;
border-right: 2px solid #efeded;
}
</style>

View File

@ -35,8 +35,9 @@
<div style="display: flex;min-height: 30px;">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 34%">原立项名称</div>
<div style="width: 60%;padding-top: 1%;">
<input :disabled="approvalShow" placeholder="(必填)" style="text-align: left"
v-model="dataForm.project"></input>
<!-- <input :disabled="approvalShow" placeholder="(必填)" style="text-align: left"-->
<!-- v-model="dataForm.project"></input>-->
<span>{{dataForm.project}}</span>
</div>
</div>
<div class="showDiv"></div>
@ -69,24 +70,24 @@
:pickerValueDefault='pickerValueDefaultJSDW'
@onConfirm="pickerConfirmJSDW"></mpvue-picker>
</div>
<div style="width: 84%;padding-left: 8%;">
<div style="display: flex;min-height: 30px;" @click="showPicker(1)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 32%">2.施工地点</div>
<div style="width: 52%;padding-top: 1%;">
<input disabled placeholder="(必选)" style="text-align: left"
v-model="dataForm.projectSgdd"></input>
</div>
<div class="arrowOpen"></div>
</div>
<div class="showDiv"></div>
<mpvue-picker v-if="isShow" ref="mpvuePickerSGDD"
:pickerValueArray='pickerValueArraySGDD'
:pickerValueDefault='pickerValueDefaultSGDD'
@onConfirm="pickerConfirmSGDD"></mpvue-picker>
</div>
<!-- <div style="width: 84%;padding-left: 8%;">-->
<!-- <div style="display: flex;min-height: 30px;" @click="showPicker(1)">-->
<!-- <div style="text-align: left;padding: 2% 0 1% 4%;width: 32%">2.施工地点</div>-->
<!-- <div style="width: 52%;padding-top: 1%;">-->
<!-- <input disabled placeholder="(必选)" style="text-align: left"-->
<!-- v-model="dataForm.projectSgdd"></input>-->
<!-- </div>-->
<!-- <div class="arrowOpen"></div>-->
<!-- </div>-->
<!-- <div class="showDiv"></div>-->
<!-- <mpvue-picker v-if="isShow" ref="mpvuePickerSGDD"-->
<!-- :pickerValueArray='pickerValueArraySGDD'-->
<!-- :pickerValueDefault='pickerValueDefaultSGDD'-->
<!-- @onConfirm="pickerConfirmSGDD"></mpvue-picker>-->
<!-- </div>-->
<div style="width: 84%;padding-left: 8%;">
<div style="display: flex;min-height: 30px;">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 32%">3.施工年份</div>
<div style="text-align: left;padding: 2% 0 1% 4%;width: 32%">2.施工年份</div>
<div style="width: 52%;padding-top: 1%;">
<picker mode="date" :value="dataForm.projectYear" fields="year" @change="bindYearChange">
<view class="picker">
@ -101,7 +102,7 @@
</div>
<div style="width: 84%;padding-left: 8%;">
<div style="display: flex;min-height: 30px;">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 32%">4.开工时间</div>
<div style="text-align: left;padding: 2% 0 1% 4%;width: 32%">3.开工时间</div>
<div style="width: 52%;padding-top: 1%;">
<picker mode="date" :value="dataForm.projectStart" fields="day" @change="bindTimeChange($event,1)">
<view class="picker">
@ -116,7 +117,7 @@
</div>
<div style="width: 84%;padding-left: 8%;">
<div style="display: flex;min-height: 30px;">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 32%">5.竣工时间</div>
<div style="text-align: left;padding: 2% 0 1% 4%;width: 32%">4.竣工时间</div>
<div style="width: 52%;padding-top: 1%;">
<picker mode="date" :value="dataForm.projectEnd" fields="day" @change="bindTimeChange($event,2)">
<view class="picker">
@ -131,7 +132,7 @@
</div>
<div style="width: 84%;padding-left: 8%;">
<div style="display: flex;min-height: 30px;" @click="showPicker(3)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 32%">6.施工进度</div>
<div style="text-align: left;padding: 2% 0 1% 4%;width: 32%">5.施工进度</div>
<div style="width: 52%;padding-top: 1%;">
<input disabled placeholder="(必选)" style="text-align: left"
v-model="dataForm.projectSgjd"></input>
@ -147,7 +148,7 @@
</div>
<div style="width: 84%;padding-left: 8%;">
<div style="display: flex;min-height: 30px;" @click="showPicker(5)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 32%">7.负责工长</div>
<div style="text-align: left;padding: 2% 0 1% 4%;width: 32%">6.负责工长</div>
<div style="width: 52%;padding-top: 1%;">
<input disabled placeholder="(必选)" style="text-align: left"
v-model="dataForm.projectFzgz"></input>
@ -163,7 +164,7 @@
</div>
<div style="width: 84%;padding-left: 8%;">
<div style="display: flex;min-height: 30px;" @click="showPicker(6)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 32%">8.联络员</div>
<div style="text-align: left;padding: 2% 0 1% 4%;width: 32%">7.联络员</div>
<div style="width: 52%;padding-top: 1%;">
<input disabled placeholder="(必选)" style="text-align: left"
v-model="dataForm.projectLly"></input>
@ -179,8 +180,8 @@
</div>
<div style="width: 91%;padding-left: 8%;">
<div style="display: flex;min-height: 30px;">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 32%" @click="showPicker(2)">9.工程类别</div>
<div style="width: 45%;padding-top: 1%;" @click="showPicker(2)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 29%" @click="showPicker(2)">8.工程类别</div>
<div style="width: 48%;padding-top: 1%;" @click="showPicker(2)">
<input disabled placeholder="多选必选可先选1个" style="text-align: left"
v-model="dataForm.projectGclb"></input>
</div>
@ -790,6 +791,54 @@ export default {
})
return;
}
if(!this.dataForm.projectJsdwId) {
wx.showToast({
title: '请选择建设单位!',
icon: 'none',
duration: 2000//
})
return;
}
if(!this.dataForm.projectYear) {
wx.showToast({
title: '请选择施工年份!',
icon: 'none',
duration: 2000//
})
return;
}
if(!this.dataForm.projectSgjdId) {
wx.showToast({
title: '请选择施工进度!',
icon: 'none',
duration: 2000//
})
return;
}
if(!this.dataForm.projectFzgzId) {
wx.showToast({
title: '请选择负责工长!',
icon: 'none',
duration: 2000//
})
return;
}
if(!this.dataForm.projectLlyId) {
wx.showToast({
title: '请选择联络员!',
icon: 'none',
duration: 2000//
})
return;
}
if(!this.dataForm.projectGclbId) {
wx.showToast({
title: '请选择工程类别!',
icon: 'none',
duration: 2000//
})
return;
}
this.dataForm.projectPhotoConut = 0;
//console.log(this.dataForm);
if((this.files1.length > 0 && !this.files2.length >0 && !this.files3.length > 0)

View File

@ -11,14 +11,6 @@
</div>
<!-- 搜索条件-->
<div style="width: 80%;padding-left: 10%;font-size: 12px">
<!--
<div style="margin: 1% 0 2% 0;">
<button type="button" size="mini"
style="font-size: 14px;margin-left: 74%;background-color: #00B0F0;width: 68px;" @click="clearSearch()">
清空
</button>
</div>
-->
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px;" @click="showPicker(1)">
@ -29,71 +21,6 @@
</div>
<div class="arrowOpen"></div>
</div>
<!--<div class="showDiv"></div>
<div style="display: flex;min-height: 30px" @click="showPicker(2)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">2&nbsp;施工地点(all)</div>
<div style="width: 50%;padding-top: 1%;">
<input disabled style="text-align: left" placeholder=" "
v-model="dataForm.projectSgdd"></input>
</div>
<div class="arrowOpen"></div>
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">3&nbsp;施工年份(all)</div>
<div style="width: 50%;padding-top: 1%;">
<picker mode="date" :value="dataForm.projectYear" fields="year" @change="bindYearChange">
<view class="picker">
<input disabled placeholder=" " style="text-align: left"
v-model="dataForm.projectYear"></input>
</view>
</picker>
</div>
<div class="arrowOpen"></div>
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px" @click="showPicker(5)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">4&nbsp;负责工长(all)</div>
<div style="width: 50%;padding-top: 1%;">
<input disabled style="text-align: left"
v-model="dataForm.projectFzgz"></input>
</div>
<div class="arrowOpen"></div>
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px" @click="showPicker(6)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">5&nbsp;联络员(all)</div>
<div style="width: 50%;padding-top: 1%;">
<input disabled style="text-align: left"
v-model="dataForm.projectLly"></input>
</div>
<div class="arrowOpen"></div>
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px" @click="showPicker(3)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">6&nbsp;工程类别(all)</div>
<div style="width: 50%;padding-top: 1%;">
<input disabled style="text-align: left" placeholder="可多选"
v-model="dataForm.projectGclb"></input>
</div>
<div class="arrowOpen"></div>
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px" @click="showPicker(4)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 36%">7&nbsp;导入合同(all)</div>
<div style="width: 50%;padding-top: 1%;">
<input disabled style="text-align: left" placeholder=" "
v-model="dataForm.contant"></input>
</div>
<div class="arrowOpen"></div>
</div>-->
<div class="showDiv"></div>
<div style="display: flex;min-height: 30px">
@ -128,22 +55,10 @@
</div>
<div style="padding: 0 0 10% 4%;width: 92%">
<div style="background-color: white;border-radius: 10px;padding: 5% 4% 5% 4%;min-height: 20vh">
<!-- <div style="overflow: auto">-->
<!-- <div style="width: 600px;">-->
<div>
<tr style="display: flex;font-size: 12px; border: 2px solid #ED7D31;">
<!-- <td class="th-row" style="width: 5%;text-align: center">序号</td>
<td class="th-row" style="width: 9%;text-align: center">施工年份</td>
<td class="th-row" style="width: 15%;text-align: center">建设单位</td>
<td class="th-row" style="width: 15%;text-align: center">立项名称</td>
<td class="th-row" style="width: 15%;text-align: center">施工地点</td>
<td class="th-row" style="width: 9%;text-align: center">施工进度</td>
<td class="th-row" style="width: 9%;text-align: center">负责工长</td>
<td class="th-row" style="width: 9%;text-align: center">现场照片</td>
<td class="th-row" style="width: 9%;text-align: center">导入合同</td>-->
<td class="th-row" style="width: 10%;text-align: center">序号</td>
<td class="th-row" style="width: 38%;text-align: center">立项名称</td>
<td class="th-row" style="width: 37%;text-align: center">施工地点</td>
<td class="th-row" style="width: 75%;text-align: center">立项名称</td>
<td class="th-row" style="width: 14%;text-align: center">操作</td>
</tr>
</div>
@ -152,109 +67,30 @@
@click="selectOneData(item.projectId)">
<tr class="td-row" style="display: flex;font-size: 12px;">
<td class="trTd" style="width: 10%;text-align: center">{{ indexFa + 1 }}</td>
<td class="trTd" style="width: 38%;text-align: center">
<td class="trTd" style="width: 75%;text-align: center">
<div v-if="item.projectNewName == null">{{ item.project }}</div>
<div v-else>{{ item.projectNewName }}</div>
</td>
<td class="trTd" style="width: 37%;text-align: center">
<div v-for="(son,index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}</div>
<div v-if="item.projectSgddId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 14%;text-align: center">
<span v-if="editShow"
@click="addEdit('/pages/pageproject/businessproject/addEdit/main?title=立项管理-修改-'+item.project+'&&id='+item.projectId)">修改</span>
</td>
<!-- <td class="trTd" style="width: 5%;text-align: center">{{ indexFa + 1 }}</td>
<td class="trTd" style="width: 9%;text-align: center">{{
item.projectYear ? item.projectYear : ""
}}
</td>
<td class="trTd" style="width: 15%;text-align: center">
<div v-for="(son, index) in dicJsdwList" :key="index" v-if="son.dictId === item.projectJsdwId">{{ son.name }}</div>
<div v-if="item.projectJsdwId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 15%;text-align: center">
<div v-if="item.projectNewName == null">{{ item.project }}</div>
<div v-else>{{ item.projectNewName }}</div>
</td>
<td class="trTd" style="width: 15%;text-align: center">
<div v-for="(son,index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}</div>
<div v-if="item.projectSgddId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 9%;text-align: center">
<div v-for="(son, index) in dicJdList" :key="index" v-if="son.dictId === item.projectSgjdId">{{ son.name }}</div>
<div v-if="item.projectSgjdId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 9%;text-align: center">
<div v-for="(son, index) in ryList" :key="index" v-if="son.userId === item.projectFzgzId">{{ son.name }}</div>
<div v-if="item.projectFzgzId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 9%;text-align: center">
{{ item.projectPhotoConut }}
</td>
<td v-if="item.isContant === 0" class="trTd" style="width: 9%;text-align: center">{{ "" }}</td>
<td v-else class="trTd" style="width: 9%;text-align: center">{{ "是" }}</td>
<td class="trTd" style="width: 5%;text-align: center">
<span v-if="editShow"
@click="addEdit('/pages/pageproject/businessproject/addEdit/main?title=立项管理-修改-'+item.project+'&&id='+item.projectId)">修改</span>
</td>-->
</tr>
</div>
<div v-else @click="selectOneData(item.projectId)">
<tr class="td-row" style="display: flex;font-size: 12px;">
<td class="trTd" style="width: 10%;text-align: center">{{ indexFa + 1 }}</td>
<td class="trTd" style="width: 38%;text-align: center;">
<td class="trTd" style="width: 75%;text-align: center;">
<div v-if="item.projectNewName == null">{{ item.project }}</div>
<div v-else>{{ item.projectNewName }}</div>
</td>
<td class="trTd" style="width: 37%;text-align: center">
<div v-for="(son, index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}</div>
<div v-if="item.projectSgddId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 14%;text-align: center">
<span v-if="editShow"
@click="addEdit('/pages/pageproject/businessproject/addEdit/main?title=立项管理-修改-'+item.project+'&&id='+item.projectId)">修改</span>
</td>
<!-- <td class="trTd" style="width: 5%;text-align: center">{{ indexFa + 1 }}</td>
<td class="trTd" style="width: 9%;text-align: center">{{
item.projectYear ? item.projectYear : ""
}}
</td>
<td class="trTd" style="width: 15%;text-align: center">
<div v-for="(son, index) in dicJsdwList" :key="index" v-if="son.dictId === item.projectJsdwId">{{ son.name }}</div>
<div v-if="item.projectJsdwId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 15%;text-align: center">
<div v-if="item.projectNewName == null">{{ item.project }}</div>
<div v-else>{{ item.projectNewName }}</div>
</td>
<td class="trTd" style="width: 15%;text-align: center">
<div v-for="(son, index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}</div>
<div v-if="item.projectSgddId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 9%;text-align: center">
<div v-for="(son, index) in dicJdList" :key="index" v-if="son.dictId === item.projectSgjdId">{{ son.name }}</div>
<div v-if="item.projectSgjdId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 9%;text-align: center">
<div v-for="(son, index) in ryList" :key="index" v-if="son.userId === item.projectFzgzId">{{ son.name }}</div>
<div v-if="item.projectFzgzId == null">{{ "暂无" }}</div>
</td>
<td class="trTd" style="width: 9%;text-align: center">
{{ item.projectPhotoConut }}
</td>
<td v-if="item.isContant === 0" class="trTd" style="width: 9%;text-align: center">{{ "" }}</td>
<td v-else class="trTd" style="width: 9%;text-align: center">{{ "是" }}</td>
<td class="trTd" style="width: 5%;text-align: center">
<span v-if="editShow"
@click="addEdit('/pages/pageproject/businessproject/addEdit/main?title=立项管理-修改-'+item.project+'&&id='+item.projectId)">修改</span>
</td>-->
</tr>
</div>
</div>
<!-- </div>-->
<!-- </div>-->
<div v-if="dataList.length === 0 " style="text-align: center; padding-top: 5%;padding-top: 5%">
<span>暂无数据</span>
</div>
@ -742,6 +578,7 @@ export default {
display: flex;
justify-content: center;
align-items: center;
font-weight: bold;
border: 1px solid #efeded;
}

View File

@ -5,6 +5,7 @@
<button v-else type="button" class="btn" size="mini" >未成稿</button>
<button v-if="status==1" type="button" class="btn" style="background-color: #fde866;" size="mini">最后成稿</button>
<button v-else type="button" class="btn" size="mini">最后成稿</button>
<button type="button" class="btn" size="mini" @click="goToo('/pages/pagetotal/businesstotal/uncommitted/main')">状态查询</button>
<button type="button" class="btn" size="mini" @click="goToo('/pages/pagetotal/businesstotal/totalLyb/main')">留言板</button>
</div>
<div class="bt" style="display: flex;min-height: 10px;">
@ -23,33 +24,46 @@
<!--展示施工人和施工人工作时间-->
<div>
<tr style="display: flex;font-size: 5px;font-weight: bold;border: 2px solid #FDE866;">
<td class="th-row" style="width: 7%;text-align: center">序号</td>
<td class="th-row" style="width: 12%;text-align: center">姓名</td>
<td class="th-row" style="width: 7%;text-align: center;padding-right: 8%">状态</td>
<!-- <td class="th-row" style="width: 7%;text-align: center">序号</td>-->
<!-- <td class="th-row" style="width: 12%;text-align: center">姓名</td>-->
<!-- <td class="th-row" style="width: 7%;text-align: center;padding-right: 8%">状态</td>-->
<td class="th-row" style="width: 7%;text-align: center">序号</td>
<td class="th-row" style="width: 12%;text-align: center">姓名</td>
<td class="th-row" style="width: 7%;text-align: center;padding-right: 8%">状态</td>
<!-- <td class="th-row" style="width: 7%;text-align: center">序号</td>-->
<!-- <td class="th-row" style="width: 12%;text-align: center">姓名</td>-->
<!-- <td class="th-row" style="width: 7%;text-align: center;padding-right: 8%">状态</td>-->
<td class="th-row" style="width: 7%;text-align: center">序号</td>
<td class="th-row" style="width: 12%;text-align: center">姓名</td>
<td class="th-row" style="width: 7%;text-align: center;padding-right: 2%">状态</td>
<!-- <td class="th-row" style="width: 7%;text-align: center">序号</td>-->
<!-- <td class="th-row" style="width: 12%;text-align: center">姓名</td>-->
<!-- <td class="th-row" style="width: 7%;text-align: center;padding-right: 2%">状态</td>-->
<td class="th-row" style="width: 7%;text-align: center;padding:0;">序号</td>
<td class="th-row" style="width: 35%;text-align: center;padding:0;">姓名</td>
<td class="th-row" style="width: 8%;text-align: center;padding:0;;">状态</td>
<td class="th-row" style="width: 7%;text-align: center;padding:0;">序号</td>
<td class="th-row" style="width: 35%;text-align: center;padding:0;">姓名</td>
<td class="th-row" style="width: 8%;text-align: center;padding:0;">状态</td>
</tr>
</div>
<div>
<div v-for='i in workerNum' :key='i' style="border-left: 2px solid #FDE866;border-right: 2px solid #FDE866;">
<tr style="display: flex;font-size: 5px;font-weight: bold;border-bottom: 2px solid #eaeaea">
<td class="trTdBT" style="width: 7%;text-align: center">{{i*3+1}}</td>
<td class="trTdBT" style="width: 12%;text-align: center">{{workerIdList[i*3]}}</td>
<td class="trTdBT" style="width: 7%;text-align: center;padding-right: 8%;color: #ff0b0b">{{ workerDay[workerIdList[i*3]] }}</td>
<!-- <td class="trTdBT" style="width: 7%;text-align: center">{{i*3+1}}</td>-->
<!-- <td class="trTdBT" style="width: 12%;text-align: center">{{workerIdList[i*3]}}</td>-->
<!-- <td class="trTdBT" style="width: 7%;text-align: center;padding-right: 8%;color: #ff0b0b">{{ workerDay[workerIdList[i*3]] }}</td>-->
<td class="trTdBT" style="width: 7%;text-align: center">{{workerIdList[i*3+1]==undefined?"":i*3+2}}</td>
<td class="trTdBT" style="width: 12%;text-align: center">{{workerIdList[i*3+1]}}</td>
<td class="trTdBT" style="width: 7%;text-align: center;padding-right: 8%;color: #ff0b0b">{{ workerDay[workerIdList[i*3+1]] }}</td>
<!-- <td class="trTdBT" style="width: 7%;text-align: center">{{workerIdList[i*3+1]==undefined?"":i*3+2}}</td>-->
<!-- <td class="trTdBT" style="width: 12%;text-align: center">{{workerIdList[i*3+1]}}</td>-->
<!-- <td class="trTdBT" style="width: 7%;text-align: center;padding-right: 8%;color: #ff0b0b">{{ workerDay[workerIdList[i*3+1]] }}</td>-->
<td class="trTdBT" style="width: 7%;text-align: center">{{workerIdList[i*3+2]==undefined?"":i*3+3}}</td>
<td class="trTdBT" style="width: 12%;text-align: center">{{workerIdList[i*3+2]}}</td>
<td class="trTdBT" style="width: 7%;text-align: center;padding-right: 2%;color: #ff0b0b">{{ workerDay[workerIdList[i*3+2]] }}</td>
<!-- <td class="trTdBT" style="width: 7%;text-align: center">{{workerIdList[i*3+2]==undefined?"":i*3+3}}</td>-->
<!-- <td class="trTdBT" style="width: 12%;text-align: center">{{workerIdList[i*3+2]}}</td>-->
<!-- <td class="trTdBT" style="width: 7%;text-align: center;padding-right: 2%;color: #ff0b0b">{{ workerDay[workerIdList[i*3+2]] }}</td>-->
<td class="trTdBT" style="width: 7%;text-align: center;padding:0;">{{i*2+1}}</td>
<td class="trTdBT" style="width: 35%;text-align: center;padding:0;">{{workerIdList[i*2]}}</td>
<td class="trTdBT" style="width: 8%;text-align: center;padding:0;color: #ff0b0b">{{ workerDay[workerIdList[i*2]] }}</td>
<td class="trTdBT" style="width: 7%;text-align: center;padding:0;">{{workerIdList[i*2+1]==undefined?"":i*2+2}}</td>
<td class="trTdBT" style="width: 35%;text-align: center;padding:0;">{{workerIdList[i*2+1]}}</td>
<td class="trTdBT" style="width: 8%;text-align: center;padding:0;color: #ff0b0b">{{ workerDay[workerIdList[i*2+1]] }}</td>
</tr>
</div>
</div>
@ -67,23 +81,23 @@
<div style="width: 90%;padding-left: 5%;font-size: 12px">
<div class="showDiv" style="padding: 1%"></div>
<div style="display: flex;min-height: 20px;">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">1.立项名称111:</div>
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">1.立项名称:</div>
<div style="width: 50%">
<!-- <textarea disabled style="text-align: left; height: 100%;width: 100%">{{item.project}}</textarea>-->
{{item.project==null?"":item.project}}
</div>
</div>
<!-- <div class="showDiv"></div>-->
<!-- <div style="display: flex;min-height: 20px;">-->
<!-- <div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">2.施工地点:</div>-->
<!-- <div style="width: 50%">-->
<!--&lt;!&ndash; <textarea disabled style="text-align: left; height: 100%;width: 100%">{{item.planSgdd}}</textarea>&ndash;&gt;-->
<!-- {{item.planSgdd}}-->
<!-- </div>-->
<!-- </div>-->
<div class="showDiv"></div>
<div style="display: flex;min-height: 20px;">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">2.施工地点:</div>
<div style="width: 50%">
<!-- <textarea disabled style="text-align: left; height: 100%;width: 100%">{{item.planSgdd}}</textarea>-->
{{item.planSgdd}}
</div>
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 20px;">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">3.负责工长:</div>
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">2.负责工长:</div>
<div style="width: 50%">
<input disabled placeholder=" " style="text-align: left"
v-model="item.planFzgz"></input>
@ -91,7 +105,7 @@
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 20px;">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">4.是否一天:</div>
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">3.是否一天:</div>
<div style="width: 50%">
<input disabled placeholder=" " style="text-align: left"
v-model="item.isOne"></input>
@ -99,7 +113,7 @@
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 20px;">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">5.施工人员:</div>
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">4.施工人员:</div>
<div style="width: 50%">
<!-- <textarea disabled style="text-align: left; height: 100%;width: 100%">{{item.selectPersion==null?"":item.selectPersion}}</textarea>-->
{{item.selectPersion==null?"":item.selectPersion}}

View File

@ -5,6 +5,7 @@
<button v-else type="button" class="btn" size="mini" >未成稿</button>
<button v-if="status==1" type="button" class="btn" style="background-color: #fde866;" size="mini">最后成稿</button>
<button v-else type="button" class="btn" size="mini">最后成稿</button>
<button type="button" class="btn" size="mini" @click="goToo('/pages/pagetotal/businesstotal/uncommitted/main')">状态查询</button>
<button type="button" class="btn" size="mini" @click="goToo('/pages/pagetotal/businesstotal/totalLyb/main')">留言板</button>
</div>
<div class="bt" style="display: flex;min-height: 10px;">
@ -24,33 +25,46 @@
<!--展示施工人和施工人工作时间-->
<div style="padding-left: 1%;padding-right: 1%">
<tr style="display: flex;font-size: 5px;font-weight: bold;border: 2px solid #FDE866">
<td class="th-row" style="width: 7%;text-align: center">序号</td>
<td class="th-row" style="width: 12%;text-align: center">姓名</td>
<td class="th-row" style="width: 7%;text-align: center;padding-right: 8%">状态</td>
<!-- <td class="th-row" style="width: 7%;text-align: center">序号</td>-->
<!-- <td class="th-row" style="width: 12%;text-align: center">姓名</td>-->
<!-- <td class="th-row" style="width: 7%;text-align: center;padding-right: 8%">状态</td>-->
<td class="th-row" style="width: 7%;text-align: center">序号</td>
<td class="th-row" style="width: 12%;text-align: center">姓名</td>
<td class="th-row" style="width: 7%;text-align: center;padding-right: 8%">状态</td>
<!-- <td class="th-row" style="width: 7%;text-align: center">序号</td>-->
<!-- <td class="th-row" style="width: 12%;text-align: center">姓名</td>-->
<!-- <td class="th-row" style="width: 7%;text-align: center;padding-right: 8%">状态</td>-->
<td class="th-row" style="width: 7%;text-align: center">序号</td>
<td class="th-row" style="width: 12%;text-align: center">姓名</td>
<td class="th-row" style="width: 7%;text-align: center;padding-right: 2%">状态</td>
<!-- <td class="th-row" style="width: 7%;text-align: center">序号</td>-->
<!-- <td class="th-row" style="width: 12%;text-align: center">姓名</td>-->
<!-- <td class="th-row" style="width: 7%;text-align: center;padding-right: 2%">状态</td>-->
<td class="th-row" style="width: 7%;text-align: center;padding:0;">序号</td>
<td class="th-row" style="width: 35%;text-align: center;padding:0;">姓名</td>
<td class="th-row" style="width: 8%;text-align: center;padding:0;;">状态</td>
<td class="th-row" style="width: 7%;text-align: center;padding:0;">序号</td>
<td class="th-row" style="width: 35%;text-align: center;padding:0;">姓名</td>
<td class="th-row" style="width: 8%;text-align: center;padding:0;">状态</td>
</tr>
</div>
<div style="padding-left: 1%;padding-right: 1%">
<div v-for='i in workerNum' :key='i' style="border-left: 2px solid #FDE866;border-right: 2px solid #FDE866;">
<tr style="display: flex;font-size: 5px;font-weight: bold;border-bottom: 2px solid #eaeaea">
<td class="trTdBT" style="width: 7%;text-align: center">{{i*3+1}}</td>
<td class="trTdBT" style="width: 12%;text-align: center">{{workerIdList[i*3]}}</td>
<td class="trTdBT" style="width: 7%;text-align: center;padding-right: 8%;color: #ff0b0b">{{ workerDay[workerIdList[i*3]] }}</td>
<!-- <td class="trTdBT" style="width: 7%;text-align: center">{{i*3+1}}</td>-->
<!-- <td class="trTdBT" style="width: 12%;text-align: center">{{workerIdList[i*3]}}</td>-->
<!-- <td class="trTdBT" style="width: 7%;text-align: center;padding-right: 8%;color: #ff0b0b">{{ workerDay[workerIdList[i*3]] }}</td>-->
<td class="trTdBT" style="width: 7%;text-align: center">{{workerIdList[i*3+1]==undefined?"":i*3+2}}</td>
<td class="trTdBT" style="width: 12%;text-align: center">{{workerIdList[i*3+1]}}</td>
<td class="trTdBT" style="width: 7%;text-align: center;padding-right: 8%;color: #ff0b0b">{{ workerDay[workerIdList[i*3+1]] }}</td>
<!-- <td class="trTdBT" style="width: 7%;text-align: center">{{workerIdList[i*3+1]==undefined?"":i*3+2}}</td>-->
<!-- <td class="trTdBT" style="width: 12%;text-align: center">{{workerIdList[i*3+1]}}</td>-->
<!-- <td class="trTdBT" style="width: 7%;text-align: center;padding-right: 8%;color: #ff0b0b">{{ workerDay[workerIdList[i*3+1]] }}</td>-->
<td class="trTdBT" style="width: 7%;text-align: center">{{workerIdList[i*3+2]==undefined?"":i*3+3}}</td>
<td class="trTdBT" style="width: 12%;text-align: center">{{workerIdList[i*3+2]}}</td>
<td class="trTdBT" style="width: 7%;text-align: center;padding-right: 2%;color: #ff0b0b">{{ workerDay[workerIdList[i*3+2]] }}</td>
<!-- <td class="trTdBT" style="width: 7%;text-align: center">{{workerIdList[i*3+2]==undefined?"":i*3+3}}</td>-->
<!-- <td class="trTdBT" style="width: 12%;text-align: center">{{workerIdList[i*3+2]}}</td>-->
<!-- <td class="trTdBT" style="width: 7%;text-align: center;padding-right: 2%;color: #ff0b0b">{{ workerDay[workerIdList[i*3+2]] }}</td>-->
<td class="trTdBT" style="width: 7%;text-align: center;padding:0;">{{i*2+1}}</td>
<td class="trTdBT" style="width: 35%;text-align: center;padding:0;">{{workerIdList[i*2]}}</td>
<td class="trTdBT" style="width: 8%;text-align: center;padding:0;color: #ff0b0b">{{ workerDay[workerIdList[i*2]] }}</td>
<td class="trTdBT" style="width: 7%;text-align: center;padding:0;">{{workerIdList[i*2+1]==undefined?"":i*2+2}}</td>
<td class="trTdBT" style="width: 35%;text-align: center;padding:0;">{{workerIdList[i*2+1]}}</td>
<td class="trTdBT" style="width: 8%;text-align: center;padding:0;color: #ff0b0b">{{ workerDay[workerIdList[i*2+1]] }}</td>
</tr>
</div>
</div>
@ -75,17 +89,17 @@
{{item.projectNewName==null?item.project:item.projectNewName}}
</div>
</div>
<!-- <div class="showDiv"></div>-->
<!-- <div style="display: flex;min-height: 20px;">-->
<!-- <div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">2.施工地点:</div>-->
<!-- <div style="width: 50%">-->
<!--&lt;!&ndash; <textarea disabled style="text-align: left; height: 100%;width: 100%">{{item.planSgdd}}</textarea>&ndash;&gt;-->
<!-- {{item.planSgdd==null?"":item.planSgdd}}-->
<!-- </div>-->
<!-- </div>-->
<div class="showDiv"></div>
<div style="display: flex;min-height: 20px;">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">2.施工地点:</div>
<div style="width: 50%">
<!-- <textarea disabled style="text-align: left; height: 100%;width: 100%">{{item.planSgdd}}</textarea>-->
{{item.planSgdd==null?"":item.planSgdd}}
</div>
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 20px;">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">3.负责工长:</div>
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">2.负责工长:</div>
<div style="width: 50%">
<input disabled placeholder=" " style="text-align: left"
v-model="item.planFzgz"></input>
@ -93,7 +107,7 @@
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 20px;">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">4.是否一天:</div>
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">3.是否一天:</div>
<div style="width: 50%">
<input disabled placeholder=" " style="text-align: left"
v-model="item.isOne"></input>
@ -101,7 +115,7 @@
</div>
<div class="showDiv"></div>
<div style="display: flex;min-height: 20px;">
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">5.施工人员:</div>
<div style="text-align: left;padding: 1% 0 1% 4%;width: 38%">4.施工人员:</div>
<div style="width: 50%">
<!-- <textarea disabled style="text-align: left; height: 100%;width: 100%">{{item.selectPersion==null?"":item.selectPersion}}</textarea>-->
{{item.selectPersion==null?"":item.selectPersion}}
@ -214,7 +228,7 @@ export default {
components: {mpvuePicker},
methods: {
// 退
// 退 2024-3-8
approval(){
// isfinised 2
this.$http.request({
@ -222,25 +236,26 @@ export default {
method: 'post',
body: this.$http.adornData({
"dataList": this.dataList,
"isFinished": "2",
// "isFinished": "2", //
"isFinished": "0",
})
}).then(({data}) => {
if (data && data.code === 0) {
//
this.$http.request({
url: this.$http.adornUrl('/business/businessapproval/save'),
method: 'post',
body: this.$http.adornData({
'approvalId': 1,
'approvalName': this.planTime,
'approvalType': 88,
"approvalSuccess": 0,
})
}).then(({data}) => {
if (data && data.code === 0) {
// //
// this.$http.request({
// url: this.$http.adornUrl('/business/businessapproval/save'),
// method: 'post',
// body: this.$http.adornData({
// 'approvalId': 1,
// 'approvalName': this.planTime,
// 'approvalType': 88,
// "approvalSuccess": 0,
// })
// }).then(({data}) => {
// if (data && data.code === 0) {
this.searchData()
}
})
// }
// })
}
})
@ -347,6 +362,7 @@ export default {
});
},
searchData() {
console.log(this.dataListUrl);
// 稿 status=0
this.$http.request({
url: this.$http.adornUrl(this.dataListUrl),

View File

@ -5,6 +5,8 @@
</button>
<button disabled style="color: #d9d9d9" type="button" class="btn" size="mini">最终成稿
</button>
<button disabled style="color: #d9d9d9" type="button" class="btn" size="mini">状态查询
</button>
<button type="button" class="btn" size="mini" style="background-color: #fde866;">留言板
</button>
</div>
@ -23,14 +25,14 @@
立项名称{{ dataFormProject.projectNewName }}<br></span>
<span v-else> 立项名称{{ dataFormProject.project }}<br></span>
<span> 建设单位{{ dataFormProject.jsdw }}<br></span>
<span> 施工地点{{ dataFormProject.sgdd }}<br></span>
<span> 年份{{ dataFormProject.projectYear }}<br></span>
<span> 开工时间{{ dataFormProject.projectStart }}<br></span>
<span> 竣工时间{{ dataFormProject.projectEnd }}<br></span>
<span> 施工进度{{ dataFormProject.sgjd }}<br></span>
<span> 负责工长{{ dataFormProject.fzgz }}<br></span>
<span> 联络员{{ dataFormProject.lly }}<br></span>
<span> 工程类别{{ dataFormProject.gclb }}<br></span>
<!-- <span> 施工地点{{ dataFormProject.sgdd }}<br></span>-->
<span> 年份{{ dataFormProject.projectYear }}<br></span>
<span> 开工时间{{ dataFormProject.projectStart }}<br></span>
<span> 竣工时间{{ dataFormProject.projectEnd }}<br></span>
<span> 施工进度{{ dataFormProject.sgjd }}<br></span>
<span> 负责工长{{ dataFormProject.fzgz }}<br></span>
<span> 联络员{{ dataFormProject.lly }}<br></span>
<span> 工程类别{{ dataFormProject.gclb }}<br></span>
</div>
</div>
<div class="showDiv" ></div>

View File

@ -5,6 +5,8 @@
</button>
<button disabled style="color: #d9d9d9" type="button" class="btn" size="mini">最终成稿
</button>
<button disabled style="color: #d9d9d9" type="button" class="btn" size="mini">状态查询
</button>
<button :class="buttonIndex == 3?'bgcolor':''" type="button" class="btn" size="mini" @click="showDiv(3)">留言板
</button>
</div>
@ -427,11 +429,11 @@
<div style="text-align: center;padding-top: 1%"></div>
<div>
<tr class="th-row" style="display: flex;font-size: 12px;">
<td class="trTdBT" style="width: 10%;text-align: center">序号</td>
<td class="trTdBT" style="width: 14%;text-align: center">序号</td>
<!-- <td class="trTdBT" style="width: 9%;text-align: center">施工年份</td>-->
<!-- <td class="trTdBT" style="width: 15%;text-align: center">建设单位</td>-->
<td class="trTdBT" style="width: 38%;text-align: center">立项名称</td>
<td class="trTdBT" style="width: 37%;text-align: center">施工地点</td>
<td class="trTdBT" style="width: 75%;text-align: center">立项名称</td>
<!-- <td class="trTdBT" style="width: 37%;text-align: center">施工地点</td>-->
<!-- <td class="trTdBT" style="width: 9%;text-align: center">施工进度</td>-->
<!-- <td class="trTdBT" style="width: 9%;text-align: center">负责工长</td>-->
<!-- <td class="trTdBT" style="width: 9%;text-align: center">现场照片</td>-->
@ -443,7 +445,7 @@
<div v-if="selectOneDataId === item.projectId" style="background-color: #fdfad5"
@click="selectOneData(item.projectId,3)">
<tr class="td-row" style="display: flex;font-size: 12px">
<td class="th-rowProject" style="width: 10%;text-align: center">{{ indexFa + 1 }}</td>
<td class="th-rowProject" style="width: 14%;text-align: center">{{ indexFa + 1 }}</td>
<!-- <td class="th-rowProject" style="width: 9%;text-align: center">{{ item.projectYear }}</td>-->
<!-- <importWorker class="th-rowProject" style="width: 15%;text-align: center"
v-for="son in dicJsdwList" :key="son.dictId" v-if="son.dictId === item.projectJsdwId">
@ -457,7 +459,7 @@
<div v-for="(son,index) in dicJsdwList" :key="index" v-if="son.dictId === item.projectJsdwId">{{ son.name }}</div>
<div v-if="item.projectJsdwId == null">{{ "暂无" }}</div>
</td>-->
<td class="trTd" style="width: 38%;text-align: center">
<td class="trTd" style="width: 75%;text-align: center">
<div v-if="item.projectNewName == null">{{ item.project }}</div>
<div v-else>{{ item.projectNewName }}</div>
</td>
@ -479,10 +481,10 @@
"暂无"
}}
</importWorker>-->
<td class="th-rowProject" style="width: 37%;text-align: center">
<div v-for="(son,index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}</div>
<div v-if="item.projectSgddId == null">{{ "暂无" }}</div>
</td>
<!-- <td class="th-rowProject" style="width: 37%;text-align: center">-->
<!-- <div v-for="(son,index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}</div>-->
<!-- <div v-if="item.projectSgddId == null">{{ "暂无" }}</div>-->
<!-- </td>-->
<!-- <importWorker class="th-rowProject" style="width: 9%;text-align: center"
v-for="son in dicJdList" :key="son.dictId" v-if="son.dictId === item.projectSgjdId">{{ son.name }}
</importWorker>
@ -542,7 +544,7 @@
{{ item.project }}
</importWorker>
<importWorker v-else class="trTd" style="width: 15%;text-align: center">{{ item.projectNewName }}</importWorker>-->
<td class="th-rowProject" style="width: 38%;text-align: center">
<td class="th-rowProject" style="width: 75%;text-align: center">
<div v-if="item.projectNewName == null">{{ item.project }}</div>
<div v-else>{{ item.projectNewName }}</div>
</td>
@ -553,10 +555,10 @@
"暂无"
}}
</importWorker>-->
<td class="th-rowProject" style="width: 37%;text-align: center">
<div v-for="(son,index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}</div>
<div v-if="item.projectSgddId == null">{{ "暂无" }}</div>
</td>
<!-- <td class="th-rowProject" style="width: 37%;text-align: center">-->
<!-- <div v-for="(son,index) in dicDDList" :key="index" v-if="son.dictId === item.projectSgddId">{{ son.name }}</div>-->
<!-- <div v-if="item.projectSgddId == null">{{ "暂无" }}</div>-->
<!-- </td>-->
<!-- <importWorker class="th-rowProject" style="width: 9%;text-align: center"
v-for="son in dicJdList" :key="son.dictId" v-if="son.dictId === item.projectSgjdId">{{ son.name }}
</importWorker>
@ -1257,6 +1259,7 @@ export default {
justify-content: center;
align-items: center;
font-size: 12px;
border: 1px solid #efeded;
/*color: white;*/
}

View File

@ -0,0 +1,12 @@
import Vue from 'vue'
import App from './uncommitted'
// add this to handle exception
Vue.config.errorHandler = function (err) {
if (console && console.error) {
console.error(err)
}
}
const app = new Vue(App)
app.$mount()

View File

@ -0,0 +1,121 @@
<template>
<div style="background-color: #eeeeee;min-height: 100vh;">
<div style="display: flex;padding: 4% 1% 4% 1%;">
<button disabled style="color: #d9d9d9" type="button" class="btn" size="mini">未成稿
</button>
<button disabled style="color: #d9d9d9" type="button" class="btn" size="mini">最终成稿
</button>
<button type="button" class="btn" size="mini" style="background-color: #fde866;">状态查询
</button>
<button disabled style="color: #d9d9d9" type="button" class="btn" size="mini">留言板
</button>
</div>
<div style="padding: 0 0 10% 4%;width: 92%">
<div style="background-color: white;border-radius: 10px;padding: 4% 4% 5% 4%;min-height: 78vh">
<!-- 列表部分-->
<div>
<div>
<tr class="th-row"
style="display: flex;font-size: 12px;border: 2px solid #FDE866;font-weight: bold">
<td class="th-td" style="width: 20%;">序号</td>
<td class="th-td" style="width: 40%;">未提交类型</td>
<td class="th-td" style="width: 40%;">未提交时间</td>
</tr>
</div>
<div v-for="(item,index) in dataList" :key="index"
style="border-right: 2px solid #fde866;border-left: 2px solid #fde866;">
<tr class="th-row">
<td class="th-td" style="width: 20%;">{{ index + 1 }}</td>
<td class="th-td" style="width: 40%;">{{ item.gclb }}</td>
<td class="th-td" style="width: 40%;">{{ item.planTime }}</td>
</tr>
</div>
<div v-if="!dataList.length > 0" style="text-align: center;font-size: 14px;">
暂无数据
</div>
<div style="border-bottom: 2px solid #fde866"></div>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
name: "状态查询",
data() {
return {
//
dataList: []
}
},
methods: {
addEdit(url) {
//console.log(url);
wx.navigateTo({
url: url
})
},
closePage() {
wx.navigateBack({
delta: 1
})
},
//
searList() {
this.dataList = [];
this.$http.request({
url: this.$http.adornUrl('/business/businesstotal/uncommittedList'),
method: 'get',
}).then(({data}) => {
if (data && data.code === 0) {
this.dataList = data.page;
} else {
this.closePage();
}
})
}
},
onLoad() {
wx.setNavigationBarTitle({
title: '今日总结-状态查询'
})
this.searList();
},
onShow () {
this.searList();
}
}
</script>
<style scoped>
.btn {
text-align: center;
border-radius: 8px;
width: 20%;
height: 25px;
font-size: 11px;
font-weight: bold;
display: flex;
justify-content: center;
align-items: center;
}
/************** 列表 ****************/
.th-row {
display: flex;
font-size: 12px;
border: 1px solid #efeded;
}
.th-td {
min-height: 20px;
display: flex;
justify-content: center;
align-items: center;
font-size: 12px;
border-right: 2px solid #efeded;
}
</style>

File diff suppressed because it is too large Load Diff

View File

@ -94,11 +94,11 @@
<div class="showDiv" style="padding: 1%"></div>
<div style="width:100%;text-align: center;margin:10% 0;">
<button v-if="!showButton" class="btn" size="mini"
style="text-align: center;width: 25%;height: 5vh;background-color: #FF0000;border-radius: 5px"
style="text-align: center;width: 25%;height: 5vh;background-color: #FF0000;color:#FFFFFF;border-radius: 5px"
@click="dataFormSubmit()">保存
</button>
<button v-else-if="showButton" class="btn" size="mini"
style="text-align: center;width: 35%;height: 5vh;background-color: #FF0000;border-radius: 5px"
style="text-align: center;width: 35%;height: 5vh;background-color: #FF0000;color:#FFFFFF;border-radius: 5px"
@click="dataFormApproval()">提交修改
</button>
</div>

View File

@ -14,7 +14,7 @@
<div style="width: 80%;padding-left: 10%;font-size: 12px">
<div class="showDiv"></div>
<div style="display: flex; height: 30px" @click="showPicker(1)">
<div style="text-align: left;padding: 2% 0 1% 4%;width:43%">1&nbsp;(all)</div>
<div style="text-align: left;padding: 2% 0 1% 4%;width:43%">1&nbsp;(all)</div>
<div style="width: 37%; padding-top: 1%">
<input disabled style="text-align: left" placeholder=" " v-model="wz"></input>
</div>
@ -26,7 +26,7 @@
@onConfirm="pickerConfirmWz"></mpvue-picker>
<div class="showDiv"></div>
<div style="display: flex; height: 30px" @click="showPicker(2)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 43%">2&nbsp;(all)</div>
<div style="text-align: left;padding: 2% 0 1% 4%;width: 43%">2&nbsp;(all)</div>
<div style="width: 37%; padding-top: 1%">
<input disabled style="text-align: left" placeholder=" " v-model="zw"></input>
</div>
@ -49,20 +49,20 @@
:pickerValueDefault='pickerValueDefaultZZZT'
@onConfirm="pickerConfirmZZZT"></mpvue-picker>
<div class="showDiv"></div>
<div style="display: flex; height: 30px" @click="showPicker(4)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 43%">4&nbsp;工种(all)</div>
<div style="width: 37%; padding-top: 1%">
<input disabled style="text-align: left" placeholder=" " v-model="gz"></input>
</div>
<div class="arrowOpen"></div>
</div>
<div class="showDiv"></div>
<!-- <div style="display: flex; height: 30px" @click="showPicker(4)">-->
<!-- <div style="text-align: left;padding: 2% 0 1% 4%;width: 43%">4&nbsp;工种(all)</div>-->
<!-- <div style="width: 37%; padding-top: 1%">-->
<!-- <input disabled style="text-align: left" placeholder=" " v-model="gz"></input>-->
<!-- </div>-->
<!-- <div class="arrowOpen"></div>-->
<!-- </div>-->
<!-- <div class="showDiv"></div>-->
<mpvue-picker v-if="isShow" ref="mpvuePickerGz"
:pickerValueArray="pickerValueArrayGz"
:pickerValueDefault='pickerValueDefaultGz'
@onConfirm="pickerConfirmGz"></mpvue-picker>
<div style="display: flex; height: 30px" @click="showPicker(5)">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 43%">5&nbsp;是否保险(all)</div>
<div style="text-align: left;padding: 2% 0 1% 4%;width: 43%">4&nbsp;是否保险(all)</div>
<div style="width: 37%; padding-top: 1%">
<input disabled style="text-align: left" placeholder=" " v-model="bx"></input>
</div>
@ -75,7 +75,7 @@
@onConfirm="pickerConfirmBX"></mpvue-picker>
<div style="display: flex; height: 30px">
<div style="text-align: left;padding: 2% 0 1% 4%;width: 40%">6&nbsp;关键字(all)</div>
<div style="text-align: left;padding: 2% 0 1% 4%;width: 40%">5&nbsp;关键字(all)</div>
<div style="width: 40%; padding-top: 1%">
<input style="text-align: left" v-model="gjz" @input ="searchList"></input>
</div>
@ -91,13 +91,13 @@
<div>
<tr class="th-row" style="display: flex;font-size: 12px;border: 2px solid #ff0b0b;font-weight: bold">
<td class="trTd" style="width: 10%;text-align: center">序号</td>
<td class="trTd" style="width: 15%;text-align: center">姓名</td>
<td class="trTd" style="width: 45%;text-align: center">姓名</td>
<!-- <td class="trTd" style="width: 16%;text-align: center">位置</td>-->
<td class="trTd" style="width: 30%;text-align: center"></td>
<td class="trTd" style="width: 20%;text-align: center">工种</td>
<td class="trTd" style="width: 30%;text-align: center"></td>
<!-- <td class="trTd" style="width: 20%;text-align: center">工种</td>-->
<!--<td class="trTd" style="width: 12%;text-align: center">状态</td>
<td class="trTd" style="width: 10%;text-align: center">年龄</td>-->
<td class="trTd" style="width: 10%;text-align: center">保险</td>
<!-- <td class="trTd" style="width: 10%;text-align: center">保险</td>-->
<td class="trTd" style="width: 15%;text-align: center">操作</td>
</tr>
</div>
@ -105,7 +105,7 @@
<!-- <tr v-if="item.positionId==148" class="td-row" style="display: flex;font-size: 12px; background-color: #e3e3e3;">-->
<tr v-if="item.positionId==148" class="td-row" style="display: flex;font-size: 12px;">
<td class="trTd" style="width: 10%;text-align: center">{{ indexList + 1 }}</td>
<td class="trTd" style="width: 15%;text-align: center">{{ item.name }}</td>
<td class="trTd" style="width: 45%;text-align: center">{{ item.name }}</td>
<!-- <td class="trTd" style="width: 16%;text-align: center"-->
<!-- v-for="(wz,index) in dataListDic" :key="index" v-if="wz.dictId === item.positionId">-->
<!-- {{ wz.name }}-->
@ -120,21 +120,21 @@
</td>
<td class="trTd" style="width: 30%;text-align: center"
v-if="item.workId === '' || item.workId === null || item.workId === undefined">
无职位
</td>
<td class="trTd" style="width: 20%;text-align: center"
v-for="(jb,index) in pickerValueArrayGz" :key="index" v-if="jb.value === item.jobId">
{{ jb.label }}
</td>
<td class="trTd" style="width: 20%;text-align: center"
v-if="item.jobId === '' || item.jobId === null || item.jobId === undefined">
暂无
无岗位
</td>
<!-- <td class="trTd" style="width: 20%;text-align: center"-->
<!-- v-for="(jb,index) in pickerValueArrayGz" :key="index" v-if="jb.value === item.jobId">-->
<!-- {{ jb.label }}-->
<!-- </td>-->
<!-- <td class="trTd" style="width: 20%;text-align: center"-->
<!-- v-if="item.jobId === '' || item.jobId === null || item.jobId === undefined">-->
<!-- 暂无-->
<!-- </td>-->
<!--<td class="trTd" style="width: 12%;text-align: center" v-if="item.status === 0">在职</td>
<td class="trTd" style="width: 12%;text-align: center" v-else-if="item.status !== 0">离职</td>
<td class="trTd" style="width: 10%;text-align: center">{{ item.age === null ? '暂无' : item.age }}</td>-->
<td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>
<td class="trTd" style="width: 10%;text-align: center" v-else></td>
<!-- <td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center" v-else></td>-->
<td class="trTd" style="width: 15%">
<span v-if="editShow"
@click="addEdit('/pages/pageworker/businessworker/addEdit/main?title=人员管理-修改-'+item.name+'&&id='+item.userId+'&&isLink=0')">修改</span>
@ -143,7 +143,7 @@
<!-- <tr v-else-if="item.positionId==149" class="td-row" style="display: flex;font-size: 12px; background-color: #C9C9C9;">-->
<tr v-else-if="item.positionId==149" class="td-row" style="display: flex;font-size: 12px;">
<td class="trTd" style="width: 10%;text-align: center">{{ indexList + 1 }}</td>
<td class="trTd" style="width: 15%;text-align: center">{{ item.name }}</td>
<td class="trTd" style="width: 45%;text-align: center">{{ item.name }}</td>
<!-- <td class="trTd" style="width: 16%;text-align: center"-->
<!-- v-for="(wz,index) in dataListDic" :key="index" v-if="wz.dictId === item.positionId">-->
<!-- {{ wz.name }}-->
@ -158,21 +158,21 @@
</td>
<td class="trTd" style="width: 30%;text-align: center"
v-if="item.workId === '' || item.workId === null || item.workId === undefined">
无职位
</td>
<td class="trTd" style="width: 20%;text-align: center"
v-for="(jb,index) in pickerValueArrayGz" :key="index" v-if="jb.value === item.jobId">
{{ jb.label }}
</td>
<td class="trTd" style="width: 20%;text-align: center"
v-if="item.jobId === '' || item.jobId === null || item.jobId === undefined">
暂无
无岗位
</td>
<!-- <td class="trTd" style="width: 20%;text-align: center"-->
<!-- v-for="(jb,index) in pickerValueArrayGz" :key="index" v-if="jb.value === item.jobId">-->
<!-- {{ jb.label }}-->
<!-- </td>-->
<!-- <td class="trTd" style="width: 20%;text-align: center"-->
<!-- v-if="item.jobId === '' || item.jobId === null || item.jobId === undefined">-->
<!-- 暂无-->
<!-- </td>-->
<!--<td class="trTd" style="width: 12%;text-align: center" v-if="item.status === 0">在职</td>
<td class="trTd" style="width: 12%;text-align: center" v-else-if="item.status !== 0">离职</td>
<td class="trTd" style="width: 10%;text-align: center">{{ item.age === null ? '暂无' : item.age }}</td>-->
<td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>
<td class="trTd" style="width: 10%;text-align: center" v-else></td>
<!-- <td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center" v-else></td>-->
<td class="trTd" style="width: 15%">
<span v-if="editShow"
@click="addEdit('/pages/pageworker/businessworker/addEdit/main?title=人员管理-修改-'+item.name+'&&id='+item.userId+'&&isLink=0')">修改</span>
@ -180,7 +180,7 @@
</tr>
<tr v-else-if="item.positionId==152" class="td-row" style="display: flex;font-size: 12px; background-color: #e3e3e3;">
<td class="trTd" style="width: 10%;text-align: center">{{ indexList + 1 }}</td>
<td class="trTd" style="width: 15%;text-align: center">{{ item.name }}</td>
<td class="trTd" style="width: 45%;text-align: center">{{ item.name }}</td>
<!-- <td class="trTd" style="width: 16%;text-align: center"-->
<!-- v-for="(wz,index) in dataListDic" :key="index" v-if="wz.dictId === item.positionId">-->
<!-- {{ wz.name }}-->
@ -195,21 +195,21 @@
</td>
<td class="trTd" style="width: 30%;text-align: center"
v-if="item.workId === '' || item.workId === null || item.workId === undefined">
无职位
</td>
<td class="trTd" style="width: 20%;text-align: center"
v-for="(jb,index) in pickerValueArrayGz" :key="index" v-if="jb.value === item.jobId">
{{ jb.label }}
</td>
<td class="trTd" style="width: 20%;text-align: center"
v-if="item.jobId === '' || item.jobId === null || item.jobId === undefined">
暂无
无岗位
</td>
<!-- <td class="trTd" style="width: 20%;text-align: center"-->
<!-- v-for="(jb,index) in pickerValueArrayGz" :key="index" v-if="jb.value === item.jobId">-->
<!-- {{ jb.label }}-->
<!-- </td>-->
<!-- <td class="trTd" style="width: 20%;text-align: center"-->
<!-- v-if="item.jobId === '' || item.jobId === null || item.jobId === undefined">-->
<!-- 暂无-->
<!-- </td>-->
<!--<td class="trTd" style="width: 12%;text-align: center" v-if="item.status === 0">在职</td>
<td class="trTd" style="width: 12%;text-align: center" v-else-if="item.status !== 0">离职</td>
<td class="trTd" style="width: 10%;text-align: center">{{ item.age === null ? '暂无' : item.age }}</td>-->
<td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>
<td class="trTd" style="width: 10%;text-align: center" v-else></td>
<!-- <td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center" v-else></td>-->
<td class="trTd" style="width: 15%">
<span v-if="editShow"
@click="addEdit('/pages/pageworker/businessworker/addEdit/main?title=人员管理-修改-'+item.name+'&&id='+item.userId+'&&isLink=0')">修改</span>
@ -218,7 +218,7 @@
<!-- <tr v-else-if="item.positionId==150" class="td-row" style="display: flex;font-size: 12px; background-color: #aaaaaa">-->
<tr v-else-if="item.positionId==150" class="td-row" style="display: flex;font-size: 12px;">
<td class="trTd" style="width: 10%;text-align: center">{{ indexList + 1 }}</td>
<td class="trTd" style="width: 15%;text-align: center">{{ item.name }}</td>
<td class="trTd" style="width: 45%;text-align: center">{{ item.name }}</td>
<!-- <td class="trTd" style="width: 16%;text-align: center"-->
<!-- v-for="(wz,index) in dataListDic" :key="index" v-if="wz.dictId === item.positionId">-->
<!-- {{ wz.name }}-->
@ -233,21 +233,21 @@
</td>
<td class="trTd" style="width: 30%;text-align: center"
v-if="item.workId === '' || item.workId === null || item.workId === undefined">
无职位
</td>
<td class="trTd" style="width: 20%;text-align: center"
v-for="(jb,index) in pickerValueArrayGz" :key="index" v-if="jb.value === item.jobId">
{{ jb.label }}
</td>
<td class="trTd" style="width: 20%;text-align: center"
v-if="item.jobId === '' || item.jobId === null || item.jobId === undefined">
暂无
无岗位
</td>
<!-- <td class="trTd" style="width: 20%;text-align: center"-->
<!-- v-for="(jb,index) in pickerValueArrayGz" :key="index" v-if="jb.value === item.jobId">-->
<!-- {{ jb.label }}-->
<!-- </td>-->
<!-- <td class="trTd" style="width: 20%;text-align: center"-->
<!-- v-if="item.jobId === '' || item.jobId === null || item.jobId === undefined">-->
<!-- 暂无-->
<!-- </td>-->
<!--<td class="trTd" style="width: 12%;text-align: center" v-if="item.status === 0">在职</td>
<td class="trTd" style="width: 12%;text-align: center" v-else-if="item.status !== 0">离职</td>
<td class="trTd" style="width: 10%;text-align: center">{{ item.age === null ? '暂无' : item.age }}</td>-->
<td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>
<td class="trTd" style="width: 10%;text-align: center" v-else></td>
<!-- <td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center" v-else></td>-->
<td class="trTd" style="width: 15%">
<span v-if="editShow"
@click="addEdit('/pages/pageworker/businessworker/addEdit/main?title=人员管理-修改-'+item.name+'&&id='+item.userId+'&&isLink=0')">修改</span>
@ -255,7 +255,7 @@
</tr>
<tr v-else-if="item.positionId==151" class="td-row" style="display: flex;font-size: 12px; background-color: #c5c8ce">
<td class="trTd" style="width: 10%;text-align: center">{{ indexList + 1 }}</td>
<td class="trTd" style="width: 15%;text-align: center">{{ item.name }}</td>
<td class="trTd" style="width: 45%;text-align: center">{{ item.name }}</td>
<!-- <td class="trTd" style="width: 16%;text-align: center"-->
<!-- v-for="(wz,index) in dataListDic" :key="index" v-if="wz.dictId === item.positionId">-->
<!-- {{ wz.name }}-->
@ -270,21 +270,21 @@
</td>
<td class="trTd" style="width: 30%;text-align: center"
v-if="item.workId === '' || item.workId === null || item.workId === undefined">
无职位
</td>
<td class="trTd" style="width: 20%;text-align: center"
v-for="(jb,index) in pickerValueArrayGz" :key="index" v-if="jb.value === item.jobId">
{{ jb.label }}
</td>
<td class="trTd" style="width: 20%;text-align: center"
v-if="item.jobId === '' || item.jobId === null || item.jobId === undefined">
暂无
无岗位
</td>
<!-- <td class="trTd" style="width: 20%;text-align: center"-->
<!-- v-for="(jb,index) in pickerValueArrayGz" :key="index" v-if="jb.value === item.jobId">-->
<!-- {{ jb.label }}-->
<!-- </td>-->
<!-- <td class="trTd" style="width: 20%;text-align: center"-->
<!-- v-if="item.jobId === '' || item.jobId === null || item.jobId === undefined">-->
<!-- 暂无-->
<!-- </td>-->
<!--<td class="trTd" style="width: 12%;text-align: center" v-if="item.status === 0">在职</td>
<td class="trTd" style="width: 12%;text-align: center" v-else-if="item.status !== 0">离职</td>
<td class="trTd" style="width: 10%;text-align: center">{{ item.age === null ? '暂无' : item.age }}</td>-->
<td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>
<td class="trTd" style="width: 10%;text-align: center" v-else></td>
<!-- <td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center" v-else></td>-->
<td class="trTd" style="width: 15%">
<span v-if="editShow"
@click="addEdit('/pages/pageworker/businessworker/addEdit/main?title=人员管理-修改-'+item.name+'&&id='+item.userId+'&&isLink=0')">修改</span>
@ -292,7 +292,7 @@
</tr>
<tr v-else class="td-row" style="display: flex;font-size: 12px">
<td class="trTd" style="width: 10%;text-align: center">{{ indexList + 1 }}</td>
<td class="trTd" style="width: 15%;text-align: center">{{ item.name }}</td>
<td class="trTd" style="width: 45%;text-align: center">{{ item.name }}</td>
<!-- <td class="trTd" style="width: 16%;text-align: center"-->
<!-- v-for="(wz,index) in dataListDic" :key="index" v-if="wz.dictId === item.positionId">-->
<!-- {{ wz.name }}-->
@ -307,21 +307,21 @@
</td>
<td class="trTd" style="width: 30%;text-align: center"
v-if="item.workId === '' || item.workId === null || item.workId === undefined">
无职位
</td>
<td class="trTd" style="width: 20%;text-align: center"
v-for="(jb,index) in pickerValueArrayGz" :key="index" v-if="jb.value === item.jobId">
{{ jb.label }}
</td>
<td class="trTd" style="width: 20%;text-align: center"
v-if="item.jobId === '' || item.jobId === null || item.jobId === undefined">
暂无
无岗位
</td>
<!-- <td class="trTd" style="width: 20%;text-align: center"-->
<!-- v-for="(jb,index) in pickerValueArrayGz" :key="index" v-if="jb.value === item.jobId">-->
<!-- {{ jb.label }}-->
<!-- </td>-->
<!-- <td class="trTd" style="width: 20%;text-align: center"-->
<!-- v-if="item.jobId === '' || item.jobId === null || item.jobId === undefined">-->
<!-- 暂无-->
<!-- </td>-->
<!--<td class="trTd" style="width: 12%;text-align: center" v-if="item.status === 0">在职</td>
<td class="trTd" style="width: 12%;text-align: center" v-else-if="item.status !== 0">离职</td>
<td class="trTd" style="width: 10%;text-align: center">{{ item.age === null ? '暂无' : item.age }}</td>-->
<td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>
<td class="trTd" style="width: 10%;text-align: center" v-else></td>
<!-- <td class="trTd" style="width: 10%;text-align: center" v-if="item.isSafe === 1"></td>-->
<!-- <td class="trTd" style="width: 10%;text-align: center" v-else></td>-->
<td class="trTd" style="width: 15%">
<span v-if="editShow"
@click="addEdit('/pages/pageworker/businessworker/addEdit/main?title=人员管理-修改-'+item.name+'&&id='+item.userId+'&&isLink=0')">修改</span>

View File

@ -158,7 +158,8 @@ export default {
url: this.$http.adornUrl('/business/businessworkercq/updateList'),
method: 'post',
body: this.$http.adornData({
"list":this.dataList
"list":this.dataList,
"dateDay": this.planTime,
})
}).then(({data}) => {
if (data && data.code === 0) {
@ -320,6 +321,7 @@ export default {
width: 25%;
margin-top: 4%;
background-color: #FF0000;
color: #FFFFFF;
height: 5vh;
border-radius: 5px;
font-size: 14px;

View File

@ -7,9 +7,9 @@ var Fly=require("flyio/dist/npm/wx")
var http=new Fly
// 本地
// const BaseUrl='http://localhost:2222/renren-fast'
const BaseUrl='http://localhost:2222/renren-fast'
//生产
const BaseUrl='https://www.youhuajianzhu.cn/renren-fast'
// const BaseUrl='https://www.youhuajianzhu.cn/renren-fast'
http.config.timeout = 1000 * 60 * 60 * 24 * 20; //设置超时
http.config.baseURL = BaseUrl; //填写域名