From efcf450e8e7e375ef4ffe9f421ec0d34c5378180 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 07 九月 2023 14:02:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.218.113:9001/r/lims-before
---
src/permission.js | 18 +-
src/views/basicData/index.vue | 14 -
src/views/experiment/inspectionApplication/index.vue | 59 ++++-----
src/views/login/index.vue | 2
src/views/CNAS/nonConformanceManage/index.vue | 2
src/views/inspectionManagement/reportForInspection/index.vue | 8 -
src/views/personal/myInformation/index.vue | 156 ++++---------------------
src/router/index.js | 57 ++++-----
src/views/CNAS/reviewAnnualPlan/index.vue | 2
.env.development | 2
src/main.js | 2
.env.production | 2
src/views/laboratory/organizational/index.vue | 2
src/views/CNAS/satisfactionSurveys/index.vue | 2
src/layout/components/Sidebar/SidebarItem.vue | 3
postcss.config.js | 3
src/views/inspectionManagement/commissionInspection/index.vue | 8
17 files changed, 117 insertions(+), 225 deletions(-)
diff --git a/.env.development b/.env.development
index 6c8cdfe..dc51ced 100644
--- a/.env.development
+++ b/.env.development
@@ -2,4 +2,4 @@
ENV = 'development'
# base api
-VUE_APP_BASE_API = 'http://192.168.218.96:1234/'
+VUE_APP_BASE_API = 'http://114.132.189.42:1234/'
diff --git a/.env.production b/.env.production
index dd72fa5..0306dbf 100644
--- a/.env.production
+++ b/.env.production
@@ -3,5 +3,5 @@
# base api
# VUE_APP_BASE_API = '/prod-api'
-VUE_APP_BASE_API = 'http://localhost:1234/'
+VUE_APP_BASE_API = 'http://114.132.189.42:1234/'
diff --git a/postcss.config.js b/postcss.config.js
index 2926a37..8f99bd1 100644
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -1,5 +1,6 @@
-// https://github.com/michael-ciniawsky/postcss-load-config
+// https://github.com/michael-ciniawsky/postcss-load-config
+const path = require('path');
module.exports = {
'plugins': {
// to edit target browsers: use "browserslist" field in package.json
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index cf9ad14..31a901d 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -6,6 +6,9 @@
<item :show="onlyOneChild.meta.show" :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />
<span v-if="onlyOneChild.meta.title==='涓婚〉'">涓婚〉</span>
<span v-if="onlyOneChild.meta.title==='鍩虹鏁版嵁'">鍩虹鏁版嵁</span>
+ <span v-if="onlyOneChild.meta.title==='鏍囧噯搴�'">鏍囧噯搴�</span>
+ <span v-if="onlyOneChild.meta.title==='鎴戠殑寰呭姙'">娑堟伅寰呭姙</span>
+ <span v-if="onlyOneChild.meta.title==='鎴戠殑淇℃伅'">涓汉绠＄悊</span>
</el-menu-item>
</app-link>
</template>
diff --git a/src/main.js b/src/main.js
index 08ded1c..c029a5a 100644
--- a/src/main.js
+++ b/src/main.js
@@ -43,7 +43,7 @@
return JSON.parse(JSON.stringify(val))
}
-Vue.prototype.vueIp = "http://localhost:8080/"
+Vue.prototype.vueIp = "http://114.132.189.42:8080"
// set ElementUI lang to EN
Vue.use(ElementUI, { locale })
diff --git a/src/permission.js b/src/permission.js
index dafb844..beba60f 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,21 +5,21 @@
// import 'nprogress/nprogress.css' // progress bar style
// import { getToken } from '@/utils/auth' // get token from cookie
// import getPageTitle from '@/utils/get-page-title'
-
+//
// NProgress.configure({ showSpinner: false }) // NProgress Configuration
-
+//
// const whiteList = ['/login'] // no redirect whitelist
-
+//
// router.beforeEach(async(to, from, next) => {
// // start progress bar
// NProgress.start()
-
+//
// // set page title
// document.title = getPageTitle(to.meta.title)
-
+//
// // determine whether the user has logged in
// const hasToken = getToken()
-
+//
// if (hasToken) {
// if (to.path === '/login') {
// // if is logged in, redirect to the home page
@@ -33,7 +33,7 @@
// try {
// // get user info
// await store.dispatch('user/getInfo')
-
+//
// next()
// } catch (error) {
// // remove token and go to login page to re-login
@@ -47,7 +47,7 @@
// }
// } else {
// /* has no token*/
-
+//
// if (whiteList.indexOf(to.path) !== -1) {
// // in the free login whitelist, go directly
// next()
@@ -58,7 +58,7 @@
// }
// }
// })
-
+//
// router.afterEach(() => {
// // finish progress bar
// NProgress.done()
diff --git a/src/router/index.js b/src/router/index.js
index b86d642..18015f1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -42,21 +42,21 @@
path: '/standardLibrary',
component: Layout,
redirect: '/standardLibrary/index',
- meta: { title: '鏍囧噯搴�', icon: 'el-icon-s-help' },
+ // meta: { title: '鏍囧噯搴�', icon: 'el-icon-s-help' },
children: [
{
path: 'index',
name: 'StandardLibrary',
component: () => import('@/views/standardLibrary/index'),
- meta: { title: '鏍囧噯搴�', icon: 'form' }
+ meta: { title: '鏍囧噯搴�', icon: 'el-icon-s-help' }
},
- {
- path: 'specificationDetails/:id',
- name: 'SpecificationDetails',
- // hidden: true,
- component: () => import('@/views/standardLibrary/SpecificationDetails'),
- meta: { title: '浜у搧瑙勬牸璇︽儏', icon: 'form', show: false }
- }
+ // {
+ // path: 'specificationDetails/:id',
+ // name: 'SpecificationDetails',
+ // // hidden: true,
+ // component: () => import('@/views/standardLibrary/SpecificationDetails'),
+ // meta: { title: '浜у搧瑙勬牸璇︽儏', icon: 'form', show: false }
+ // }
]
},
{
@@ -254,19 +254,20 @@
component: Layout,
redirect: '/message/toDo',
name: 'Message',
- meta: { title: '娑堟伅寰呭姙', icon: 'el-icon-s-help' },
+ // meta: { title: '娑堟伅寰呭姙', icon: 'el-icon-s-help' },
children: [
{
path: 'toDo',
name: 'ToDo',
component: () => import('@/views/message/toDo/index'),
- meta: { title: '鎴戠殑寰呭姙', icon: 'tree' }
+ // meta: { title: '娑堟伅寰呭姙', icon: 'tree' }
+ meta: { title: '鎴戠殑寰呭姙', icon: 'el-icon-s-help' },
},
- {
- path: 'message',
- name: 'Message',
- component: () => import('@/views/message/message/index'),
- },
+ // {
+ // path: 'message',
+ // name: 'Message',
+ // component: () => import('@/views/message/message/index'),
+ // },
]
},
{
@@ -274,20 +275,21 @@
component: Layout,
redirect: '/personal/myInformation',
name: 'Personal',
- meta: { title: '涓汉绠＄悊', icon: 'el-icon-s-help' },
+ // meta: { title: '涓汉绠＄悊', icon: 'el-icon-s-help' },
children: [
{
path: 'myInformation',
name: 'MyInformation',
component: () => import('@/views/personal/myInformation/index'),
- meta: { title: '鎴戠殑淇℃伅', icon: 'table' }
+ // meta: { title: '涓汉绠＄悊', icon: 'el-icon-s-help' }
+ meta: { title: '鎴戠殑淇℃伅', icon: 'el-icon-s-help' }
},
- {
- path: 'myBusiness',
- name: 'MyBusiness',
- component: () => import('@/views/personal/myBusiness/index'),
- meta: { title: '鎴戠殑浼佷笟', icon: 'tree', show: false }
- }
+ // {
+ // path: 'myBusiness',
+ // name: 'MyBusiness',
+ // component: () => import('@/views/personal/myBusiness/index'),
+ // meta: { title: '鎴戠殑浼佷笟', icon: 'tree', show: false }
+ // }
]
},
{
@@ -318,11 +320,6 @@
{
path: '/404',
component: () => import('@/views/404'),
- hidden: true
-},
-{
- path: '/addCommision',
- component: () => import('@/views/inspectionManagement/commissionInspection/addCommision'),
hidden: true
},
{
@@ -421,7 +418,7 @@
Routees = baseRouter
}
return new Router({
- mode: 'history', // require service support
+ // mode: 'history', // require service support
scrollBehavior: () => ({ y: 0 }),
routes: Routees
})
diff --git a/src/views/CNAS/nonConformanceManage/index.vue b/src/views/CNAS/nonConformanceManage/index.vue
index 0b1c6be..3d7e10e 100644
--- a/src/views/CNAS/nonConformanceManage/index.vue
+++ b/src/views/CNAS/nonConformanceManage/index.vue
@@ -39,7 +39,7 @@
</el-form>
<el-form class="rightBtn" style="margin-top: 10px;">
<el-form-item class="createBtn">
- <el-button size="small" type="primary" icon="el-icon-document-add" style="margin-right: 10px;">鏂板璁板綍</el-button>
+ <el-button size="small" type="primary" icon="el-icon-plus" style="margin-right: 10px;">鏂板璁板綍</el-button>
</el-form-item>
<el-form-item class="getDataBtn">
<el-button size="small" type="primary" icon="el-icon-download">瀵煎嚭</el-button>
diff --git a/src/views/CNAS/reviewAnnualPlan/index.vue b/src/views/CNAS/reviewAnnualPlan/index.vue
index 5626a6d..0257f62 100644
--- a/src/views/CNAS/reviewAnnualPlan/index.vue
+++ b/src/views/CNAS/reviewAnnualPlan/index.vue
@@ -78,7 +78,7 @@
<el-button
size="small"
type="primary"
- icon="el-icon-document-add"
+ icon="el-icon-plus"
@click="
dialogFormVisible2 = true;
newly = {};
diff --git a/src/views/CNAS/satisfactionSurveys/index.vue b/src/views/CNAS/satisfactionSurveys/index.vue
index 5082099..3b85a7b 100644
--- a/src/views/CNAS/satisfactionSurveys/index.vue
+++ b/src/views/CNAS/satisfactionSurveys/index.vue
@@ -28,7 +28,7 @@
</el-form-item>
</el-form>
<el-form style="margin-top: 10px;">
- <el-button size="small" @click="getFillName()" icon="el-icon-document-add" type="primary">鏂板璁板綍</el-button>
+ <el-button size="small" @click="getFillName()" icon="el-icon-plus" type="primary">鏂板璁板綍</el-button>
</el-form>
</div>
<div class="library-table">
diff --git a/src/views/basicData/index.vue b/src/views/basicData/index.vue
index 1b1c086..b62b911 100644
--- a/src/views/basicData/index.vue
+++ b/src/views/basicData/index.vue
@@ -17,8 +17,8 @@
<el-button type="primary" class="top_div_button" size="small" @click="selectProductModelTable">鏌ヨ</el-button>
<el-button class="top_div_button" size="small" @click="clean">閲嶇疆</el-button>
</el-form-item>
- <el-form-item>
- <el-button class="top_div_button" type="primary" size="small" icon="el-icon-folder-add"
+ <el-form-item style="margin-left: 25%;">
+ <el-button class="top_div_button" type="primary" size="small" icon="el-icon-plus"
@click="centerDialogVisible = true">鏂板</el-button>
<el-button class="top_div_button" icon="el-icon-delete-solid" size="small" style="color: #00a5ff"
@click="deleteListClick">鍒犻櫎</el-button>
@@ -35,7 +35,7 @@
<el-form-item>
<span>椤圭洰鍒嗙粍锛�</span>
<el-autocomplete class="inline-input" v-model="form.father" :fetch-suggestions="querySearch2"
- placeholder="璇疯緭鍏ユ牱鍝佸垎缁�" style="width: calc(100% - 70px);"></el-autocomplete>
+ placeholder="璇疯緭鍏ラ」鐩垎缁�" style="width: calc(100% - 70px);"></el-autocomplete>
</el-form-item>
<el-row :gutter="24">
<el-col :span="12"><el-form-item prop="name" required><span>椤圭洰鍚嶇О锛�</span>
@@ -193,12 +193,8 @@
});
},
handleClose(done) {
- this.$confirm("纭鍏抽棴锛�")
- .then((_) => {
- this.centerDialogVisible = false;
- done();
- })
- .catch((_) => {});
+ this.centerDialogVisible = false;
+ done();
},
selectProductModelTable() {
selectproductModelApi(this.params).then((res) => {
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index bdf2da8..31f2a90 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -29,7 +29,7 @@
</el-form>
<el-form class="rightBtn">
<el-form-item class="createBtn">
- <el-button size="small" type="primary" icon="el-icon-document-add" @click="checkTypeVisible = true"
+ <el-button size="small" type="primary" icon="el-icon-plus" @click="checkTypeVisible = true"
style="background-color: rgb(1, 102, 226);">鏂板妫�楠屽崟</el-button>
</el-form-item>
<el-form-item class="getDataBtn">
@@ -229,13 +229,13 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏉ユ枡鏃ユ湡锛�">
- <el-input style="width: 300px" type="text" disabled v-model="finishedTable.deliverydate"
+ <el-input style="width: 300px" type="text" v-model="finishedTable.deliverydate"
placeholder="璇疯緭鍏ユ潵鏂欐棩鏈�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="渚涘簲鍟嗗悕绉帮細">
- <el-input style="width: 300px" type="text" disabled v-model="finishedTable.supplier" placeholder="璇疯緭鍏ヤ緵搴斿晢鍚嶇О"
+ <el-input style="width: 300px" type="text" v-model="finishedTable.supplier" placeholder="璇疯緭鍏ヤ緵搴斿晢鍚嶇О"
autocomplete="off" />
</el-form-item>
</el-col>
@@ -243,13 +243,13 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鎴愬搧缂栫爜锛�">
- <el-input style="width: 300px" type="text" disabled v-model="finishedTable.code" placeholder="璇疯緭鍏ユ垚鍝佺紪鐮�"
+ <el-input style="width: 300px" type="text" v-model="finishedTable.code" placeholder="璇疯緭鍏ユ垚鍝佺紪鐮�"
autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="鎴愬搧鍚嶇О锛�">
- <el-input style="width: 300px" type="text" disabled v-model="finishedTable.name" placeholder="璇疯緭鍏ユ垚鍝佸悕绉�"
+ <el-input style="width: 300px" type="text" v-model="finishedTable.name" placeholder="璇疯緭鍏ユ垚鍝佸悕绉�"
autocomplete="off" />
</el-form-item>
</el-col>
@@ -257,13 +257,13 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
- <el-input style="width: 300px" type="text" disabled v-model="finishedTable.modelandspecification"
+ <el-input style="width: 300px" type="text" v-model="finishedTable.modelandspecification"
placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="鍗曚綅锛�">
- <el-input style="width: 300px" type="text" disabled v-model="finishedTable.unit" placeholder="璇疯緭鍏ュ崟浣�"
+ <el-input style="width: 300px" type="text" v-model="finishedTable.unit" placeholder="璇疯緭鍏ュ崟浣�"
autocomplete="off" />
</el-form-item>
</el-col>
@@ -271,7 +271,7 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏁伴噺锛�">
- <el-input style="width: 300px" type="text" disabled v-model="finishedTable.amount" placeholder="璇疯緭鍏ユ暟閲�"
+ <el-input style="width: 300px" type="text" v-model="finishedTable.amount" placeholder="璇疯緭鍏ユ暟閲�"
autocomplete="off" />
</el-form-item>
</el-col>
@@ -673,8 +673,9 @@
},
// 鏂板妫�楠�
async addInspection() {
+ let obj = {};
if (this.type === 0) {
- addInspect({
+ obj = {
endTime: this.infoForm.checkdate[1],
formTime: this.infoForm.formTime,
mcode: this.infoForm.mcode,
@@ -687,18 +688,10 @@
type: this.type,
unit: this.infoForm.unit,
version: this.version
- }).then(res => {
- this.$message({
- message: '娣诲姞鎴愬姛锛�',
- type: 'success'
- });
- this.$router.push(`Viewdetails/${res.data}`)
- }).catch(error=>{
- this.$message.error(error.message);
- })
+ }
}
if (this.type === 1) {
- const res = await addInspect({
+ obj = {
endTime: this.commisionSelection.checkdate[1],
formTime: this.commisionSelection.formTime,
mcode: this.commisionSelection.mcode,
@@ -710,30 +703,34 @@
type: this.type,
unit: this.commisionSelection.unit,
version: this.version
- })
+ }
}
if (this.type === 2) {
- const res = await addInspect({
- endTime: '2023-08-15',
+ obj = {
+ endTime: this.finishedTable.checkdate[1],
formTime: this.finishedTable.deliverydate,
mcode: this.finishedTable.code,
name: this.finishedTable.name,
num: parseInt(this.finishedTable.amount),
specifications: this.finishedTable.modelandspecification,
- startTime: '2023-08-14',
+ startTime: this.finishedTable.checkdate[1],
supplier: this.finishedTable.supplier,
type: this.type,
unit: this.finishedTable.unit,
version: this.version
- })
+ }
}
- this.type = 0
- this.checkTypeVisible = false
- // this.$message({
- // message: '娣诲姞鎴愬姛锛�',
- // type: 'success'
- // });
- // this.$router.push({name: 'Viewdetails'})
+ addInspect(obj).then(res => {
+ this.$message({
+ message: '娣诲姞鎴愬姛锛�',
+ type: 'success'
+ });
+ this.type = 2
+ this.checkTypeVisible = false
+ this.$router.push(`Viewdetails/${res.data}`)
+ }).catch(error=>{
+ this.$message.error(error.message);
+ })
},
// 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
handleSizeChange(val) {
diff --git a/src/views/inspectionManagement/commissionInspection/index.vue b/src/views/inspectionManagement/commissionInspection/index.vue
index 2bf4083..707c3b1 100644
--- a/src/views/inspectionManagement/commissionInspection/index.vue
+++ b/src/views/inspectionManagement/commissionInspection/index.vue
@@ -24,7 +24,7 @@
</el-form-item>
</el-form>
<el-form>
- <el-popover placement="left" width="400" trigger="click">
+ <el-popover placement="left" width="410" trigger="click">
<div class="vue_qr_div">
<el-row>
<el-col>
@@ -251,7 +251,7 @@
this.addReportDialog = false
},
checkSelect(row) {
- if (row.type === 1) {
+ if (row.inspection_status === 2) {
return false;
} else {
return true;
@@ -474,7 +474,7 @@
selectViewUUID({
day: this.day
}).then(res => {
- this.view = `${this.vueIp}addCommision/${res.data.id}`
+ this.view = `${this.vueIp}/#/addCommision/${res.data.id}`
this.viewId = res.data.id
this.viewTime2 = res.data.time
})
@@ -484,7 +484,7 @@
day: this.viewTime == null ? 1 : this.viewTime
}).then(res => {
this.viewId = res.data
- this.view = `${this.vueIp}addCommision/${res.data.id}`
+ this.view = `${this.vueIp}/#/addCommision/${res.data.id}`
this.viewDia = false
this.$message.success('閾炬帴宸茬敓鎴愶紝鐐瑰嚮澶嶅埗鎸夐挳杩涜澶嶅埗')
})
diff --git a/src/views/inspectionManagement/reportForInspection/index.vue b/src/views/inspectionManagement/reportForInspection/index.vue
index c4d1f48..e3dd70b 100644
--- a/src/views/inspectionManagement/reportForInspection/index.vue
+++ b/src/views/inspectionManagement/reportForInspection/index.vue
@@ -146,9 +146,6 @@
import {
getRawMaterialList,
addInspect,
- selectInspectsListById,
- selectUser,
- selectEquipment,
deleteMaterial,
addMaterial,
getMaterielName,
@@ -156,7 +153,6 @@
getChooseVersion,
lookProByVer
} from '@/api/inspection/rawmaterial'
-import ItemVue from '@/layout/components/Sidebar/Item.vue'
export default {
data() {
return {
@@ -406,7 +402,7 @@
"name": val.materialName,
"num": val.quantity,
"specifications": val.specificationsModels,
- "specificationsId": val.specificationsId,
+ "specificationId": val.specificationsId,
"startTime": dateArr[0],
"supplier": val.supplierName,
"type": val.type,
@@ -425,7 +421,7 @@
this.$message.success('鎶ユ鎴愬姛')
this.$router.push(`/experiment/Viewdetails/${res.data}`)
}).catch(error =>{
- this.$message.error('鎶ユ澶辫触')
+ this.$message.error(error.message)
});
},
// 鑾峰彇鍒嗛〉鍒楄〃鏁版嵁
diff --git a/src/views/laboratory/organizational/index.vue b/src/views/laboratory/organizational/index.vue
index aa83bc1..b8e8d8a 100644
--- a/src/views/laboratory/organizational/index.vue
+++ b/src/views/laboratory/organizational/index.vue
@@ -23,7 +23,7 @@
<el-button
type="primary"
size="small"
- icon="el-icon-circle-plus-outline"
+ icon="el-icon-plus"
@click="dialogVisible = true"
>鏂板</el-button
>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 04c5c38..3076e66 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -217,7 +217,7 @@
}
this.$message.success("鐧诲綍鎴愬姛")
this.btnload = false
- this.$router.push({ path: '/' })
+ this.$router.push({ path: this.redirect || '/' })
}).catch((error) => {
this.$message.error(error.message)
this.btnload = false
diff --git a/src/views/personal/myInformation/index.vue b/src/views/personal/myInformation/index.vue
index 3fc95ed..ab660ec 100644
--- a/src/views/personal/myInformation/index.vue
+++ b/src/views/personal/myInformation/index.vue
@@ -7,12 +7,30 @@
<div>鍩烘湰淇℃伅</div>
</div>
<div class="tips-btn">
- <span><i class="el-icon-edit" />鎿嶄綔锛�</span>
<el-button type="text" @click="dialogFormVisible = true">缂栬緫</el-button>
- <el-dialog title="缂栬緫" :visible.sync="dialogFormVisible">
- <el-form ref="form" :model="form" :rules="rules">
- <el-form-item label="璐﹀彿" :label-width="formLabelWidth" prop="account">
+ <el-dialog title="缂栬緫" :visible.sync="dialogFormVisible" >
+ <el-form ref="form" :model="form" :rules="rules" label-position="left">
+ <el-form-item label="鐢ㄦ埛鍚嶏細" :label-width="formLabelWidth" prop="account">
<el-input v-model="form.account" autocomplete="off" />
+ </el-form-item>
+ <el-form-item label="濮撳悕锛�" :label-width="formLabelWidth" prop="name">
+ <el-input v-model="form.name" autocomplete="off" />
+ </el-form-item>
+ <el-form-item label="鐢佃瘽鍙风爜锛�" :label-width="formLabelWidth" prop="phone">
+ <el-input show-word-limit maxlength="11" type="text" v-model="form.phone" autocomplete="off" />
+ </el-form-item>
+ <el-form-item label="閭锛�" :label-width="formLabelWidth" prop="email">
+ <el-input v-model="form.email" autocomplete="off" />
+ </el-form-item>
+ <el-form-item label="绛惧悕锛�" :label-width="formLabelWidth" prop="signature">
+ <el-upload
+ class="upload-demo"
+ action="#"
+ multiple
+ :limit="3">
+ <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
+ <div slot="tip" class="el-upload__tip">鍙兘涓婁紶jpg/png鏂囦欢锛屼笖涓嶈秴杩�500kb</div>
+ </el-upload>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -38,54 +56,6 @@
<span><i class="el-icon-edit" />绛惧悕锛�</span>
2121212121212121</div>
</div>
- <!-- <el-table
- ref="infoTable"
- :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5'}"
- :data="infoTable"
- style="width: 100%"
- >
- <el-table-column
- prop="username"
- label="鐢ㄦ埛鍚�"
- width="200"
- />
- <el-table-column
- prop="name"
- label="濮撳悕"
- width="460"
- >
- <template slot-scope="scope">
- <el-tag type="info"><i class="el-icon-info" :style="{marginRight:'4px'}" />{{ scope.row.name }}</el-tag>
- </template>
- </el-table-column>
- <el-table-column
- prop="cellPhone"
- label="鐢佃瘽鍙风爜"
- width="400"
- />
- <el-table-column
- prop="email"
- label="閭"
- width="300"
- />
- <el-table-column
- prop="signature"
- label="绛惧悕"
- width="120"
- :filters="[{ text: 0, value: 0 }, { text: 1, value: 1 }]"
- :filter-method="filterTag"
- filter-placement="bottom-end"
- />
- <el-table-column
- label="鎿嶄綔"
- width="120"
- >
- <template slot-scope="scope">
- <el-button @click="handleClick(scope.row)" type="text" size="small">缂栬緫</el-button>
- <el-button type="text" size="small">缂栬緫</el-button>
- </template>
- </el-table-column>
- </el-table> -->
</div>
<div class="my-business">
<div class="tips-main">
@@ -93,65 +63,7 @@
<span />
<div>浼佷笟淇℃伅</div>
</div>
- <div class="tips-btn">
- <span><i class="el-icon-edit" />鎿嶄綔锛�</span>
- <el-button type="text">閫�鍑�</el-button>
- </div>
</div>
- <!-- <el-table
- ref="businessTable"
- :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5'}"
- :data="businessTable"
- style="width: 100%"
- >
- <el-table-column
- prop="businessSmallName"
- label="浼佷笟绠�绉�"
- width="200"
- />
- <el-table-column
- prop="businessBigName"
- label="浼佷笟鍚嶇О"
- width="460"
- />
- <el-table-column
- label="浼佷笟鑱旂郴浜�"
- width="400"
- >
- <template slot-scope="scope">
- <el-tag type="info"><i class="el-icon-info" :style="{marginRight:'4px'}"/>{{ scope.row.businessContact }}</el-tag>
- </template>
- </el-table-column>
- <el-table-column
- prop="businessPhone"
- label="浼佷笟鑱旂郴鍙风爜"
- width="300"
- />
- <el-table-column
- prop="businessStatus"
- label="鍔犲叆鐘舵��"
- width="120"
- :filters="[{ text: 0, value: 0 }, { text: 1, value: 1 }]"
- :filter-method="filterTag"
- filter-placement="bottom-end"
- >
- <template slot-scope="scope">
- <el-tag
- :type="scope.row.businessStatus === 0 ? 'primary' : 'success'"
- disable-transitions
- >{{ scope.row.businessStatus === 0 ? '鏈悓鎰�' : '宸插悓鎰�' }}</el-tag>
- </template>
- </el-table-column>
- <el-table-column
- label="鎿嶄綔"
- width="120"
- >
- <template slot-scope="scope">
- <el-button @click="handleClick(scope.row)" type="text" size="small">閫�鍑�</el-button>
- <el-button type="text" size="small">缂栬緫</el-button>
- </template>
- </el-table-column>
- </el-table> -->
<div class="message">
<div class="message-item"><span><i class="el-icon-edit" />浼佷笟绠�绉帮細</span>{{ businessTable.businessSmallName }}</div>
<div class="message-item">
@@ -196,7 +108,13 @@
businessStatus: 1
},
dialogFormVisible: false,
- form: [],
+ form: {
+ account: "",
+ name: "",
+ phone: "",
+ email: "",
+ signature: ""
+ },
formLabelWidth: 120
}
},
@@ -238,11 +156,9 @@
.my-main{
.my-info,.my-business{
background: #fff;
- // padding: 10px 20px 10px 20px;
margin: 0;
margin-bottom: 12px;
border-radius: 6px;
- overflow: hidden;
.tips-main{
// margin: ;
padding: 10px 20px 0 20px;
@@ -250,22 +166,8 @@
justify-content: space-between;
align-items: center;
height: 50px;
- // height: ;
- &:hover{
- background: #85bff810;
- .tips-btn{
- display: block;
- left: 0;
- opacity:1;
- }
- }
.tips-btn{
height: 100%;
- // display: none;
- position: relative;
- opacity:0;
- left: 100px;
- transition: all 0.3s ease-in-out;
}
.tips{
height: 100%;
--
Gitblit v1.9.3