yunxi
/
mes-heli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source 
# Conflicts:
#	mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/shipmentsPrint.vue
pull/3/head
zengchenxi 9 months ago
parent a8d78e07a3 4d9a13fb3d
commit ccdde891f2
2 changed files with 42 additions and 57 deletions
Show Stats Download Patch File Download Diff File

56
mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/shipmentsPrint.vue
Unescape View File

@ -10,9 +10,7 @@
<div style="display: flex; align-items: center; justify-content: space-between"> <div style="display: flex; align-items: center; justify-content: space-between">
<img src="/src/assets/imgs/exlogo.png" style="width: 100px" alt="" /> <img src="/src/assets/imgs/exlogo.png" style="width: 100px" alt="" />
<span style="font-size: 20px; font-weight: 700">发货单</span> <span style="font-size: 20px; font-weight: 700">发货单</span>
<span <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span
>
</div> </div>
</td> </td>
</tr> </tr>
@ -64,11 +62,7 @@
<td>尺寸(米)</td> <td>尺寸(米)</td>
<td colspan="2"> 备注 </td> <td colspan="2"> 备注 </td>
</tr> </tr>
<tr <tr v-show="subTotalAmount <= splitThreshold" v-for="(item, index) in formData.deliverOrderSubs" :key="index">
v-show="subTotalAmount <= splitThreshold"
v-for="(item, index) in formData.deliverOrderSubs"
:key="index"
>
<td colspan="4">{{ item.name }}</td> <td colspan="4">{{ item.name }}</td>
<td>{{ getDictLabel(DICT_TYPE.HELI_MATERIAL_UNIT, item.unit) }}</td> <td>{{ getDictLabel(DICT_TYPE.HELI_MATERIAL_UNIT, item.unit) }}</td>
<td>{{ item.amount }}</td> <td>{{ item.amount }}</td>
@ -123,8 +117,7 @@
<td colspan="2" v-if="formData.transportBusNumber">{{ formData.transportBusNumber }}</td> <td colspan="2" v-if="formData.transportBusNumber">{{ formData.transportBusNumber }}</td>
<td colspan="2" v-else style="width: 50px"></td> <td colspan="2" v-else style="width: 50px"></td>
<td> 电话 </td> <td> 电话 </td>
<td colspan="2" v-if="formData.transportDriverMobile" <td colspan="2" v-if="formData.transportDriverMobile">{{ formData.transportDriverMobile }}
>{{ formData.transportDriverMobile }}
</td> </td>
<td colspan="2" v-else style="width: 50px"></td> <td colspan="2" v-else style="width: 50px"></td>
</tr> </tr>
@ -144,20 +137,13 @@
<div class="divide_line" style="margin: 20px 0"></div> <div class="divide_line" style="margin: 20px 0"></div>
<!-- 回单联 --> <!-- 回单联 -->
<table border="2" cellspacing="0" id="table1" style="position: relative !important"> <table border="2" cellspacing="0" id="table1" style="position: relative !important">
<!-- <img
src="/src/assets/imgs/exlogo.png"
style="position: absolute; top: 10px; width: 90px"
alt=""
/> -->
<tbody> <tbody>
<tr> <tr>
<td colspan="10"> <td colspan="10">
<div style="display: flex; align-items: center; justify-content: space-between"> <div style="display: flex; align-items: center; justify-content: space-between">
<img src="/src/assets/imgs/exlogo.png" style="width: 100px" alt="" /> <img src="/src/assets/imgs/exlogo.png" style="width: 100px" alt="" />
<span style="font-size: 20px; font-weight: 700">发货单</span> <span style="font-size: 20px; font-weight: 700">发货单</span>
<span <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span
>
</div> </div>
</td> </td>
</tr> </tr>
@ -209,11 +195,7 @@
<td>尺寸(米)</td> <td>尺寸(米)</td>
<td colspan="2"> 备注 </td> <td colspan="2"> 备注 </td>
</tr> </tr>
<tr <tr v-show="subTotalAmount <= splitThreshold" v-for="(item, index) in formData.deliverOrderSubs" :key="index">
v-show="subTotalAmount <= splitThreshold"
v-for="(item, index) in formData.deliverOrderSubs"
:key="index"
>
<td colspan="4">{{ item.name }}</td> <td colspan="4">{{ item.name }}</td>
<td>{{ getDictLabel(DICT_TYPE.HELI_MATERIAL_UNIT, item.unit) }}</td> <td>{{ getDictLabel(DICT_TYPE.HELI_MATERIAL_UNIT, item.unit) }}</td>
<td>{{ item.amount }}</td> <td>{{ item.amount }}</td>
@ -268,8 +250,7 @@
<td colspan="2" v-if="formData.transportBusNumber">{{ formData.transportBusNumber }}</td> <td colspan="2" v-if="formData.transportBusNumber">{{ formData.transportBusNumber }}</td>
<td colspan="2" v-else style="width: 50px"></td> <td colspan="2" v-else style="width: 50px"></td>
<td> 电话 </td> <td> 电话 </td>
<td colspan="2" v-if="formData.transportDriverMobile" <td colspan="2" v-if="formData.transportDriverMobile">{{ formData.transportDriverMobile }}
>{{ formData.transportDriverMobile }}
</td> </td>
<td colspan="2" v-else style="width: 50px"></td> <td colspan="2" v-else style="width: 50px"></td>
</tr> </tr>
@ -282,15 +263,13 @@
</td> </td>
</tr> </tr>
</table> </table>
<div <div style="
style="
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
margin-bottom: 20px; margin-bottom: 20px;
" ">
>
<span>制单人：{{ formData.creatorName }}</span> <span>制单人：{{ formData.creatorName }}</span>
<span>-回单联-</span> <span>-回单联-</span>
</div> </div>
@ -298,7 +277,7 @@
<!-- 附件需要判断 --> <!-- 附件需要判断 -->
<div v-if="subTotalAmount > splitThreshold"> <div v-if="subTotalAmount > splitThreshold">
<div class="divide_line1" style="margin-top: 30px"></div> <div class="divide_line1" style="margin-top: 40px"></div>
<table border="2" cellspacing="0" id="table1" style="height: 28cm"> <table border="2" cellspacing="0" id="table1" style="height: 28cm">
<tbody> <tbody>
<tr> <tr>
@ -363,7 +342,16 @@
<td> {{ item.amount }} </td> <td> {{ item.amount }} </td>
<td colspan="2">{{ item.remark }} </td> <td colspan="2">{{ item.remark }} </td>
</tr> </tr>
</tbody>
<tbody v-if="subTotalAmount <20">
<tr v-for="item in (20-subTotalAmount)" :key="item">
<td> &nbsp;</td>
<td colspan="3">
</td>
<td colspan="3"></td>
<td></td>
<td colspan="2"></td>
</tr>
</tbody> </tbody>
<tr> <tr>
<td colspan="10"> <td colspan="10">
@ -371,15 +359,13 @@
</td> </td>
</tr> </tr>
</table> </table>
<div <div style="
style="
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
margin-bottom: 20px; margin-bottom: 20px;
" ">
>
<span>制单人：{{ formData.creatorName }}</span> <span>制单人：{{ formData.creatorName }}</span>
<span>-回单联-</span> <span>-回单联-</span>
</div> </div>

