Merge pull request 'projects/mesxc-zhp' (#373) from projects/mesxc-zhp into projects/mesxc-test
Some checks failed
continuous-integration/drone/push Build is failing

Reviewed-on: #373
This commit is contained in:
朱菊兰 2024-04-26 10:15:45 +08:00
commit 61ef172534

View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-07-19 15:18:30 * @Date: 2021-07-19 15:18:30
* @LastEditors: zhp * @LastEditors: zhp
* @LastEditTime: 2024-04-26 09:52:16 * @LastEditTime: 2024-04-26 09:57:41
* @Description: * @Description:
--> -->
<template> <template>
@ -42,14 +42,15 @@
<el-row v-for="op in orderList" :key="op.id" style="margin-bottom: .5em;overflow: hidden;"> <el-row v-for="op in orderList" :key="op.id" style="margin-bottom: .5em;overflow: hidden;">
<!-- <el-col :span="12"> --> <!-- <el-col :span="12"> -->
<!-- <div style="height: 34px;"> --> <!-- <div style="height: 34px;"> -->
<span style="display: inline-block;width: 400px;height: 10px;"> <span style="display: inline-block;width: 400px">
<span class="now-secondary-title" style="font-size: 14px;opacity: calc(.6);">{{ op.name }}</span> <span v-if="op.name" class="now-secondary-title" style="font-size: 14px;opacity: calc(.6);">{{ op.name
}}</span>
<el-divider v-if="op.specifications" class="split" direction="vertical"></el-divider> <el-divider v-if="op.specifications" class="split" direction="vertical"></el-divider>
<!-- <span v-if="op.size" class="split"></span> --> <!-- <span v-if="op.size" class="split"></span> -->
<span class="orderSize" style="font-size: 14px;opacity: calc(.6);">{{ <span v-if="op.specifications" class="orderSize" style="font-size: 14px;opacity: calc(.6);">{{
op.specifications }}</span> op.specifications }}</span>
<el-divider class="split" v-if="op.planQuantity" direction="vertical"></el-divider> <el-divider class="split" v-if="op.planQuantity" direction="vertical"></el-divider>
<span class="orderPlan" style="font-size: 14px;opacity: calc(.6);">{{ <span v-if="op.planQuantity" class="orderPlan" style="font-size: 14px;opacity: calc(.6);">{{
op.planQuantity }}</span> op.planQuantity }}</span>
<span v-if="op.planQuantity" class="orderFinishTwo" <span v-if="op.planQuantity" class="orderFinishTwo"
style="font-size: 14px;opacity: calc(.6);"></span> style="font-size: 14px;opacity: calc(.6);"></span>