From c84ac9eab0fa68d95aa22bf389425bb332874540 Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期三, 27 十二月 2023 10:28:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Create.vue | 508 ++++++++++++++------------------------------------------
1 files changed, 128 insertions(+), 380 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Create.vue b/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Create.vue
index b0ebf88..1f71ced 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Create.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Create.vue
@@ -1,377 +1,130 @@
+
+
<template>
- <el-header height="auto">
- <el-form label-width="100px" :inline="true" :model="formInline" class="demo-form-inline">
+<div>
+ <el-form label-width="100px" :inline="true" :model="formInline" class="demo-form-inline">
+ <el-form-item label="閲囪喘绫诲瀷" class="item-style" >
+ <el-select v-model="form.buyType" class="m-2" placeholder="閫夋嫨閲囪喘绫诲瀷" clearable >
+ <el-option
+ v-for="item in CGTypeOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+
+ <el-form-item label="閲囪喘閮ㄩ棬" class="item-style" >
+ <el-select v-model="cgBuMen" class="m-2" placeholder="閫夋嫨閲囪喘閮ㄩ棬" clearable >
+ <el-option
+ v-for="item in CGBuMenOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+
+ <el-form-item label="渚涘簲鍟�" class="item-style" >
+ <el-cascader
+ placeholder="閫夋嫨渚涘簲鍟�"
+ :options="buyerOptions"
+ filterable
+ clearable
+ empty-text="empty-text"
+ :v-model="form.supplier"
+ >
+ </el-cascader>
+ </el-form-item>
+
+
+ <el-form-item label="閲囪喘鍛�" class="item-style" >
+ <el-select v-model="form.buyer" class="m-2" placeholder="閫夋嫨閲囪喘閮ㄩ棬" clearable >
+ <el-option
+ v-for="item in BuyerOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+
+ <el-form-item label="閲囪喘缁勭粐" class="item-style" >
+ <el-input v-model="form.buyItem" placeholder="閲囪喘缁勭粐" clearable ></el-input>
+ </el-form-item>
+
+ <el-form-item label="鍒惰〃鏃ユ湡" class="item-style" >
+
+ <el-date-picker
+ v-model="form.date"
+ type="date"
+ placeholder="閫夋嫨鍒惰〃鏃ユ湡"
+ style="width: 100%"
+ />
+
+ </el-form-item>
+ <el-form-item class="item-style" >
<el-row :gutter="10">
- <el-col :span="6">
- <el-form-item label="閲囪喘绫诲瀷" class="item-style">
- <el-select v-model="form.buyType" class="m-2" placeholder="閫夋嫨閲囪喘绫诲瀷" clearable>
- <el-option
- v-for="item in CGTypeOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
+
+ <el-col :span="6" :offset="6">
+ <el-button type="primary" @click="onSubmit">淇濆瓨</el-button>
</el-col>
- <el-col :span="6">
- <el-form-item label="閲囪喘閮ㄩ棬" class="item-style">
- <el-select v-model="cgBuMen" class="m-2" placeholder="閫夋嫨閲囪喘閮ㄩ棬" clearable>
- <el-option
- v-for="item in CGBuMenOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
+ <el-col :span="6" :offset="6">
+ <el-button>鍙栨秷</el-button>
</el-col>
- <el-col :span="6">
- <el-form-item label="渚涘簲鍟�" class="item-style">
- <el-cascader
- placeholder="閫夋嫨渚涘簲鍟�"
- :options="buyerOptions"
- filterable
- clearable
- empty-text="empty-text"
- :v-model="form.supplier"
- >
- </el-cascader>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="閲囪喘鍛�" class="item-style">
- <el-select v-model="form.buyer" class="m-2" placeholder="閫夋嫨閲囪喘閮ㄩ棬" clearable>
- <el-option
- v-for="item in BuyerOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- </el-col>
+
+
+
</el-row>
- <el-row :gutter="10">
- <el-col :span="6">
- <el-form-item label="閲囪喘缁勭粐" class="item-style">
- <el-input v-model="form.buyItem" placeholder="閲囪喘缁勭粐" clearable></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍒惰〃鏃ユ湡" class="item-style">
+ </el-form-item>
+ </el-form>
- <el-date-picker
- v-model="form.date"
- type="date"
- placeholder="閫夋嫨鍒惰〃鏃ユ湡"
- style="width: 100%"
- />
-
- </el-form-item>
- </el-col>
- <el-col :span="6"></el-col>
-
- </el-row>
-
-
- </el-form>
-
- </el-header>
-
- <el-main style="padding-top: 5px;height:100%">
-<!-- <el-button class="mt-4" style="width: 10%" @click="onAddItem"
- >娣诲姞
- </el-button>-->
-
- <vxe-grid
-
- max-height="500"
- @filter-change="filterChanged"
- class="mytable-scrollbar"
- ref="xGrid"
- v-bind="gridOptions"
- v-on="gridEvents"
- >
-
- <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
- <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
- <template #content="{ row}">
- <ul class="expand-wrapper">
- <li v-for="(item,key,index) in row">
- <span style="font-weight: bold">{{ key + ': ' }}</span>
- <span>{{ item }}</span>
- </li>
- </ul>
+<div>
+ <el-button class="mt-4" style="width: 10%" @click="onAddItem"
+ >娣诲姞</el-button>
+ <el-table :data="tableData" style="width: 98%" max-height="500" border show-summary
+ sum-text=" ">
+ <el-table-column fixed="left" label="鎿嶄綔" width="60">
+ <template #default="scope">
+ <el-button
+ link
+ type="primary"
+ size="small"
+ @click.prevent="deleteRow(scope.$index)"
+ >
+ 鍒犻櫎
+ </el-button>
</template>
+ </el-table-column>
+ <el-table-column fixed prop="wlcode" label="鐗╂枡缂栫爜" width="150" />
+ <el-table-column prop="wlname" label="鐗╂枡鍚嶇О" width="180" />
+ <el-table-column prop="cd" label="浜у湴" width="100" />
+ <el-table-column prop="kd" label="瀹藉害" width="70" />
+ <el-table-column prop="gd" label="楂樺害" width="70" />
+ <el-table-column prop="hd" label="鍘氬害" width="60" />
+ <el-table-column prop="xh" label="鍨嬪彿" width="80" />
+ <el-table-column prop="hd" label="鍗曚綅鏁伴噺" width="100" />
+ <el-table-column prop="hd" label="鍗曚綅" width="60" />
+ <el-table-column prop="hd" label="绠辨暟" width="60" />
+ <el-table-column prop="hd" label="鍗曠墖闈㈢Н" width="100" />
+ <el-table-column prop="hd" label="鍗曚环" width="60" />
+ <el-table-column prop="hd" label="鎬绘暟閲�" width="80" />
+ <el-table-column prop="hd" label="鎬婚潰绉�" width="80" />
+ <el-table-column prop="hd" label="鎬婚噾棰�" width="80" />
+ <el-table-column prop="hd" label="澶囨敞" width="120" />
- <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
- <template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">缂栬緫</el-button>
- <!-- <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">鍒犻櫎</el-button>-->
- <!-- <el-button @click="cellClickEvent" link type="primary" size="small">璇︽儏</el-button>-->
- </template>
+ </el-table>
- <template #num1_filter="{ column, $panel }">
- <div>
- <div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
- </div>
- </div>
- </template>
- </vxe-grid>
-
- </el-main>
-
+</div>
+</div>
</template>
<script setup>
-import {ref, reactive} from 'vue'
-let router = useRouter()
+import { ref,reactive } from 'vue'
-//缁勪欢鎺ユ敹鍙傛暟
-const gridOptions = reactive({
- border: "full",//琛ㄦ牸鍔犺竟妗�
- keepSource: true,//淇濇寔婧愭暟鎹�
- align: 'center',//鏂囧瓧灞呬腑
- stripe: true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true, height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
- showFooter: true,//鏄剧ず鑴�
- printConfig: {},
- importConfig: {},
- exportConfig: {},
- scrollY: {enabled: true},//寮�鍚櫄鎷熸粴鍔�
- showOverflow: true,
- columnConfig: {
- resizable: true,
- useKey: true
- },
- filterConfig: { //绛涢�夐厤缃」
- remote: true
- },
- customConfig: {
- storage: true
- },
- editConfig: {
- trigger: 'click',
- mode: 'row',
- showStatus: true
- },
- columns: [
- //{title: '鎿嶄綔', width: '8%', slots: {default: 'button_slot'}, fixed: "left"},
- {type: 'seq', fixed: "left", title: ' ', width: 50},
- {type: 'checkbox',fixed:"left", title: '', width: 50 },
- {type: 'expand', title:'璇︽儏', fixed: "left", slots: {content: 'content'}, width: 50},
- {field: 'cgdh', width: '10%', title: '鐗╂枡缂栫爜', filters: [{data: ''}], slots: {filter: 'num1_filter'}, editRender: { name: 'input', attrs: { placeholder: '' } },sortable: true},
- {field: 'cgzt', width: '10%', title: '鐗╂枡鍚嶇О', filters: [{data: ''}], slots: {filter: 'num1_filter'},editRender: { name: 'input', attrs: { placeholder: '' } }, sortable: true},
- {field: 'gys', width: '10%',title: '浜у湴', filters: [{data: ''}], slots: {filter: 'num1_filter'}, editRender: { name: 'input', attrs: { placeholder: '' } },sortable: true},
- {field: 'w', width: '8%',title: '瀹藉害', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/ editRender: { name: 'input', attrs: { placeholder: '' } }, sortable: true},
- {field: 'g', width: '8%',title: '楂樺害', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/ editRender: { name: 'input', attrs: { placeholder: '' } },sortable: true},
- {field: 'h', width: '8%',title: '鍘氬害', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/ editRender: { name: 'input', attrs: { placeholder: '' } },sortable: true},
- {field: 'xh', width: '8%',title: '鍨嬪彿',/*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/ editRender: { name: 'input', attrs: { placeholder: '' } },sortable: true},
- {field: 'dw', width: '8%',title: '鍗曚綅', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/ editRender: { name: 'input', attrs: { placeholder: '' } },sortable: true},
- {field: 'sl', width: '8%',title: '鏁伴噺', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/ editRender: { name: 'input', attrs: { placeholder: '' } },sortable: true},
- {field: 'sl', width: '8%',title: '鎿嶄綔鏁伴噺', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/ editRender: { name: 'input', attrs: { placeholder: '' } }},
- {field: 'sl', width: '12%',title: '绠辨暟', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/ editRender: { name: 'input', attrs: { placeholder: '' } },sortable: true},
- {field: 'je', width: '8%',title: '鍗曠墖闈㈢Н', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/ editRender: { name: 'input', attrs: { placeholder: '' } },sortable: true},
- {field: 'je', width: '12%',title: '鍗曚环', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/ editRender: { name: 'input', attrs: { placeholder: '' } },sortable: true},
- {field: '6', width: '8%',title: '鎬绘暟閲�', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/ editRender: { name: 'input', attrs: { placeholder: '' } },sortable: true},
- {field: 'sl', width: '8%',title: '鎬婚潰绉�', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/ editRender: { name: 'input', attrs: { placeholder: '' } },sortable: true},
- {field: 'yl', width: '10%',title: '鎬婚噾棰�',/*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/ editRender: { name: 'input', attrs: { placeholder: '' } },sortable: true},
- {field: 'yl', width: '10%',title: '澶囨敞', /*filters: [{data: ''}], slots: {filter: 'num1_filter'},*/ editRender: { name: 'input', attrs: { placeholder: '' } }, sortable: true}
- ],//琛ㄥご鍙傛暟
- toolbarConfig: {
- buttons: [
- {type:'text'},
- {
- 'name': '鏂板',
-
- 'code':'Add',
- },
- {
- 'name': '绉婚櫎',
-
- 'code':'Remove'
- },
- {
- 'name': '淇濆瓨璁㈠崟',
- status:'primary',
- 'code':'Save'
- },{
- 'name': '鍏ュ簱',
- status:'primary',
- 'code':'Storage'
- },
- {
- 'name': '閫�璐�',
- status:'primary',
- 'code':'Return'
- }/*,
- {
- 'name': '杩斿洖鏌ヨ',
-
- 'code':'GoSelect'
- }*/],
- import: false,
- export: true,
- print: true,
- zoom: true,
- custom: true,
- tools: [
-
- ],
-
- },//琛ㄥご鎸夐挳
- /*data: [{},{},{},{},{},{}],//table body瀹為檯鏁版嵁*/
- data: [{},{},{}],//table body瀹為檯鏁版嵁
- mergeFooterItems: [
- {row: 0, col: 0, rowspan: 1, colspan: 4}
- ],//鍚堝苟鑴�
- footerMethod({columns, data}) {//椤佃剼鍑芥暟
- return [
- columns.map((column, columnIndex) => {
- if (columnIndex === 0) {
- return '鍚堣:'
- }
- /* if (props.tableProp.footList.includes(column.field)) {
- return sumNum(data, column.field)
- }*/
- return ''
- })
- ]
- },
-
-})
-
-const xGrid = ref()
-const gridEvents = {
- toolbarButtonClick({code}) {
- const $grid = xGrid.value
- if ($grid) {
- switch (code) {
- case 'Add': {//鏂板
- const record = {
- checked: false
- }
- $grid.insertAt(record, 0).then(({row}) => {
- $grid.setEditRow(row)
- })
- break
- }
- case 'Remove': {//绉婚櫎
- if ($grid.getCheckboxRecords().length === 0) {
- openAlert({type: 'message', content: '璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�', status: 'warning'})
- //VXETable.modal.message( '璇烽�夋嫨涓�鏉℃暟鎹紒')
- return
- } else {
- const type = VXETable.modal.confirm('鎮ㄧЩ闄や簡' + $grid.getCheckboxRecords().length + '鏉℃暟鎹紒');
- //openAlert({type:'alert', content: '鎴愬姛鍏ュ簱'+$grid.getCheckboxRecords().length+'鏉℃暟鎹紒', status: 'success' })
- //VXETable.modal.message( '璇烽�夋嫨涓�鏉℃暟鎹紒')
- return
- }
- break
- }
- case 'Save': {//淇濆瓨
-
-
- if(form.buyItem === null || form.buyItem === ''){
- openAlert({type: 'message', content: '閲囪喘缁勭粐涓嶅彲涓虹┖', status: 'warning'})
- }
-
-return
-
- if(buyerOptions.values() <= 0){
-
- }
-
- const type = VXETable.modal.confirm('鏄惁纭畾淇濆瓨褰撳墠璁㈠崟淇℃伅锛�');
- openAlert({type: 'message', content: $grid.rows.number+'', status: 'warning'})
- return
-
- break
- }
- case 'GoSelect':{
-
- router.push({path: '/main/purchaseOrder/SelectPurchaseOrder'})
- break
- }
-
- case 'Storage': {//鍏ュ簱
- if ($grid.getCheckboxRecords().length === 0) {
- openAlert({type: 'message', content: '璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�', status: 'warning'})
- //VXETable.modal.message( '璇烽�夋嫨涓�鏉℃暟鎹紒')
- return
- } else {
- const type = VXETable.modal.confirm('鎮ㄩ�夋嫨浜�' + $grid.getCheckboxRecords().length + '鏉℃暟鎹紒,鏄惁纭鍏ュ簱锛�');
- //openAlert({type:'alert', content: '鎴愬姛鍏ュ簱'+$grid.getCheckboxRecords().length+'鏉℃暟鎹紒', status: 'success' })
- //VXETable.modal.message( '璇烽�夋嫨涓�鏉℃暟鎹紒')
- return
- }
- break
- }
- case 'Return': {//閫�搴�
- if ($grid.getCheckboxRecords().length === 0) {
- openAlert({type: 'message', content: '璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�', status: 'warning'})
- //VXETable.modal.message( '璇烽�夋嫨涓�鏉℃暟鎹紒')
- return
- } else {
- /* async ()=>{
- const type = await.VXETable.modal.confirm('鎮ㄩ�夋嫨浜�'+$grid.getCheckboxRecords().length+'鏉℃暟鎹紒,鏄惁纭閫�搴擄紵');
- }*/
- const type = VXETable.modal.confirm('鎮ㄩ�夋嫨浜�' + $grid.getCheckboxRecords().length + '鏉℃暟鎹紒,鏄惁纭閫�搴擄紵');
-
-
- /* if(VXETable.modal.confirm('鎮ㄩ�夋嫨浜�'+$grid.getCheckboxRecords().length+'鏉℃暟鎹紒,鏄惁纭閫�搴擄紵' )){
- //openAlert({type:'message', content: '鎴愬姛閫�搴�'+$grid.getCheckboxRecords().length+'鏉℃暟鎹紒', status: 'success',lockView: false, mask: false })
-
-
- }*/
-
- /* if(type==='confirm'){
- openAlert({type:'message', content: '鎴愬姛閫�搴�'+$grid.getCheckboxRecords().length+'鏉℃暟鎹紒', status: 'success' })
- }
-
-*/
- //openAlert({type:'alert', content: '鎴愬姛閫�搴�'+$grid.getCheckboxRecords().length+'鏉℃暟鎹紒', status: 'success' })
- //VXETable.modal.message( '璇烽�夋嫨涓�鏉℃暟鎹紒')
- return
- }
- break
- }
-
- }
- }
- },
- toolbarToolClick({code}) {
- const $grid = xGrid.value
- if ($grid) {
- switch (code) {
- case 'myPrint': {
- $grid.print()
- break
- }
- }
- }
- },
-}
-
-
-const openAlert = (options) => {
- if(options.type==='message'){
- VXETable.modal.message(options)
- }else{
- VXETable.modal.alert(options)
- }
-
-}
-
-
-
-
-
+// do not use same name with ref
const form = reactive({
name: '',
region: '',
@@ -380,18 +133,16 @@
type: [],
resource: '',
desc: '',
- supplier: '',
- buyer: '',
- buyItem: '',
- buyType: ''
+ supplier:'',
+ buyer:'',
+ buyItem:'',
+ buyType:''
})
const onSubmit = () => {
console.log('submit!')
}
-
-//渚涘簲鍟�
const buyerOptions = [
{value: '0', label: '渚涘簲鍟�1'},
{value: '1', label: '渚涘簲鍟�2'},
@@ -402,10 +153,10 @@
]
+
const value = ref('')
const cgBuMen = ref('')
-//閲囪喘绫诲瀷
const CGTypeOptions = [
{
value: '1',
@@ -422,8 +173,8 @@
]
-//閲囪喘閮ㄩ棬
-const CGBuMenOptions = [
+
+const CGBuMenOptions=[
{
value: '0',
label: '閲囪喘鍗庡寳閮�',
@@ -447,8 +198,7 @@
]
-//閲囪喘浜�
-const BuyerOptions = [
+const BuyerOptions=[
{
value: '0',
label: '閲囪喘鍛�1',
@@ -473,8 +223,6 @@
]
import dayjs from 'dayjs'
-import {VXETable} from "vxe-table";
-import {useRouter} from "vue-router";
const now = new Date()
@@ -486,7 +234,7 @@
hd: '8',
gd: '2440',
kd: '3660',
- xh: 'CN10P'
+ xh:'CN10P'
},
{
wlcode: '202312305101',
@@ -495,7 +243,7 @@
gd: '2440',
kd: '3660',
hd: '5',
- xh: 'CN10P'
+ xh:'CN10P'
},
{
wlcode: '202312405101',
@@ -504,19 +252,20 @@
hd: '12',
gd: '2440',
kd: '3660',
- xh: 'CN10P'
+ xh:'CN10P'
},
])
+
const onAddItem = () => {
now.setDate(now.getDate() + 1)
tableData.value.push({
- wlcode: dayjs(now).format('YYYYMMDDss') + '01',
+ wlcode: dayjs(now).format('YYYYMMDDss')+'01',
wlname: '杩欐槸涓�涓墿鏂欏悕绉�',
cd: '浜у湴1',
hd: '6',
- xh: 'CN10P',
+ xh:'CN10P',
gd: '2440',
kd: '3660',
})
@@ -536,8 +285,7 @@
height: unset;
}
}
-
-.item-style {
- width: 300px;
+.item-style{
+ width:300px;
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0