From 95fb18f99827a5eeefa1ebf661c6f6459646b87b Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 20 七月 2022 19:27:37 +0800
Subject: [PATCH] 1.修改bug 2.正在开发缺陷定义
---
src/views/scgl/sckbg.vue | 273 +-----------------------------------------------------
1 files changed, 5 insertions(+), 268 deletions(-)
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index 8d169cd..4ec892b 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -1,7 +1,6 @@
<template>
<div>
<div class="body" style="padding: 0;height: 100%" :style="{height:mainHeight+'px'}">
-
<el-tabs ref="elTabs" v-model="activeName" type="border-card" @tab-click="tabClick">
<el-tab-pane label="鐢熶骇鍒楄〃">
<div style="margin-left: 10px;margin-top:10px;display: flex;justify-content: space-between">
@@ -302,192 +301,6 @@
popper-class="select_bottom"
@pagination="getMesOrderStepSearch"
/>
- </el-tab-pane>
- <el-tab-pane label="宸ュ簭妫�楠�">
- <div style="margin-left: 10px;margin-top:10px;display: flex;flex-direction: column">
- <div style="margin-bottom: 10px;font-size: 14px">
- <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />鎵爜淇℃伅
- </div>
- <div style="display: flex;align-items: center">
- <div style="width: 90px">鎵弿鏉＄爜锛�</div>
- <el-input
- v-model="GXform.orderstepqrcode"
- name="GXproduceCode"
- style="width: 300px"
- @keyup.enter.native="val=>enterNative(val,'GXproduceCode')"
- />
- </div>
- <!-- 鍏」淇℃伅 -->
- <div style="display:flex;margin-top: 10px;align-items: center">
- <div style="display: flex;">
- <div style="display: flex;margin-right: 50px">
- <div style="width: 90px">宸ュ崟缂栫爜锛�</div>
- <div style="width: 100px">PX00120012312</div>
- </div>
- <div style="display: flex;">
- <div style="width: 90px">浜у搧缂栫爜锛�</div>
- <div style="width: 100px">123-446-789</div>
- </div>
- </div>
- <div style="display: flex;margin-left: 30px;">
- <div style="display: flex;margin-right: 50px">
- <div style="width: 90px">浜у搧鍚嶇О锛�</div>
- <div style="width: 100px">PX00120012312</div>
- </div>
- <div style="display: flex;">
- <div style="width: 90px">浜у搧瑙勬牸锛�</div>
- <div style="width: 100px">123-446-789</div>
- </div>
- </div>
- <div style=" display: flex;margin-left: 30px;">
- <div style="display: flex;margin-right: 50px">
- <div style="width: 90px">宸ュ簭缂栫爜锛�</div>
- <div>PX00120012312</div>
- </div>
- <div style="display: flex;">
- <div style="width: 90px">宸ュ簭鍚嶇О锛�</div>
- <div>123-446-789</div>
- </div>
- </div>
- </div>
- <div style="margin: 10px 0;font-size: 14px">
- <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />妫�楠屾爣鍑嗕俊鎭�
- </div>
- <div style="display: flex;align-items: center">
- <div style="width: 90px">妫�楠屾爣鍑嗭細</div>
- <el-select
- v-model="dialogForm.aaa"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- filterable
- >
- <el-option
- v-for="item in ARR"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- <div style="width: 90px;margin-left: 50px;">妫�楠屼汉鍛橈細</div>
- <el-select
- v-model="dialogForm.aaa"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- filterable
- >
- <el-option
- v-for="item in ARR"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </div>
- <div style="margin: 10px 0;font-size: 14px">
- <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />妫�楠岄」淇℃伅
- </div>
- <div>
- <el-button type="primary" @click="add">鏂板</el-button>
- </div>
- <div style="margin-top: 10px">
- <el-table
- :data="JYTableData"
- :height="(tableHeight-195)+'px'"
- border
- stripe
- :style="{width: 100+'%',height:tableHeight+'px',}"
- highlight-current-row
- :header-cell-style="this.$headerCellStyle"
- :cell-style="this.$cellStyle"
- @sort-change="JYsortChange"
- >
- <el-table-column
- prop="RowNum"
- label="搴忓彿"
- />
- <!-- <el-table-column-->
- <!-- prop="bm"-->
- <!-- label="妫�楠岄」鐩紪鐮�"-->
- <!-- sortable="custom"-->
- <!-- />-->
- <el-table-column
- prop="mc"
- sortable="custom"
- label="妫�楠岄」鐩悕绉�"
- >
- <!-- <template slot-scope="{row}">-->
- <!-- <el-input v-if="row.isVisible===1" v-model="row.group_code" placeholder="璇疯緭鍏�" />-->
- <!-- <div v-else> {{ row.group_code }}</div>-->
- <!-- </template>-->
- </el-table-column>
- <el-table-column
- prop="ms"
- label="妫�楠屾爣鍑嗘弿杩�"
- sortable="custom"
- >
- <!-- <template slot-scope="{row}">-->
- <!-- <el-input v-if="row.isVisible===1" v-model="row.group_code" placeholder="璇疯緭鍏�" />-->
- <!-- <div v-else> {{ row.group_code }}</div>-->
- <!-- </template>-->
- </el-table-column>
- <el-table-column
- prop="jg"
- label="妫�楠岀粨鏋�"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div style="justify-content: flex-start ;">
- <el-radio v-model="radio" label="1">澶囬�夐」</el-radio>
- <el-radio v-model="radio" label="2">澶囬�夐」</el-radio>
- </div>
- </template>
- </el-table-column>
- <el-table-column
- label="鎿嶄綔"
- >
- <template slot-scope="{row}">
- <div class="operationClass">
- <el-button v-if="row.isVisible===0" type="text" @click="del(row)">鍒犻櫎</el-button>
- <el-button v-if="row.isVisible===1" type="text" @click="confirm(row)">纭</el-button>
- <el-button v-if="row.isVisible===1" type="text" @click="cancel(row)">鍙栨秷</el-button>
- </div>
- </template>
- </el-table-column>
- </el-table>
- </div>
- <!-- 妫�楠岀粨鏋� 鍜� 妫�楠屽娉� -->
- <div style="display: flex;margin-top: 20px;align-items: center">
-
- <div style="display: flex;margin-right: 50px;align-items: center">
- <div style="width: 90px">妫�楠岀粨鏋滐細</div>
- <el-select
- v-model="dialogForm.aaa"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- filterable
- >
- <el-option
- v-for="item in ARR"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </div>
- <div style="display: flex;">
- <div style="width: 90px">妫�楠屽娉細</div>
- <!-- <el-input v-model="row.group_code" placeholder="璇疯緭鍏�" />-->
- </div>
-
- </div>
-
- <div style="display: flex;margin: 20px 0;align-items: center">
- <el-button type="primary">棣栨淇濆瓨</el-button>
- <el-button type="primary" style="margin-left: 50px">宸℃淇濆瓨</el-button>
- <el-button type="primary" style="margin-left: 50px">瀹屽伐妫�淇濆瓨</el-button>
- <el-button type="info" style="margin-left: 50px">鍙栨秷</el-button>
- </div>
- </div>
</el-tab-pane>
</el-tabs>
@@ -990,18 +803,7 @@
{ required: true, message: '璇疯緭鍏ユ姤宸ユ暟閲�', trigger: ['blur', 'change'] }
]
},
- activeName: '',
- GXform: { // 宸ュ簭
- orderstepqrcode: '' // 鎵弿鐨勪簩缁寸爜淇℃伅
- // prop: 'wo_code', // 鎺掑簭瀛楁z
- // order: 'asc', // 鎺掑簭瀛楁
- // page: 1, // 绗嚑椤�
- // rows: 20 // 姣忛〉澶氬皯鏉�
- },
- JYTableData: [
- { RowNum: 1, bm: '001', mc: '灏哄', ms: '鏃�', jg: '鎴戞槸缁撴灉', isVisible: 0 }
- ], // 妫�楠岄」淇℃伅琛ㄦ牸
- radio: ''
+ activeName: ''
}
},
created() {
@@ -1083,11 +885,6 @@
this.form.orderstepqrcode = ''
})
}
- if (this.$refs.elTabs.currentName === '2') {
- this.$nextTick(() => {
- $("input[name='GXproduceCode']")[0].focus()
- })
- }
},
// 鎵爜閿洏鍥炶溅浜嬩欢
async enterNative(val, belong) {
@@ -1126,10 +923,6 @@
if (res.code === '200' && res.count === 3) {
await this.WXback(res.data)
}
- }
-
- if (belong === 'GXproduceCode') {
- console.log('GXproduceCode')
}
},
// 鏌ヨ
@@ -1548,8 +1341,8 @@
]
}
const args = {
- type: 'print', // preview print
- showOptionDlg: false, // 濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ type: 'preview', // preview print
+ showOptionDlg: true, // 濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
report: urlAddRandomNo('./static/grf/鎶ュ伐浜у嚭鏍囩.grf'),
data: obj
}
@@ -1571,8 +1364,8 @@
]
}
const args = {
- type: 'print', // preview print
- showOptionDlg: false, // 濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ type: 'preview', // preview print
+ showOptionDlg: true, // 濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
report: urlAddRandomNo('./static/grf/澶栧崗鏀舵枡鏍囩.grf'),
data: obj
}
@@ -1584,62 +1377,6 @@
this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 80
})
- },
- /*
- *妫�楠岄」淇℃伅
- * */
- JYsortChange({ column, prop, order }) {
- if (order === 'descending') {
- order = 'desc'
- } else if (order === 'ascending') {
- order = 'asc'
- } else {
- order = 'desc'
- }
- this.GXform.order = order
- this.GXform.prop = prop
- // this.getOrganizationSearch()
- },
- // 鑾峰彇宸ュ簭鍒楄〃
- // getList(){
- //
- // },
- // 鏂板
- add() {
- // this.JYTableData.forEach(item => {
- // item.isVisible = 0
- // })
-
- // let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
- // number = number === 0 ? (10 + Math.random()) : number
-
- // const data = { group_code: '', group_name: '', description: '', isVisible: 1, number: number }
- // this.JYTableData.unshift(data)
- },
- // 鍒犻櫎
- del() {
- this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- // UserGroupDelete({ UserGrupCode: row.group_code }).then(res => {
- // if (res.code === '200') {
- // this.$message.success('鍒犻櫎鎴愬姛!')
- // this.getUserGroupSearch()
- // }
- // })
- }).catch(() => {
- this.$message.info('宸插彇娑堝垹闄�')
- })
- },
- // 纭
- confirm() {
-
- },
- // 鍙栨秷
- cancel() {
-
}
}
}
--
Gitblit v1.9.3