43
mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue
Unescape View File

@ -13,22 +13,22 @@
<td colspan="6"> <td colspan="6">
<span style="font-size: 20px; font-weight: 700">开发项目启动单</span> <span style="font-size: 20px; font-weight: 700">开发项目启动单</span>
</td> </td>
<td colspan="2" style="padding: 5px 0"> <td colspan="2" style="padding: 5px 0">
<div style="border-bottom: 1px solid #666; padding-bottom: 5px">项目编号</div> <div style="border-bottom: 1px solid #666; padding-bottom: 5px">项目编号</div>
<div style="padding-top: 5px">{{ `formData.code` }}</div> <div style="padding-top: 5px">{{ formData.code}}</div>
</td> </td>
</tr> </tr>
</tbody> </tbody>
<tbody> <tbody>
<tr> <tr>
<td colspan="2"> 客户名称 </td> <td colspan="2"> 客户名称 </td>
<td colspan="5"> <td colspan="5">
<span>{{ formData.customer.name }}</span> <span>{{ formData.customer.name }}</span>
</td> </td>
<td colspan="1">{{ formData.customer.brief }}</td> <td colspan="1">{{ formData.customer.brief }}</td>
<td> 编码： </td> <td> 编码： </td>
<td>{{ formData.customer.code }} </td> <td>{{ formData.customer.code }} </td>
</tr> </tr>
</tbody> </tbody>
<tr> <tr>
<td colspan="2"> 项目名称 </td> <td colspan="2"> 项目名称 </td>
@ -56,10 +56,7 @@
<div style="display: flex; justify-content: space-between"> <div style="display: flex; justify-content: space-between">
<div style="width: 42%; font-size: 12px; display: flex; flex-direction: column"> <div style="width: 42%; font-size: 12px; display: flex; flex-direction: column">
<div style="text-align: left; width: 100%">客户提供资料：</div> <div style="text-align: left; width: 100%">客户提供资料：</div>
<div <div id="fruitForm" style="display: flex; justify-content: flex-start; align-items: center">
id="fruitForm"
style="display: flex; justify-content: flex-start; align-items: center"
>
<span class="checkbox" v-if="formData.hasContract == 0"></span> <span class="checkbox" v-if="formData.hasContract == 0"></span>
<span class="checkbox" v-else-if="formData.hasContract == 1">√</span> <span class="checkbox" v-else-if="formData.hasContract == 1">√</span>
<label for="checkbox1">开发合同</label> <label for="checkbox1">开发合同</label>
@ -100,9 +97,11 @@
</tr> </tr>
<tbody> <tbody>
<tr <tr>
><td colspan="10"> <div style="text-align: left; width: 100%">子项目信息</div></td></tr <td colspan="10">
> <div style="text-align: left; width: 100%">子项目信息</div>
</td>
</tr>
<tr> <tr>
<td class="xh"> 序号 </td> <td class="xh"> 序号 </td>
@ -169,8 +168,8 @@ import * as ProjectOrderApi from '@/api/heli/projectorder'
import { getIntDictOptions, getStrDictOptions, DICT_TYPE, getDictLabel } from '@/utils/dict' import { getIntDictOptions, getStrDictOptions, DICT_TYPE, getDictLabel } from '@/utils/dict'
import { betweenDay, dateFormatter, formatDate } from '@/utils/formatTime' import { betweenDay, dateFormatter, formatDate } from '@/utils/formatTime'
import { Check } from '@element-plus/icons-vue' import { Check } from '@element-plus/icons-vue'
import {getCustomer} from "@/api/heli/customer"; import { getCustomer } from '@/api/heli/customer'
import {getOperateLogPage} from "@/api/system/operatelog"; import { getOperateLogPage } from '@/api/system/operatelog'
const dialogVisible = ref(false) // 弹窗的是否展示 const dialogVisible = ref(false) // 弹窗的是否展示
const onPrint = () => { const onPrint = () => {
@ -325,10 +324,10 @@ const open = async (id: number) => {
let logParams = { let logParams = {
pageNo: 1, pageNo: 1,
pageSize: 2, pageSize: 2,
typeList: [9,10] typeList: [9, 10]
} }
const logs = await getOperateLogPage(logParams) const logs = await getOperateLogPage(logParams)
if(logs.list && logs.list.length == 2){ if (logs.list && logs.list.length == 2) {
const approveLog = logs.list[0] const approveLog = logs.list[0]
const auditLog = logs.list[1] const auditLog = logs.list[1]
formData.value.approveTime = approveLog.startTime formData.value.approveTime = approveLog.startTime

Write Preview
Loading…
Cancel
Save