From 3f69b4dfc585c4dfbc3c07a6acf5cdd838033636 Mon Sep 17 00:00:00 2001
From: liuguocan <527956374@qq.com>
Date: 星期二, 28 十一月 2023 14:45:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin-web/src/views/stock/scrap/itemScrapping/index.vue | 205 +++++++++++++++++++++-----------------------------
1 files changed, 86 insertions(+), 119 deletions(-)
diff --git a/admin-web/src/views/stock/scrap/itemScrapping/index.vue b/admin-web/src/views/stock/scrap/itemScrapping/index.vue
index 0c7be3d..97373c7 100644
--- a/admin-web/src/views/stock/scrap/itemScrapping/index.vue
+++ b/admin-web/src/views/stock/scrap/itemScrapping/index.vue
@@ -9,22 +9,23 @@
<el-row style="margin-top: 15px">
<el-col>
<!--鍒楄〃-->
- <div :style="{ 'overflow-y': 'auto', height: `${clientHeight - 320}px` }" v-loading="loading">
- <el-row class="card" :gutter="5">
+ <div class="table-tool-bar" style="margin-bottom: 15px">
+ <my-button name="鏂板" @click="handleAdd" site="tools" size="medium" />
+ </div>
+ <div :style="{ 'overflow-y': 'auto', height: 'calc(100vh - 352px)' }">
+ <el-row class="card" :gutter="5" v-loading="loading">
<el-col v-for="(item, index) in list" :key="index" class="cm-item">
<el-card class="card-data">
<div class="card-container">
<div class="card-header">
<div class="card-header-left">
- <span>璋冩嫧鍗曞彿锛�</span>
+ <span>鎶ュ簾鍗曞彿锛�</span>
<span class="value">{{ item.businessFormCode }}</span>
- <div class="states" :class="item.states == 1 ? '' : 'states-success'">
- {{ item.states == 1 ? '寰呰皟鎷�' : '宸茶皟鎷�' }}
- </div>
+
</div>
<div class="card-header-right">
<el-button site="form" type="success" size="mini" @click="handleExport(item)"
- >瀵煎嚭璋冩嫧鍑哄簱鍗�</el-button
+ >瀵煎嚭鎶ュ簾鍗�</el-button
>
<el-button name="鏌ョ湅璇︽儏" site="form" type="info" size="mini" @click="handleDetail(item)"
>鏌ョ湅璇︽儏</el-button
@@ -32,21 +33,19 @@
</div>
</div>
<div class="one-hed">
- <div class="box"><span class="span-two">鎺ユ敹鏈烘瀯锛�</span>{{ item.agencyId }}</div>
- <div class="box"><span class="span-two">鐢宠浜猴細</span>{{ item.buyerName }}</div>
- <div class="box"><span class="span-two">鐢宠璋冩嫧鏃堕棿锛�</span>{{ item.procureTime }}</div>
- <div class="box"><span class="span-two">鎺ユ敹鏃堕棿锛�</span>{{ item.procureTime }}</div>
- <div class="box"><span class="span-two">璋冩嫧鏈烘瀯锛�</span>{{ item.procureTime }}</div>
- <div class="box"><span class="span-two">璋冩嫧浜猴細</span>{{ item.procureTime }}</div>
- <div class="box"><span class="span-two">璋冩嫧鏃堕棿锛�</span>{{ item.procureTime }}</div>
+ <div class="box"><span class="span-two">鏈烘瀯锛�</span>{{ item.agencyName }}</div>
+ <div class="box"><span class="span-two">鎿嶄綔浜猴細</span>{{ item.operatorName }}</div>
+ <div class="box">
+ <span class="span-two">鎶ュ簾鏃堕棿锛�</span>{{ item.dealTime | formatTime }}
+ </div>
</div>
<div class="card-end">
- <div v-for="(just, index) in item.models" :key="index" class="item">
- <div class="name">{{ just.baseGoodsModelsId }}</div>
+ <div v-for="(just, index) in item.goodTemplateInfo" :key="index" class="item">
+ <div class="name">{{ just.goodsName }}</div>
<div class="value-box">
<div class="value-box-item">
<span class="label">鏁伴噺锛�</span>
- <span class="value">{{ just.counts }}</span>
+ <span class="value">{{ just.count }}</span>
<span class="unit">{{ just.unit }}</span>
</div>
</div>
@@ -72,28 +71,35 @@
</el-card>
</el-container>
<!--娣诲姞/缂栬緫寮圭獥-->
- <edit ref="editRef"></edit>
- <detail ref="detailRef"></detail>
- <my-import
- :import-setting="importSetting"
- :dialog-show="importSetting.dialogShow"
- :dialog-title="importSetting.dialogTitle"
- />
+ <edit
+ v-if="editSetting.show"
+ :setting="editSetting"
+ ref="editRef"
+ @close="editSetting.show = false"
+ @search="refreshData"
+ ></edit>
+ <detail
+ v-if="detailSetting.show"
+ :setting="detailSetting"
+ @close="detailSetting.show = false"
+ ref="detailRef"
+ ></detail>
</div>
</template>
<script>
-import { procureList, procureDel, procureIncome } from '@/api/stock/procure/purchaseOrder';
+import { scrappedList, } from '@/api/stock/scrap';
+import { getTree } from '@/api/baseSetting/finsystenant';
import MyButton from '@/components/myButton/myButton';
import SettingIplatform from '@/utils/settingIplatform';
-import myImport from '@/views/components/myImport';
import edit from './edit';
import detail from './detail';
import { getBaseUrl } from '@/utils/base';
+import * as DateFormatter from '@/utils/DateFormatter';
export default {
name: 'index',
- components: { MyButton, myImport, edit, detail },
+ components: { MyButton, edit, detail },
data() {
return {
loading: false,
@@ -104,62 +110,41 @@
{
type: 'text',
dataIndex: 'businessFormCode',
- label: '璋冩嫧鍗曞彿',
+ label: '鎶ュ簾鍗曞彿',
placeholder: '璇疯緭鍏�',
defaultValue: '',
},
{
- type: 'text',
- dataIndex: 'goodsTemplateName',
+ type: 'select',
+ dataIndex: 'goodsTemplateId',
label: '鐗╁搧鍚嶇О',
- placeholder: '鍙ā绯婃悳绱�',
+ placeholder: '璇疯緭鍏�',
defaultValue: '',
+ options: [],
+ optionsConfig: {
+ label: 'goodsName',
+ value: 'id',
+ url: SettingIplatform.apiBaseURL + '/pc/base/goods/template/query/goodsTemplate',
+ },
},
{
- type: 'select',
- dataIndex: 'name',
+ type: 'cascader',
+ dataIndex: 'agencyId',
label: '鏈烘瀯',
placeholder: '璇烽�夋嫨',
+ optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
defaultValue: '',
options: [],
},
{
- type: 'text',
- dataIndex: 'buyerName',
- label: '鍒涘缓浜�',
- placeholder: '璇疯緭鍏�',
- defaultValue: '',
- },
- {
- type: 'select',
- dataIndex: 'states',
- label: '鐘舵��',
- placeholder: '璇烽�夋嫨',
- defaultValue: '',
- options: [
- {
- label: '鍏ㄩ儴',
- value: '',
- },
- {
- label: '寰呰皟鎷�',
- value: '1',
- },
- {
- label: '宸茶皟鎷�',
- value: '2',
- },
- ],
- },
- {
type: 'date-picker',
- dataIndex: 'val1',
- label: '璋冩嫧鏃堕棿',
+ dataIndex: 'startTime',
+ label: '鎶ュ簾鏃堕棿',
defaultValue: '',
},
{
type: 'date-picker',
- dataIndex: 'val2',
+ dataIndex: 'endTime',
label: '鑷�',
defaultValue: '',
},
@@ -173,28 +158,15 @@
userPhone: null,
states: null,
},
- // 瀵煎叆
- importSetting: {
- dialogTitle: '瀵煎叆',
- dialogShow: false,
- fileSettings: {
- data: {},
- uploadUrl: getBaseUrl() + '/pc/fin/sys/tenant/import', // 涓婁紶鍦板潃
- accept: '.xls', // 鏍煎紡
- type: 'text', // 鍥炴樉褰㈠紡
- loading: false, // 瀵煎叆鏁堟灉
- },
- /* 妯℃澘涓嬭浇 */
- templateSettings: {
- templateName: '瀵煎叆妯℃澘.xls', // 鍚嶇О
- templateUrl: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/getImportTemplate', // 涓嬭浇鍦板潃
- },
- onSuccess: null,
- },
editSetting: {
title: '',
id: '',
orgId: '',
+ show: false,
+ },
+ detailSetting: {
+ title: '璇︽儏',
+ id: '',
show: false,
},
pageNum: 1,
@@ -207,13 +179,19 @@
return document.documentElement.clientHeight;
},
},
+ filters: {
+ formatTime(time) {
+ if (!time) return;
+ return DateFormatter.LongToDateTime(time);
+ },
+ },
created() {
this.fetchData();
},
methods: {
fetchData() {
this.loading = true;
- procureList({
+ scrappedList({
pageNum: this.pageNum,
pageSize: this.pageSize,
...this.filterFrom,
@@ -221,9 +199,9 @@
this.list = res.datas;
this.total = res.totalRows;
this.loading = false;
- console.log(this.list);
});
},
+
//瀵煎叆
importOrg() {
this.importSetting.dialogShow = true;
@@ -240,57 +218,46 @@
// 瀵煎嚭
handleExport() {},
// 鏂板
- addtable() {
- this.$refs.editRef.open();
- },
- // 缂栬緫
- handleEdit(row) {
- this.$refs.editRef.open(row.id);
+ handleAdd() {
+ this.editSetting.id = null;
+ this.editSetting.info = null;
+ this.editSetting.title = '鏂板';
+ this.editSetting.show = true;
},
// 璇︽儏
handleDetail(row) {
- this.$refs.detailRef.open(row.id);
- },
- // 璋冩嫧
- handleIncome(row) {
- this.$confirm(`鎮ㄧ‘瀹� 鍗曞彿锛�${row.businessFormCode} 璋冩嫧鍚�?`, '閲囪喘璋冩嫧')
- .then(function () {
- procureIncome({ id: row.id }).then((res) => {
- this.$message.success('璋冩嫧鎴愬姛锛�');
- });
- })
- .then((res) => {
- this.search();
- })
- .catch(() => {});
- },
- del(row) {
- this.$modal
- .confirm('鏄惁纭鍒犻櫎璋冩嫧鍗曞彿涓�"' + row.businessFormCode + '"鐨勬暟鎹悧锛�')
- .then(function () {
- procureDel({ id: row.id }).then((res) => {});
- })
- .then((res) => {
- this.$message.success('鍒犻櫎鎴愬姛锛�');
- this.search();
- })
- .catch(() => {});
+ this.detailSetting.id = row.id;
+ this.detailSetting.show = true;
},
// 鍒嗛〉
handleSizeChange(pageSize) {
this.pageSize = pageSize;
- this.search({ pageNum: 1 });
+ this.search(1);
},
handleCurrentChange(pageNum) {
- this.myTable.paging.page.pageNum = pageNum;
- this.search({ pageNum: pageNum });
+ this.pageNum = pageNum;
+ this.search(pageNum);
},
// 鏌ヨtable鍒楄〃
search(pageNum) {
+ if (pageNum) {
+ this.pageNum = pageNum;
+ }
this.fetchData();
+ },
+ refreshData() {
+ this.pageNum = 1;
+ this.pageSize = 10;
+ this.search();
},
fifterForm(params) {
this.filterFrom = Object.assign(this.filterFrom, params);
+ if (this.filterFrom.incomeTimeStart) {
+ this.filterFrom.incomeTimeStart = this.filterFrom.incomeTimeStart.replace(/\-/g, '');
+ }
+ if (this.filterFrom.incomeTimeEnd) {
+ this.filterFrom.incomeTimeEnd = this.filterFrom.incomeTimeEnd.replace(/\-/g, '');
+ }
this.search(1);
},
},
--
Gitblit v1.9.1