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

Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-heli into dev

Browse Source
pull/4/head
siontion 8 months ago
parent aca26fd060 820048a1ce
commit bbce93db7d
4 changed files with 107 additions and 43 deletions
Show Stats Download Patch File Download Diff File

7
mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
Unescape View File

@ -185,11 +185,13 @@
.iaudit {
background-color: #19A998;
color:#FFFFFF;
border:none;
}
//已启动
.istart {
background-color: #1B9AEE;
color: #FFFFFF;
border:none;
}
//已打回
.iBack {
@ -202,21 +204,26 @@
.ialteration {
background-color:#FFF7E6;
color:#D46B08;
border:none;
}
//已提交
.isubmit {
background-color: #19A998;
color:#FFFFFF;
border:none;
}
//已作废
.icancellation {
background-color: #F0F1F4;
color: #666879;
border:none;
}
//已终止
.ibreakup {
background-color: #F0F1F4;
color: #666879;
border:none;
}
//全部发货

105
mes-ui/mes-ui-admin-vue3/src/views/heli/plan/productionPrint.vue
Unescape View File

@ -89,11 +89,20 @@
</tr>
<tr>
<td colspan="2">是否要工艺:</td>
<td>{{ getDictLabel(DICT_TYPE.HELI_COMMON_IS_OR_NOT, planData.hasCraft) }}</td>
<td>
{{ getDictLabel(DICT_TYPE.HELI_COMMON_IS_OR_NOT, planData.hasCraft) }}
</td>
<td>开始日期</td>
<td>{{ formatDate(new Date(planData.craftStartDate), 'YYYY-MM-DD') }}</td>
<td>
<span v-if="!planData.craftStartDate">&nbsp;</span>
<span v-else>{{ formatDate(new Date(planData.craftStartDate), 'YYYY-MM-DD') }}</span>
</td>
<td>结束日期</td>
<td>{{ formatDate(new Date(planData.craftEndDate), 'YYYY-MM-DD') }}</td>
<td>
<span v-if="!planData.craftEndDate">&nbsp;</span>
<span v-else>{{ formatDate(new Date(planData.craftEndDate), 'YYYY-MM-DD') }}</span>
</td>
<td>负责人</td>
<td colspan="2">{{ userInit.find((user) => user.id == planData.craftOwner)?.nickname }}</td>
</tr>
@ -215,14 +224,33 @@
</tr>
<tr>
<td colspan="4">{{formatDate(new Date(planData.editorDate), 'YYYY-MM-DD')}}</td>
<td colspan="3">{{formatDate(new Date(planData.auditDate), 'YYYY-MM-DD')}}</td>
<td colspan="3">{{formatDate(new Date(planData.approveDate), 'YYYY-MM-DD')}}</td>
<td colspan="4">
<span v-if="!planData.editorDate"> &nbsp;</span>
<span v-else>{{formatDate(new Date(planData.editorDate), 'YYYY-MM-DD')}}</span>
</td>
<td colspan="3">
<span v-if="!planData.auditDate"> &nbsp;</span>
<span v-else>{{formatDate(new Date(planData.auditDate), 'YYYY-MM-DD')}}</span>
</td>
<td colspan="3">
<span v-if="!planData.approveDate"> &nbsp;</span>
<span v-else>{{formatDate(new Date(planData.approveDate), 'YYYY-MM-DD')}}</span>
</td>
</tr>
<tr>
<td colspan="4">{{ userInit.find((user) => user.id == planData.editor)?.nickname }}</td>
<td colspan="3">{{ userInit.find((user) => user.id == planData.auditor)?.nickname }}</td>
<td colspan="3">{{ userInit.find((user) => user.id == planData.approver)?.nickname }}</td>
<td colspan="4">
<span v-if="!planData.editor"> &nbsp;</span>
<span v-else> {{ userInit.find((user) => user.id == planData.editor)?.nickname }}</span>
</td>
<td colspan="3">
<span v-if="!planData.auditor"> &nbsp;</span>
<span v-else> {{ userInit.find((user) => user.id == planData.auditor)?.nickname }}</span>
</td>
<td colspan="3">
<span v-if="!planData.approver"> &nbsp;</span>
<span v-else> {{ userInit.find((user) => user.id == planData.approver)?.nickname }}</span>
</td>
</tr>
</tbody>
</table>
@ -297,15 +325,15 @@
<td colspan="3"> 名称/编号 </td>
<td> 设备型号 </td>
<td> 数量 </td>
<td> 主要材料 </td>
<td> 毛坯日期 </td>
<td style="width:100px"> 主要材料 </td>
<td style="width:100px"> 毛坯日期 </td>
<td> 2D/日期 </td>
<td> 3D/日期 </td>
</tr>
</tbody>
<tbody>
<tr v-for="(item, idx) in formData.projectOrderSubs.slice(4)" :key="idx">
<td class="xh"> {{ idx+4 }} </td>
<td class="xh"> {{ idx+1 }} </td>
<td colspan="3" style="padding: 0 0">
<div style="display: flex; flex-direction: column; justify-content: space-between">
<span style="border-bottom: 1px solid #666"> {{item.name}} </span>
@ -316,17 +344,27 @@
<td>{{equipInit.find((equip) => equip.id == item.equipId)?.name}} </td>
<td>{{item.amount}} </td>
<td>{{ item.compositionName }} </td>
<td style="width: 100px !important"> {{ formatDate(new Date(item.blankDate), 'YYYY-MM-DD') }} </td>
<td>
<span v-if="!item.blankDate"> &nbsp;</span>
<span v-else>{{ formatDate(new Date(item.blankDate), 'YYYY-MM-DD') }} </span>
</td>
<td style="padding: 0 0">
<div style="display: flex; flex-direction: column; justify-content: space-between">
<span style="border-bottom: 1px solid #666;width: 100px"> {{ formatDate(new Date(item.twoDimDate), 'YYYY-MM-DD') }} </span>
<span>{{ userInit.find((user) => user.id == item.twoDimOwner)?.nickname }}</span>
<div style="display: flex; flex-direction: column; justify-content: space-between;width: 100px">
<span v-if="!item.twoDimDate" style="border-bottom: 1px solid #666">&nbsp;</span>
<span v-else style="border-bottom: 1px solid #666"> {{ formatDate(new Date(item.twoDimDate), 'YYYY-MM-DD') }} </span>
<span v-if="userInit.find((user) => user.id === item.twoDimOwner)?.nickname">{{ userInit.find((user) => user.id == item.twoDimOwner)?.nickname }}</span>
<span v-else>&nbsp;</span>
</div>
</td>
<td style="padding: 0 0">
<div style="display: flex; flex-direction: column; justify-content: space-between;width: 100px">
<span style="border-bottom: 1px solid #666"> {{ formatDate(new Date(item.threeDimDate), 'YYYY-MM-DD') }} </span>
<span>{{ userInit.find((user) => user.id == item.threeDimOwner)?.nickname }}</span>
<span v-if="!item.threeDimDate" style="border-bottom: 1px solid #666">&nbsp;</span>
<span v-else style="border-bottom: 1px solid #666"> {{ formatDate(new Date(item.threeDimDate), 'YYYY-MM-DD') }} </span>
<span v-if="userInit.find((user) => user.id === item.threeDimOwner)?.nickname">
{{ userInit.find((user) => user.id === item.threeDimOwner)?.nickname }}
</span>
<span v-else>&nbsp;</span>
</div>
</td>
</tr>
@ -369,14 +407,33 @@
</tr>
<tr>
<td colspan="4">{{formatDate(new Date(planData.editorDate), 'YYYY-MM-DD')}}</td>
<td colspan="3">{{formatDate(new Date(planData.auditDate), 'YYYY-MM-DD')}}</td>
<td colspan="3">{{formatDate(new Date(planData.approveDate), 'YYYY-MM-DD')}}</td>
<td colspan="4">
<span v-if="!planData.editorDate"> &nbsp;</span>
<span v-else>{{formatDate(new Date(planData.editorDate), 'YYYY-MM-DD')}}</span>
</td>
<td colspan="3">
<span v-if="!planData.auditDate"> &nbsp;</span>
<span v-else>{{formatDate(new Date(planData.auditDate), 'YYYY-MM-DD')}}</span>
</td>
<td colspan="3">
<span v-if="!planData.approveDate"> &nbsp;</span>
<span v-else>{{formatDate(new Date(planData.approveDate), 'YYYY-MM-DD')}}</span>
</td>
</tr>
<tr>
<td colspan="4">{{ userInit.find((user) => user.id == planData.editor)?.nickname }}</td>
<td colspan="3">{{ userInit.find((user) => user.id == planData.auditor)?.nickname }}</td>
<td colspan="3">{{ userInit.find((user) => user.id == planData.approver)?.nickname }}</td>
<td colspan="4">
<span v-if="!planData.editor"> &nbsp;</span>
<span v-else> {{ userInit.find((user) => user.id == planData.editor)?.nickname }}</span>
</td>
<td colspan="3">
<span v-if="!planData.auditor"> &nbsp;</span>
<span v-else> {{ userInit.find((user) => user.id == planData.auditor)?.nickname }}</span>
</td>
<td colspan="3">
<span v-if="!planData.approver"> &nbsp;</span>
<span v-else> {{ userInit.find((user) => user.id == planData.approver)?.nickname }}</span>
</td>
</tr>
</tbody>
</table>

6
mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
Unescape View File

@ -85,7 +85,7 @@
<!-- <el-select class="!w-250px" v-model="formData.businessMan" placeholder="请输入负责人" :remote-method="remoteUserSearch" remote-show-suffix remote clearable reserve-keyword filterable :loading="userSelectLoading" :disabled="alterDisabled || detailDisabled">
<el-option v-for="item in userSelectList" :key="item.id" :label="item.username + ' ' + item.nickname" :value="item.id" />
</el-select> -->
<UserSelect v-model="formData.businessMan" @update:newValue="handleSelectedUser" />
<UserSelect :disabled="alterDisabled || detailDisabled" v-model="formData.businessMan" @update:newValue="handleSelectedUser" />
</el-form-item>
</el-col>
</el-row>
@ -221,12 +221,12 @@
<el-row>
<el-col :span="12">
<el-form-item label="检验要求" prop="qualityRequirement">
<el-input class="!w-703px" :disabled="detailDisabled" type="textarea" v-model="formData.qualityRequirement" placeholder="请输入检验要求" show-word-limit maxlength="200" :class="{ 'alter-class': fieldHasAlter('referenceTechnology') }" />
<el-input class="!w-703px" :disabled="detailDisabled" type="textarea" v-model="formData.qualityRequirement" placeholder="请输入检验要求" show-word-limit maxlength="200" :class="{ 'alter-class': fieldHasAlter('qualityRequirement') }" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="remark" :disabled="detailDisabled">
<el-input class="!w-703px" :disabled="detailDisabled" type="textarea" v-model="formData.remark" show-word-limit maxlength="200" :class="{ 'alter-class': fieldHasAlter('remark') }" />
<el-input class="!w-703px" :disabled="detailDisabled" type="textarea" v-model="formData.remark" placeholder="请输入检验备注" show-word-limit maxlength="200" :class="{ 'alter-class': fieldHasAlter('remark') }" />
</el-form-item>
</el-col>
</el-row>

8
mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue
Unescape View File

@ -43,11 +43,11 @@
<el-button type="primary" plain @click="openForm('create')" v-hasPermi="['heli:purchase-order:create']">
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button type="primary" plain @click="handleExportWithTax()" v-hasPermi="['heli:purchase-order:create']">
<Icon icon="ep:plus" class="mr-5px" /> 乘税率导出
<el-button type="success" plain @click="handleExportWithTax()" v-hasPermi="['heli:purchase-order:create']">
<Icon icon="ep:upload" class="mr-5px" /> 乘税率导出
</el-button>
<el-button type="primary" plain @click="handleExport()" v-hasPermi="['heli:purchase-order:create']">
<Icon icon="ep:plus" class="mr-5px" /> 直接导出
<el-button type="success" plain @click="handleExport()" v-hasPermi="['heli:purchase-order:create']">
<Icon icon="ep:upload" class="mr-5px" /> 直接导出
</el-button>
</el-form-item>
</el-form>

Write Preview
Loading…
Cancel
Save