From 68edca7409736705db50504b003cba66bb4ccd6e Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 08 八月 2023 11:08:50 +0800
Subject: [PATCH] 1.新增用户组管理
---
src/views/produceManager/workOrder.vue | 151 ++++++++++++++++++++++++++------------------------
1 files changed, 79 insertions(+), 72 deletions(-)
diff --git a/src/views/produceManager/workOrder.vue b/src/views/produceManager/workOrder.vue
index 31e11ab..14dd13a 100644
--- a/src/views/produceManager/workOrder.vue
+++ b/src/views/produceManager/workOrder.vue
@@ -43,7 +43,10 @@
<el-form-item label="婧愬崟鍗曞彿" style="display: flex;">
<el-input v-model="form.sourceorder" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item label="鍗曟嵁绫诲瀷" style=" display: flex;">
+ <el-form-item label="閿�鍞鍗�" style="display: flex;">
+ <el-input v-model="form.saleordercode" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ <el-form-item v-show="isExpandForm" label="鍗曟嵁绫诲瀷" style=" display: flex;">
<el-select
v-model="form.ordertype"
:popper-append-to-body="false"
@@ -193,6 +196,18 @@
>
<template slot-scope="{row}">
<div v-if="row.m_po">{{ row.m_po }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞鍗�"
+ sortable="custom"
+ show-tooltip-when-overflow
+ min-width="160"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
<div v-else>/</div>
</template>
</el-table-column>
@@ -647,78 +662,68 @@
/>
</el-select>
</el-form-item>
- <!-- <el-button-->
- <!-- v-waves-->
- <!-- type="primary"-->
- <!-- style="padding: 0 10px;margin-left: -8px;margin-top:3px"-->
- <!-- class="el-icon-search"-->
- <!-- @click="searchClick"-->
- <!-- />-->
- <!-- :disabled="dialogForm.routecode===''"-->
- <!-- </div>-->
- <!-- </div>-->
- <el-form-item label="鏄惁鎺掔▼" prop="isAps">
- <el-radio-group v-model="dialogForm.isAps" style="width:200px" @change="changeIsAps">
- <el-radio key="Y" label="Y" value="Y">鏄�</el-radio>
- <el-radio key="N" label="N" value="N">鍚�</el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="鐗╂枡娓呭崟" :prop="dialogForm.isAps==='Y'?'bomId':''">
- <el-select
- v-model="dialogForm.bomId"
- filterable
- :disabled="dialogForm.isAps==='N'"
- :popper-append-to-body="false"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in bomIdArr"
- :key="item.id"
- :label="item.version"
- :value="item.id"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="璁″垝寮�濮嬫椂闂�" prop="planstartdate">
- <el-date-picker
- v-model="dialogForm.planstartdate"
- type="date"
- :clearable="false"
- value-format="yyyy-MM-dd"
- :picker-options="pickerOptions"
- style="width: 200px"
- placeholder="閫夋嫨鏃ユ湡"
- />
- </el-form-item>
- <el-form-item label="璁″垝瀹屾垚鏃堕棿" prop="planenddate">
- <el-date-picker
- v-model="dialogForm.planenddate"
- type="date"
- :clearable="false"
- value-format="yyyy-MM-dd"
- style="width: 200px"
- placeholder="閫夋嫨鏃ユ湡"
- :picker-options="pickerOptions"
- />
- </el-form-item>
- <el-form-item label="宸ュ崟绛夌骇" prop="orderlev">
- <el-select
- v-model="dialogForm.orderlev"
- filterable
- :popper-append-to-body="false"
- style="width: 200px"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in orderlevArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </el-form-item>
+ <!-- <el-form-item label="鏄惁鎺掔▼" prop="isAps">-->
+ <!-- <el-radio-group v-model="dialogForm.isAps" style="width:200px" @change="changeIsAps">-->
+ <!-- <el-radio key="Y" label="Y" value="Y">鏄�</el-radio>-->
+ <!-- <el-radio key="N" label="N" value="N">鍚�</el-radio>-->
+ <!-- </el-radio-group>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="鐗╂枡娓呭崟" :prop="dialogForm.isAps==='Y'?'bomId':''">-->
+ <!-- <el-select-->
+ <!-- v-model="dialogForm.bomId"-->
+ <!-- filterable-->
+ <!-- :disabled="dialogForm.isAps==='N'"-->
+ <!-- :popper-append-to-body="false"-->
+ <!-- style="width: 200px;"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in bomIdArr"-->
+ <!-- :key="item.id"-->
+ <!-- :label="item.version"-->
+ <!-- :value="item.id"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="璁″垝寮�濮嬫椂闂�" prop="planstartdate">-->
+ <!-- <el-date-picker-->
+ <!-- v-model="dialogForm.planstartdate"-->
+ <!-- type="date"-->
+ <!-- :clearable="false"-->
+ <!-- value-format="yyyy-MM-dd"-->
+ <!-- :picker-options="pickerOptions"-->
+ <!-- style="width: 200px"-->
+ <!-- placeholder="閫夋嫨鏃ユ湡"-->
+ <!-- />-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="璁″垝瀹屾垚鏃堕棿" prop="planenddate">-->
+ <!-- <el-date-picker-->
+ <!-- v-model="dialogForm.planenddate"-->
+ <!-- type="date"-->
+ <!-- :clearable="false"-->
+ <!-- value-format="yyyy-MM-dd"-->
+ <!-- style="width: 200px"-->
+ <!-- placeholder="閫夋嫨鏃ユ湡"-->
+ <!-- :picker-options="pickerOptions"-->
+ <!-- />-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="宸ュ崟绛夌骇" prop="orderlev">-->
+ <!-- <el-select-->
+ <!-- v-model="dialogForm.orderlev"-->
+ <!-- filterable-->
+ <!-- :popper-append-to-body="false"-->
+ <!-- style="width: 200px"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in orderlevArr"-->
+ <!-- :key="item.code"-->
+ <!-- :label="item.name"-->
+ <!-- :value="item.code"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
</el-form>
@@ -2022,6 +2027,7 @@
partcode: '', // 浜у搧缂栫爜
ordertype: '', // ordertype
sourceorder: '', // 婧愬崟鍗曞彿
+ saleordercode: '', // 閿�鍞鍗�
partname: '', // 浜у搧鍚嶇О
partspec: '', // 浜у搧瑙勬牸
creatuser: '', // 鍒涘缓浜哄憳
@@ -2280,6 +2286,7 @@
partspec: this.form.partspec, // 浜у搧瑙勬牸
creatuser: this.form.creatuser, // 鍒涘缓浜哄憳
sourceorder: this.form.sourceorder, // 婧愬崟鍗曞彿
+ saleordercode: this.form.saleordercode, // 閿�鍞鍗�
ordertype: this.form.ordertype, // 鍗曟嵁绫诲瀷
createdate: this.form.createdate.toString().length > 0 ? handleDatetime(this.form.createdate) : '', // 鍒涘缓鏃堕棿
prop: this.form.prop, // 鎺掑簭瀛楁
--
Gitblit v1.9.3