From 798305c450a490f216b7641bd3f31c30a97b7cb0 Mon Sep 17 00:00:00 2001
From: liuguocan <527956374@qq.com>
Date: 星期二, 28 十一月 2023 16:44:07 +0800
Subject: [PATCH] 物品退回列表/详情
---
admin-web/src/views/departmentitem/itemret/returnNote/detail.vue | 189 +++++++++++++++++------
/dev/null | 111 -------------
admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue | 4
admin-web/src/views/departmentitem/itemret/retDetails/index.vue | 55 +++---
admin-web/src/views/departmentitem/itemret/returnNote/edit.vue | 90 +++++++----
admin-web/src/views/departmentitem/itemret/returnNote/index.vue | 7
admin-web/src/views/departmentitem/itemscr/scrappDetails/index.vue | 2
admin-web/public/static/config.js | 17 +
8 files changed, 244 insertions(+), 231 deletions(-)
diff --git a/admin-web/public/static/config.js b/admin-web/public/static/config.js
index 2595dcf..33e661f 100644
--- a/admin-web/public/static/config.js
+++ b/admin-web/public/static/config.js
@@ -1,12 +1,21 @@
+// 璇锋眰鎺ュ彛鍦板潃 濡傛灉娌℃湁閰嶇疆鑷姩鑾峰彇褰撳墠缃戝潃璺緞
+const VUE_APP_API_URL = process.env.VUE_APP_BASE_API || `${location.origin}`;
+const VUE_APP_WS_URL =
+ process.env.VUE_APP_WS_URL || (location.protocol === 'https' ? 'wss' : 'ws') + ':' + location.hostname;
+
const SettingIplatform = {
// 鏈嶅姟鍣ㄥ湴鍧�
+ // 鏈嶅姟鍣ㄥ湴鍧�
+ httpUrl: VUE_APP_API_URL,
// 涓婁紶璺緞
ftpUrl: 'https://yqzx.jinmingyuan.com/lowConsum',//寮�鍙�
- // 鎺ュ彛璇锋眰鍦板潃
- apiBaseURL: 'http://172.16.20.2:8083/lowConsum',//寮�鍙�
- // apiBaseURL: 'https://yqzx.jinmingyuan.com/lowConsum',//寮�鍙�
- debug: false //璋冭瘯寮�鍏� true鏃朵細杈撳嚭璇锋眰鏃ュ織
+// 鎺ュ彛璇锋眰鍦板潃
+ apiBaseURL: 'https://yqzx.jinmingyuan.com/lowConsum',//寮�鍙�
+// apiBaseURL: 'https://jmy.jinmingyuan.com/progress',// 娴嬭瘯,
+ // socket杩炴帴
+ wsSocketUrl: VUE_APP_WS_URL,
+ debug: true //璋冭瘯寮�鍏� true鏃朵細杈撳嚭璇锋眰鏃ュ織
};
export default SettingIplatform;
diff --git a/admin-web/src/views/departmentitem/itemret/retDetails/edit.vue b/admin-web/src/views/departmentitem/itemret/retDetails/edit.vue
deleted file mode 100644
index 37b0db9..0000000
--- a/admin-web/src/views/departmentitem/itemret/retDetails/edit.vue
+++ /dev/null
@@ -1,111 +0,0 @@
-<template>
- <win-sm :title="setting.title" @close="close" :width="'800px'">
- <el-form ref="ruleForm" :model="formData" :rules="rules" class="demo-ruleForm" label-width="100px">
- <el-form-item label="缂栧彿" prop="code">
- <el-input disabled v-model="formData.code" clearable maxlength="20" show-word-limit style="width: 100%"/>
- </el-form-item>
- <el-form-item label="浠撳簱鍚嶇О" prop="name">
- <el-input v-model="formData.name" clearable maxlength="20" show-word-limit style="width: 100%"/>
- </el-form-item>
- <el-form-item label="鍦板潃" >
- <el-input v-model="formData.adss" clearable maxlength="20" show-word-limit style="width: 100%"/>
- </el-form-item>
- <el-form-item label="鐘舵��" prop="status">
- <el-switch
- v-model="formData.status"
- active-color="#0d997c"
- inactive-color="#C0CCDA">
- </el-switch>
- </el-form-item>
- </el-form>
- <div slot="footer" align="center" class="dialog-footer">
- <my-button name="鍙栨秷" site="form" @click="close"/>
- <my-button name="淇濆瓨" site="form" @click="save"/>
- </div>
- </win-sm>
-</template>
-
-<script>
-import winSm from '@/components/win/win-sm'
-import myButton from '@/components/myButton/myButton'
-import * as finsystenant from '@/api/baseSetting/finsystenant'
-
-export default {
- components: {winSm, myButton},
- props: {
- setting: {
- type: Object,
- default: () => {
- }
- }
- },
- data() {
- return {
- checkAll: false,
- checkedList: [],
- formData: {
- code: '',
- name: '',
- status: true,
- summary: '',
- },
- rules: {
- code: [
- {required: true, message: '璇疯緭鍏ユ満鏋勭紪鍙�', trigger: 'blur'}
- ],
- name: [
- {required: true, message: '璇疯緭鍏ユ満鏋勫悕绉�', trigger: 'blur'}
- ],
- status: [
- {required: true, message: '璇烽�夋嫨鐘舵��', trigger: 'blur'}
- ]
- }
- }
- },
- created() {
- if(this.setting.info){
- this.formData = Object.assign({},JSON.parse(this.setting.info))
- }
- },
- methods: {
- getEditInfo(id){
-
- },
- close() {
- this.$emit('close')
- },
- save() {
- this.$refs.ruleForm.validate((valid) => {
- if (valid) {
- const params = Object.assign({}, this.formData)
- if(this.setting.id){
- // 缂栬緫鎺ュ彛
- finsystenant.edit(params).then(res => {
- if (res) {
- this.$message.success('淇濆瓨鎴愬姛锛�')
- this.close()
- this.$emit('search')
- } else {
- this.$message.error('淇濆瓨澶辫触')
- }
- })
- }else{
- params.orgId = this.setting.orgId
- finsystenant.add(params).then(res => {
- if (res) {
- this.$message.success('淇濆瓨鎴愬姛锛�')
- this.close()
- this.$emit('search')
- } else {
- this.$message.error('淇濆瓨澶辫触')
- }
- })
- }
- } else {
- this.$message.error('鏍￠獙鏈�氳繃锛岃妫�鏌ャ��')
- }
- })
- }
- }
-}
-</script>
diff --git a/admin-web/src/views/departmentitem/itemret/retDetails/index.vue b/admin-web/src/views/departmentitem/itemret/retDetails/index.vue
index 6269d01..7215628 100644
--- a/admin-web/src/views/departmentitem/itemret/retDetails/index.vue
+++ b/admin-web/src/views/departmentitem/itemret/retDetails/index.vue
@@ -16,6 +16,8 @@
</el-card>
</el-container>
</el-container>
+ <!--璇︽儏-->
+ <detail v-if="editSetting.show" :setting="editSetting" @close="editSetting.show = false"/>
</div>
</template>
@@ -23,12 +25,11 @@
import MyTableV2 from "@/components/myTable/myTableV2";
import MyButton from "@/components/myButton/myButton";
import SettingIplatform from '@/utils/settingIplatform';
-import * as finsystenant from '@/api/baseSetting/finsystenant'
-import {getBaseUrl} from '@/utils/base';
+import detail from '@/views/departmentitem/itemret/returnNote/detail'
export default {
name: "index",
- components: {MyButton, MyTableV2},
+ components: {MyButton, MyTableV2,detail},
data() {
return {
// 鎼滅储妗�
@@ -36,26 +37,9 @@
{
type: 'text',
dataIndex: 'name',
- label: '鍗曞彿',
+ label: '閫�鍥炲崟鍙�',
placeholder: '璇疯緭鍏�',
defaultValue: ''
- },
- {
- type: 'select',
- dataIndex: 'status',
- label: '绫诲瀷',
- placeholder: '璇烽�夋嫨',
- defaultValue: '1',
- options: [
- {
- label: '鍚敤',
- value: '1'
- },
- {
- label: '绂佺敤',
- value: '0'
- }
- ]
},
{
type: 'text',
@@ -63,6 +47,31 @@
label: '鐗╁搧鍚嶇О',
placeholder: '璇疯緭鍏�',
defaultValue: ''
+ },
+ {
+ type: 'select',
+ dataIndex: 'name',
+ label: '瑙勬牸鍨嬪彿',
+ placeholder: '璇疯緭鍏�',
+ defaultValue: '',
+ options:[]
+ },
+ {
+ type: 'cascader',
+ dataIndex: 'agencyId',
+ label: '鏈烘瀯',
+ placeholder: '璇烽�夋嫨',
+ optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
+ defaultValue: '',
+ options: [],
+ },
+ {
+ type: 'select',
+ dataIndex: 'name',
+ label: '閮ㄩ棬',
+ placeholder: '璇疯緭鍏�',
+ defaultValue: '',
+ options:[]
},
{
type: 'text',
@@ -84,7 +93,6 @@
editSetting: {
title: '',
id: '',
- orgId: '',
show: false,
},
// 琛ㄦ牸鏁版嵁
@@ -146,8 +154,7 @@
methods: {
showAudit(row) {
this.editSetting.id = row.id;
- this.editSetting.info = JSON.stringify(row);
- this.editSetting.title = '缂栬緫';
+ this.editSetting.title = '璇︽儏';
this.editSetting.show = true;
},
// 鏌ヨtable鍒楄〃
diff --git a/admin-web/src/views/departmentitem/itemret/returnNote/detail.vue b/admin-web/src/views/departmentitem/itemret/returnNote/detail.vue
index f8f428d..e63d8f9 100644
--- a/admin-web/src/views/departmentitem/itemret/returnNote/detail.vue
+++ b/admin-web/src/views/departmentitem/itemret/returnNote/detail.vue
@@ -1,79 +1,111 @@
<template>
- <win-md class="stock-detail" :title="setting.title" @close="close" :width="'800px'">
+ <win-lg class="stock-detail" :title="setting.title" @close="close" :width="'800px'" :loading="loading">
<el-row :gutter="20">
<el-col :span="8">
<span>閫�鍥炲崟鍙凤細</span>
- <span>{{ detail.businessFormCode }}</span>
- </el-col>
- <el-col :span="8">
- <span>閫�鍥炰粨搴擄細</span>
- <span>{{ detail.warehouseName }}</span>
+ <span>SL2023001</span>
</el-col>
<el-col :span="8">
<span>鎵�灞炴満鏋勶細</span>
- <span>{{ detail.agencyName }}</span>
+ <span>娌冲崡鐪侀偖鏀垮垎鍏徃</span>
+ </el-col>
+ <el-col :span="8">
+ <span>閮ㄩ棬锛�</span>
+ <span>閲戣瀺涓氬姟閮�</span>
</el-col>
</el-row>
<el-row :gutter="20" style="margin-top: 20px">
<el-col :span="8">
- <span>鍒涘缓浜猴細</span>
- <span>{{ detail.operatorName }}</span>
+ <span>閫�鍥炰汉锛�</span>
+ <span>寮犵埍鐢�</span>
</el-col>
<el-col :span="8">
<span>閫�鍥炴椂闂达細</span>
- <span>{{ detail.dealTime | formatTime }}</span>
+ <span>2023-08-08 10:23:12</span>
</el-col>
</el-row>
- <el-row v-if="detail.procureDoc" :gutter="20" style="margin-top: 20px">
+ <el-row :gutter="20" style="margin-top: 20px">
<el-col class="img-row" :span="24">
- <span>閫�鍥炴墜缁細</span>
- <div class="img-box"></div>
+ <span>鎶ュ簾鎵嬬画锛�</span>
+ <div class="img-box" v-for="(item, index) in fileList" :key="index" @click="handlePreview(item)">
+ <img class="img" :src="getUrl(item.path)" alt="" />
+ </div>
</el-col>
</el-row>
- <div class="goods-card" v-for="(goodsItem, goodsIndex) in detail.fromOutputGoods" :key="goodsIndex">
+ <div class="goods-card" v-for="(goodsItem, goodsIndex) in detail.procureGoods" :key="goodsIndex">
<el-row :gutter="20">
- <el-col :span="8">
+ <el-col :span="6">
<span>鐗╁搧鍒嗙被锛�</span>
- <span>{{ goodsItem.categoryName }}</span>
+ <span>{{ goodsItem.baseCategoryName }}</span>
</el-col>
- <el-col :span="8">
+ <el-col :span="6">
<span>鐗╁搧鍚嶇О锛�</span>
- <span>{{ goodsItem.goodsName }}</span>
+ <span>{{ goodsItem.goodsTemplateName }}</span>
+ </el-col>
+ <el-col :span="6">
+ <span>鐗╁搧绫诲埆锛�</span>
+ <span>{{ goodsItem.supplier }}</span>
+ </el-col>
+ <el-col :span="6">
+ <span>鍒嗗彂鍗曞彿锛�</span>
+ <span>{{ goodsItem.supplier }}</span>
</el-col>
</el-row>
- <el-table :data="goodsItem.models" :stripe="true" style="margin-top: 20px">
- <el-table-column prop="baseGoodsModelsName" label="瑙勬牸鍨嬪彿" align="center">
- <template slot-scope="scope">
- {{ scope.row.baseGoodsModelsName }}
- </template>
- </el-table-column>
- <el-table-column label="鍗曚綅" align="center">
- <template slot-scope="scope">
- {{ scope.row.unit }}
- </template>
- </el-table-column>
- <el-table-column prop="counts" label="閫�鍥炴暟閲�" align="center">
- <template slot-scope="scope">
- {{ scope.row.counts }}
- </template>
- </el-table-column>
- <el-table-column prop="counts" label="閲戦" align="center">
- <template slot-scope="scope">
- {{ scope.row.price * scope.row.counts | formatPrice}}
- </template>
- </el-table-column>
- </el-table>
+ <div>
+ <el-table :data="goodsItem.models" :stripe="true" style="margin-top: 20px">
+ <el-table-column prop="baseGoodsModelsName" label="瑙勬牸鍨嬪彿" align="center">
+ <template slot-scope="scope">
+ {{ scope.row.baseGoodsModelsName }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鍗曚綅" align="center">
+ <template slot-scope="scope">
+ {{ scope.row.unit }}
+ </template>
+ </el-table-column>
+ <el-table-column label="浣跨敤浜�" align="center" v-if="goodsItem.type===1">
+ <template slot-scope="scope">
+ {{ scope.row.unit }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="price" label="閫�鍥炴暟閲�" align="center">
+ <template slot-scope="scope">
+ {{ scope.row.counts }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="counts" label="鍐嶇敤鏁伴噺" align="center">
+ <template slot-scope="scope">
+ {{ scope.row.counts }}
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
</div>
- </win-md>
+ <div id="uploadPreviewImages" style="display: none">
+ <span v-for="(src, index) in fileList" :key="index">
+ <img
+ v-if="checkImg(src.name)"
+ class="v-img"
+ :src="src.url"
+ :alt="src.name"
+ style="width: 100px; height: 100px"
+ />
+ </span>
+ </div>
+ </win-lg>
</template>
<script>
-import { outputDetail } from '@/api/stock/accessStock';
-import winMd from '@/components/win/win-md';
+import { procureDetail } from '@/api/stock/procure/purchaseOrder';
+import winLg from '@/components/win/win-lg';
import * as DateFormatter from '@/utils/DateFormatter';
+import { getDownUrl } from '@/utils/base';
+import Viewer from 'viewerjs';
+import 'viewerjs/dist/viewer.css';
+
+let viewer = null;
export default {
- components: { winMd },
-
+ components: { winLg },
props: {
setting: {
type: Object,
@@ -82,21 +114,26 @@
},
data() {
return {
+ loading:false,
+ fileList: [],
detail: {
- categoryName: '',
+ baseCategoryName: '',
businessFormCode: '',
- goodsName: '',
+ goodsTemplateName: '',
+ procureDoc: '',
agencyId: '',
agencyName: '',
states: '',
createName: '',
- fromOutputGoods: [],
+ time: '',
+ procureGoods: [{}, {}],
+ fileKey: Math.random(),
},
};
},
filters: {
formatTime(time) {
- if (!time) return;
+ if (!time) return '-';
return DateFormatter.LongToDateTime(time);
},
formatPrice(price) {
@@ -104,17 +141,65 @@
}
},
created() {
- outputDetail({ id: this.setting.id }).then((res) => {
+ procureDetail({ id: this.setting.id }).then((res) => {
this.detail = res;
+ this.fileList = this.detail.procureDoc ? JSON.parse(this.detail.procureDoc) : [];
+ this.$nextTick(() => {
+ this.initPreviewImg();
+ });
});
},
methods: {
+ initPreviewImg() {
+ if (viewer != null) {
+ viewer.destroy();
+ }
+ const ViewerDom = document.querySelector('#uploadPreviewImages');
+ viewer = new Viewer(ViewerDom, {});
+ },
+ handlePreview(file) {
+ if (!this.checkImg(file.name)) {
+ return false;
+ }
+ let index = 0;
+ for (let i = 0; i < this.fileList.length; i++) {
+ const f = this.fileList[i];
+ if (this.checkImg(f.name)) {
+ if (file.id == f.id) {
+ break;
+ }
+ index++;
+ }
+ }
+ // this.fileList.forEach((f, i) => {
+ // if (file.uid == f.uid) {
+ // index = i
+ // }
+ // })
+ // document.querySelector('#uploadPreviewImages').children[0].click()
+ viewer.view(index);
+ },
+ checkImg(name) {
+ const suffix = name.substring(name.lastIndexOf('.'), name.length);
+ const imgArray = ['.jpg', '.jpeg', '.png', '.bmp'];
+ if (imgArray.indexOf(suffix) < 0) {
+ return false;
+ }
+ return true;
+ },
+ getUrl(path) {
+ if (path.substr(0, 7).toLowerCase() == 'http://' || path.substr(0, 8).toLowerCase() == 'https://') {
+ return path;
+ } else {
+ return getDownUrl() + path;
+ }
+ },
close() {
- this.$emit('close')
+ this.$emit('close');
},
},
};
</script>
<style lang="scss" scoped>
-@import url(../../../../styles/store.scss);
+//@import url(../../../../styles/store.scss);
</style>
diff --git a/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue b/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue
index a4aee1f..1b439af 100644
--- a/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue
+++ b/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue
@@ -29,7 +29,7 @@
</el-row>
<el-row :gutter="24" class="headerHeight">
<el-col :span="24">
- <el-form-item label="閫�鍥炴墜缁�" prop="procureDoc">
+ <el-form-item label="閫�鍥炲鎵规墜缁�" prop="procureDoc">
<upload ref="uploadRef" :settings="uploadSettings" @on-change="uploadChange"></upload>
</el-form-item>
</el-col>
@@ -89,39 +89,59 @@
</el-form-item>
</el-col>
</el-row>
- <el-table :data="goodsItem.models" :stripe="true">
- <el-table-column prop="baseGoodsModelsId" label="瑙勬牸鍨嬪彿" align="center">
- <template slot-scope="scope">
- {{ getGoodsModelsName(scope.row.baseGoodsModelsId) }}
- </template>
- </el-table-column>
- <el-table-column label="鍗曚綅" align="center">
- <template slot-scope="scope">
- {{ scope.row.unit }}
- </template>
- </el-table-column>
- <el-table-column prop="price" label="鐜版湁搴撳瓨" align="center">
- <template slot-scope="scope">
- {{ scope.row.worehouseCount }}
- </template>
- </el-table-column>
- <el-table-column prop="counts" label="閫�鍥炴暟閲�" align="center">
- <template slot-scope="scope">
- <el-form-item
- label-width="0"
- style="margin-bottom: 0"
- :prop="`goods[${goodsIndex}].models[${scope.$index}].counts`"
- :rules="rules.counts"
- >
- <el-input
- type="number"
- v-model="scope.row.counts"
- @change="countsChange($event, goodsIndex, scope.$index)"
- ></el-input>
+ <div class="card3" v-for="(mItem, mIndex) in goodsItem.models" :key="mIndex">
+ <el-row :gutter="24" type="flex" align="middle" style="height: 50px">
+ <el-col :span="8">
+ <el-form-item label="瑙勬牸鍨嬪彿:" prop="baseGoodsModelsId" style="margin-bottom: 0">
+ {{ getGoodsModelsName(mItem.baseGoodsModelsId) }}
</el-form-item>
- </template>
- </el-table-column>
- </el-table>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍗曚綅:" prop="baseGoodsModelsId" style="margin-bottom: 0" label-width="80">
+ 50
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鐗╁搧绫诲埆:" prop="baseGoodsModelsId" style="margin-bottom: 0" label-width="80">
+ A绫�
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-table :data="mItem.models" :stripe="true">
+ <!-- A绫诲晢鍝佹樉绀� -->
+ <el-table-column prop="price" label="浣跨敤浜�" align="center" v-if="goodsItem.models.type===1">
+ <template slot-scope="scope">
+ {{ scope.row.worehouseCount }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="price" label="鍒嗗彂鏁伴噺" align="center">
+ <template slot-scope="scope">
+ {{ scope.row.worehouseCount }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="price" label="鍙��鏁伴噺" align="center">
+ <template slot-scope="scope">
+ {{ scope.row.worehouseCount }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="counts" label="閫�鍥炴暟閲�" align="center">
+ <template slot-scope="scope">
+ <el-form-item
+ label-width="0"
+ style="margin-bottom: 0"
+ :prop="`goods[${goodsIndex}].models[${scope.$index}].counts`"
+ :rules="rules.counts"
+ >
+ <el-input
+ type="number"
+ v-model="scope.row.counts"
+ @change="countsChange($event, goodsIndex, scope.$index)"
+ ></el-input>
+ </el-form-item>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
<div class="btn-group">
<el-button
v-if="formData.goods.length > 1"
@@ -433,4 +453,8 @@
}
}
}
+.card3 {
+ border-radius: 2px;
+ background: #ffffff;
+}
</style>
diff --git a/admin-web/src/views/departmentitem/itemret/returnNote/index.vue b/admin-web/src/views/departmentitem/itemret/returnNote/index.vue
index a910caf..4f29e45 100644
--- a/admin-web/src/views/departmentitem/itemret/returnNote/index.vue
+++ b/admin-web/src/views/departmentitem/itemret/returnNote/index.vue
@@ -23,12 +23,7 @@
<span class="value">{{ item.businessFormCode }}</span>
</div>
<div class="card-header-right">
- <el-button site="form" type="success" size="mini" @click="handleExport(item)"
- >瀵煎嚭閫�鍥炲崟</el-button
- >
- <el-button name="鏌ョ湅璇︽儏" site="form" type="info" size="mini" @click="handleDetail(item)"
- >鏌ョ湅璇︽儏</el-button
- >
+ <el-button name="鏌ョ湅璇︽儏" site="form" type="info" size="mini" @click="handleDetail(item)">鏌ョ湅璇︽儏</el-button>
</div>
</div>
<div class="one-hed">
diff --git a/admin-web/src/views/departmentitem/itemscr/scrappDetails/edit.vue b/admin-web/src/views/departmentitem/itemscr/scrappDetails/edit.vue
deleted file mode 100644
index 37b0db9..0000000
--- a/admin-web/src/views/departmentitem/itemscr/scrappDetails/edit.vue
+++ /dev/null
@@ -1,111 +0,0 @@
-<template>
- <win-sm :title="setting.title" @close="close" :width="'800px'">
- <el-form ref="ruleForm" :model="formData" :rules="rules" class="demo-ruleForm" label-width="100px">
- <el-form-item label="缂栧彿" prop="code">
- <el-input disabled v-model="formData.code" clearable maxlength="20" show-word-limit style="width: 100%"/>
- </el-form-item>
- <el-form-item label="浠撳簱鍚嶇О" prop="name">
- <el-input v-model="formData.name" clearable maxlength="20" show-word-limit style="width: 100%"/>
- </el-form-item>
- <el-form-item label="鍦板潃" >
- <el-input v-model="formData.adss" clearable maxlength="20" show-word-limit style="width: 100%"/>
- </el-form-item>
- <el-form-item label="鐘舵��" prop="status">
- <el-switch
- v-model="formData.status"
- active-color="#0d997c"
- inactive-color="#C0CCDA">
- </el-switch>
- </el-form-item>
- </el-form>
- <div slot="footer" align="center" class="dialog-footer">
- <my-button name="鍙栨秷" site="form" @click="close"/>
- <my-button name="淇濆瓨" site="form" @click="save"/>
- </div>
- </win-sm>
-</template>
-
-<script>
-import winSm from '@/components/win/win-sm'
-import myButton from '@/components/myButton/myButton'
-import * as finsystenant from '@/api/baseSetting/finsystenant'
-
-export default {
- components: {winSm, myButton},
- props: {
- setting: {
- type: Object,
- default: () => {
- }
- }
- },
- data() {
- return {
- checkAll: false,
- checkedList: [],
- formData: {
- code: '',
- name: '',
- status: true,
- summary: '',
- },
- rules: {
- code: [
- {required: true, message: '璇疯緭鍏ユ満鏋勭紪鍙�', trigger: 'blur'}
- ],
- name: [
- {required: true, message: '璇疯緭鍏ユ満鏋勫悕绉�', trigger: 'blur'}
- ],
- status: [
- {required: true, message: '璇烽�夋嫨鐘舵��', trigger: 'blur'}
- ]
- }
- }
- },
- created() {
- if(this.setting.info){
- this.formData = Object.assign({},JSON.parse(this.setting.info))
- }
- },
- methods: {
- getEditInfo(id){
-
- },
- close() {
- this.$emit('close')
- },
- save() {
- this.$refs.ruleForm.validate((valid) => {
- if (valid) {
- const params = Object.assign({}, this.formData)
- if(this.setting.id){
- // 缂栬緫鎺ュ彛
- finsystenant.edit(params).then(res => {
- if (res) {
- this.$message.success('淇濆瓨鎴愬姛锛�')
- this.close()
- this.$emit('search')
- } else {
- this.$message.error('淇濆瓨澶辫触')
- }
- })
- }else{
- params.orgId = this.setting.orgId
- finsystenant.add(params).then(res => {
- if (res) {
- this.$message.success('淇濆瓨鎴愬姛锛�')
- this.close()
- this.$emit('search')
- } else {
- this.$message.error('淇濆瓨澶辫触')
- }
- })
- }
- } else {
- this.$message.error('鏍￠獙鏈�氳繃锛岃妫�鏌ャ��')
- }
- })
- }
- }
-}
-</script>
diff --git a/admin-web/src/views/departmentitem/itemscr/scrappDetails/index.vue b/admin-web/src/views/departmentitem/itemscr/scrappDetails/index.vue
index 59395d0..528af3f 100644
--- a/admin-web/src/views/departmentitem/itemscr/scrappDetails/index.vue
+++ b/admin-web/src/views/departmentitem/itemscr/scrappDetails/index.vue
@@ -13,7 +13,7 @@
<my-table-v2 ref="myTable" :filter="filterFrom" :table="table"/>
</el-col>
</el-row>
- <!--娣诲姞/缂栬緫寮圭獥-->
+ <!--璇︽儏-->
<detail v-if="editSetting.show" :setting="editSetting" @close="editSetting.show = false"/>
</el-card>
</el-container>
diff --git a/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue b/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
index b87389a..eeea99d 100644
--- a/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
+++ b/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
@@ -470,4 +470,8 @@
}
}
}
+.card3 {
+ border-radius: 2px;
+ background: #ffffff;
+}
</style>
--
Gitblit v1.9.1