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 | 94 ++++++++++------------------------------------
1 files changed, 21 insertions(+), 73 deletions(-)
diff --git a/admin-web/src/views/stock/scrap/itemScrapping/index.vue b/admin-web/src/views/stock/scrap/itemScrapping/index.vue
index 5263192..97373c7 100644
--- a/admin-web/src/views/stock/scrap/itemScrapping/index.vue
+++ b/admin-web/src/views/stock/scrap/itemScrapping/index.vue
@@ -12,7 +12,7 @@
<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: `${clientHeight - 320}px` }">
+ <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">
@@ -21,9 +21,7 @@
<div class="card-header-left">
<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)"
@@ -35,15 +33,15 @@
</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.agencyName }}</div>
+ <div class="box"><span class="span-two">鎿嶄綔浜猴細</span>{{ item.operatorName }}</div>
<div class="box">
- <span class="span-two">鎶ュ簾鏃堕棿锛�</span>{{ item.procureTime | formatTime }}
+ <span class="span-two">鎶ュ簾鏃堕棿锛�</span>{{ item.dealTime | formatTime }}
</div>
</div>
<div class="card-end">
- <div v-for="(just, index) in item.fromProcureTemplateInfoList" :key="index" class="item">
- <div class="name">{{ just.goodsTemplateName }}</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>
@@ -86,20 +84,14 @@
@close="detailSetting.show = false"
ref="detailRef"
></detail>
- <my-import
- :import-setting="importSetting"
- :dialog-show="importSetting.dialogShow"
- :dialog-title="importSetting.dialogTitle"
- />
</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';
@@ -107,7 +99,7 @@
export default {
name: 'index',
- components: { MyButton, myImport, edit, detail },
+ components: { MyButton, edit, detail },
data() {
return {
loading: false,
@@ -123,11 +115,17 @@
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: 'cascader',
@@ -140,13 +138,13 @@
},
{
type: 'date-picker',
- dataIndex: 'incomeTimeStart',
+ dataIndex: 'startTime',
label: '鎶ュ簾鏃堕棿',
defaultValue: '',
},
{
type: 'date-picker',
- dataIndex: 'incomeTimeEnd',
+ dataIndex: 'endTime',
label: '鑷�',
defaultValue: '',
},
@@ -159,24 +157,6 @@
userName: null,
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: '',
@@ -211,7 +191,7 @@
methods: {
fetchData() {
this.loading = true;
- procureList({
+ scrappedList({
pageNum: this.pageNum,
pageSize: this.pageSize,
...this.filterFrom,
@@ -219,7 +199,6 @@
this.list = res.datas;
this.total = res.totalRows;
this.loading = false;
- console.log(this.list);
});
},
@@ -245,38 +224,10 @@
this.editSetting.title = '鏂板';
this.editSetting.show = true;
},
- // 缂栬緫
- handleEdit(row) {
- this.editSetting.id = row.id;
- this.editSetting.info = null;
- this.editSetting.title = '缂栬緫';
- this.editSetting.show = true;
- },
// 璇︽儏
handleDetail(row) {
this.detailSetting.id = row.id;
this.detailSetting.show = true;
- },
- // 鎶ュ簾
- handleIncome(row) {
- this.$confirm(`鎮ㄧ‘瀹� 鍗曞彿锛�${row.businessFormCode} 鎶ュ簾鍚�?`, '鎶ュ簾鎶ュ簾').then(() => {
- procureIncome({ id: row.id })
- .then((res) => {
- this.$message.success('鎶ュ簾鎴愬姛锛�');
- this.search();
- })
- .catch(() => {});
- });
- },
- del(row) {
- this.$modal.confirm('鏄惁纭鍒犻櫎鎶ュ簾鍗曞彿涓�"' + row.businessFormCode + '"鐨勬暟鎹悧锛�').then(() => {
- procureDel({ id: row.id })
- .then((res) => {
- this.$message.success('鍒犻櫎鎴愬姛锛�');
- this.search();
- })
- .catch(() => {});
- });
},
// 鍒嗛〉
handleSizeChange(pageSize) {
@@ -306,9 +257,6 @@
}
if (this.filterFrom.incomeTimeEnd) {
this.filterFrom.incomeTimeEnd = this.filterFrom.incomeTimeEnd.replace(/\-/g, '');
- }
- if (this.filterFrom.agencyId.length) {
- this.filterFrom.agencyId = this.filterFrom.agencyId[this.filterFrom.agencyId.length - 1];
}
this.search(1);
},
--
Gitblit v1.9.1