From b4adff68a07b783fc90da1c9370d8be5f383e700 Mon Sep 17 00:00:00 2001 From: 黎星凯 <13949086503@163.com> Date: 星期三, 08 五月 2024 13:46:34 +0800 Subject: [PATCH] 20240528修改: bug41、42、43修改 领用单(分发单),调拨单,流程优化 --- admin-web/src/views/stock/transfer/transferApplication/index.vue | 700 +++++++++++++++++++++++---------------------------------- 1 files changed, 284 insertions(+), 416 deletions(-) diff --git a/admin-web/src/views/stock/transfer/transferApplication/index.vue b/admin-web/src/views/stock/transfer/transferApplication/index.vue index 77df32b..3b16249 100644 --- a/admin-web/src/views/stock/transfer/transferApplication/index.vue +++ b/admin-web/src/views/stock/transfer/transferApplication/index.vue @@ -1,457 +1,325 @@ <template> - <div class="app-container"> + <div class="app-container stock-container"> <el-container> - <el-container> - <el-card class="box-card" style="width: 100%" shadow="never"> - <!--鎼滅储鏉′欢--> - <div class="filter-container"> - <my-search ref="searchBar" :items="items" @search="fifterForm"></my-search> - </div> - <el-row style="margin-top: 15px"> - <el-col> - <!--鍒楄〃--> - <my-button name="鏂板" @click="addtable" site="form" /> - <div :style="{'overflow-y': 'auto', height:`${clientHeight - 320}px`}"> - <el-row class="card" - :gutter="5"> - <el-col v-for="(item, index) in proData" :key="index" class="cm-item"> - <el-card class="card-data"> - <div class="card-container"> - <div class="hed-one"> <span>璋冩嫧鍗曞彿锛歿{ item.order_no }}</span><span style="margin-left: 20px;"><el-button type="warning" plain size="mini">寰呮帴鏀�</el-button></span></div> - <div class="one-hed"> - <div class="box"><span class="span-two">鎺ュ彈鏈烘瀯锛�</span>{{ item.customer_name }}</div> - <div class="box"><span class="span-two">鐢宠浜猴細</span>{{ item.customer_name }}</div> - <div class="box"><span class="span-two">鐢宠璋冩嫧鏃堕棿锛�</span>{{ item.customer_name }}</div> - <div class="box"><span class="span-two">鎺ユ敹鏃堕棿锛�</span>{{ item.customer_name }}</div> - <div class="box"><span class="span-two">璋冩嫧鏃堕棿锛�</span>{{ item.customer_name }}</div> - <div class="box"><span class="span-two">鎺ュ彈浜猴細</span>{{ item.customer_name }}</div> - <div class="box"><span class="span-two">鎺ュ彈鏃堕棿锛�</span>{{ item.customer_name }}</div> - </div> - <div class="card-end"> - <div v-for="(just, index) in item.data" class="two-end"> - <div class="item"><span>{{ just.order_no }}锛�</span>{{ just.customer_name }}</div> - </div> - </div> - </div> - <div class="card-but"> - <div style="margin-top: 10px;"> - <my-button style="width: 120px;" name="鍒犻櫎" site="form" /> - <my-button style="width: 120px;" name="鏌ョ湅璇︽儏" site="form" /> - </div> - </div> - - </el-card> - </el-col> - </el-row> - </div> - <el-pagination - :small="false" - :current-page="1" - :page-sizes="[5, 10, 20, 50, 100, 200, 300, 400, 500]" - :page-size="10" - layout="total, sizes, prev, pager, next, jumper" - :total="0" - @size-change="handleSizeChange" - @current-change="handleCurrentChange" - /> - </el-col> - </el-row> - <!--娣诲姞/缂栬緫寮圭獥--> - <el-dialog title="鏂板鍑哄簱" :close-on-click-modal="false" :visible.sync="adddialog" width="60%" > - <el-form ref="ruleForm" :model="formData" class="demo-ruleForm" label-width="100px"> - <el-row :gutter="24" class="headerHeight"> - <el-col :span="12"> - <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-col> - <el-col :span="12"> - <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-col> - </el-row> - <el-row :gutter="24" class="headerHeight"> - <el-col :span="24"> - <el-form-item label="鍑哄簱鎵嬬画" prop="name"> - 浠呭厑璁稿鍏ls銆亁lsx鏍煎紡鏂囦欢 - </el-form-item> - </el-col> - </el-row> - <div style="position: relative;"> - <div style="background-color: #F9F9F9;width: 90%;"> - <el-row :gutter="24" class=""> - <el-col :span="12"> - <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-col> - <el-col :span="12"> - <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-col> - </el-row> - <el-row :gutter="24" class=""> - <el-col :span="12"> - <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-col> - </el-row> - <el-table :data="formData.tableData" height="100%" :stripe="true"> - <el-table-column prop="projectName" label="瑙勬牸鍨嬪彿" align="center"> </el-table-column> - <el-table-column prop="time1" label="鍗曚綅" align="center"> </el-table-column> - <el-table-column prop="unit" label="鐜版湁搴撳瓨" align="center"> </el-table-column> - <el-table-column prop="time2" label="鍑哄簱鏁伴噺" align="center"> </el-table-column> - </el-table> - </div> - <div style="position: absolute;right: 0;top: 152px;"> - <my-button style="display: block;margin-left: 10px;margin-bottom: 5px;" name="绉婚櫎" site="form"/> - <my-button name="鏂板鐗╁搧" site="form"/> - </div> - </div> - </el-form> - <div slot="footer" align="center" class="dialog-footer"> - <my-button name="纭畾" site="form" /> - <my-button name="鍙栨秷" site="form" @click="adddialog = false"/> + <el-card class="box-card" style="width: 100%" shadow="never"> + <!--鎼滅储鏉′欢--> + <div class="filter-container"> + <my-search ref="searchBar" :items="items" @search="fifterForm"></my-search> + </div> + <el-row style="margin-top: 15px"> + <el-col> + <!--鍒楄〃--> + <div class="table-tool-bar" style="margin-bottom: 15px"> + <my-button name="璋冩嫧鐢宠" icon="el-icon-plus" @click="handleAdd" site="tools" size="medium" /> </div> - </el-dialog> - </el-card> - </el-container> + <div :style="{ 'overflow-y': 'auto', height: 'calc(100vh - 352px)' }" v-loading="loading"> + <el-row v-if="list.length" class="card" :gutter="5"> + <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 class="value">{{ item.businessFormCode }}</span> + <div v-if="item.states == 0 && item.procureDoc !=null" class="states states-warning">寰呭嚭搴�</div> + <div v-if="item.states == 0 && item.procureDoc ==null" class="states states-warning">寰呮彁浜�</div> + <div v-if="item.states == 1" class="states states-warning">寰呮帴鏀�</div> + <div v-if="item.states == 2" class="states states-success">宸叉帴鏀�</div> + <div v-if="item.states == 4" class="states states-info">宸叉挙閿�</div> + </div> + <div class="card-header-right"> + <el-button + v-if="item.states == 1" + site="form" + type="success" + size="mini" + @click="handleIncome(item)" + >鍏ュ簱</el-button + > + + <el-button v-if="item.states == 0 && item.procureDoc ==null" site="form" type="primary" size="mini" + @click="handleExport('transferExport',`璋冩嫧鍗�-${item.businessFormCode}`, {id:item.id,type:0})" + >涓嬭浇 + </el-button + > + + <el-button + v-if="item.states == 0 && item.procureDoc ==null" + site="form" + type="primary" + size="mini" + @click="handleUploadPage(item)" + >涓婁紶</el-button + > + + <el-button + v-if="item.states == 0" + site="form" + type="danger" + size="mini" + @click="handleRevoke(item)" + >鎾ら攢</el-button + > + <el-button + v-if="item.states == 2" + site="form" + type="primary" + size="mini" + @click="handleExport('transferExport',`璋冩嫧鍏ュ簱鍗�-${item.businessFormCode}`,{id:item.id,type: 1})" + >瀵煎嚭璋冩嫧鍏ュ簱鍗�</el-button + > + <el-button name="鏌ョ湅璇︽儏" site="form" type="info" size="mini" @click="handleDetail(item)" + >鏌ョ湅璇︽儏</el-button + > + </div> + </div> + <div class="one-hed"> + <div class="box"><span class="span-two">鎺ユ敹鏈烘瀯锛�</span>{{ item.inAgencyName }}</div> + <div class="box"><span class="span-two">鐢宠浜猴細</span>{{ item.operatorName }}</div> + <div class="box"> + <span class="span-two">鐢宠璋冩嫧鏃堕棿锛�</span>{{ item.createTime | formatTime }} + </div> + <div class="box"><span class="span-two">鎺ユ敹鏃堕棿锛�</span>{{ item.inTime | formatTime }}</div> + </div> + <div class="one-hed"> + <div class="box"><span class="span-two">璋冩嫧鏈烘瀯锛�</span>{{ item.outAgencyName }}</div> + <div class="box"><span class="span-two">璋冩嫧浜猴細</span>{{ item.outOperatorName }}</div> + <div class="box"> + <span class="span-two">璋冩嫧鏃堕棿锛�</span>{{ item.outputTime | formatTime }} + </div> + </div> + <div class="card-end"> + <div v-for="(just, index) in item.fromTransferTemplateInfoList" :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.count }}</span> + <span class="unit">{{ just.unit }}</span> + </div> + </div> + </div> + </div> + </div> + </el-card> + </el-col> + </el-row> + <el-empty v-else description="鏆傛棤鏁版嵁"></el-empty> + </div> + <el-pagination + :small="false" + :current-page="pageNum" + :page-sizes="[5, 10, 20, 50, 100, 200, 300, 400, 500]" + :page-size="pageSize" + layout="total, sizes, prev, pager, next, jumper" + :total="total" + @size-change="handleSizeChange" + @current-change="handleCurrentChange" + /> + </el-col> + </el-row> + </el-card> </el-container> - <my-import - :import-setting="importSetting" - :dialog-show="importSetting.dialogShow" - :dialog-title="importSetting.dialogTitle" - /> + + <!-- 涓婁紶鍒嗗彂鍗曟枃浠�--> + <uploadPage + v-if="uploadPageSetting.show" + :setting="uploadPageSetting" + ref="uploadRef" + @close="uploadPageSetting.show = false" + @search="refreshData" + ></uploadPage> + + <!--娣诲姞/缂栬緫寮圭獥--> + <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 MyButton from "@/components/myButton/myButton"; +import {transfeIncome, transferList, transferUpdStatus} from '@/api/stock/transfer'; +import MyButton from '@/components/myButton/myButton'; +import myImport from '@/views/components/myImport'; +import edit from './edit'; +import detail from './detail'; +import listPage from '@/views/mixins/listPage'; +import transfer from '@/views/mixins/transfer'; import SettingIplatform from '@/utils/settingIplatform'; -import myImport from '@/views/components/myImport' -import {getBaseUrl} from '@/utils/base'; +import uploadPage from './uploadPage'; +import * as dataExport from "@/api/exportExcel"; +import {downLoad} from "@/utils/base"; export default { - name: "index", - components: {MyButton, myImport}, + name: 'index', + mixins: [listPage, transfer], + components: { MyButton, myImport, edit, detail,uploadPage }, data() { return { - - adddialog: false, - formData:{ - tableData:[ - { - projectName:'555' - }, - { - projectName:'444' - } - ], - }, + loading: false, + list: [], // 鎼滅储妗� items: [ { type: 'text', - dataIndex: 'name', - label: '鍑哄簱鍗曞彿', + dataIndex: 'businessFormCode', + label: '璋冩嫧鍗曞彿', placeholder: '璇疯緭鍏�', - defaultValue: '' + defaultValue: '', }, { - type: 'text', - dataIndex: 'name', + type: 'select', + dataIndex: 'goodsTemplateId', label: '鐗╁搧鍚嶇О', - placeholder: '鍙ā绯婃悳绱�', - defaultValue: '' - }, - { - type: 'text', - dataIndex: 'name', - label: '鍒涘缓浜�', placeholder: '璇疯緭鍏�', - defaultValue: '' + defaultValue: '', + options: [], + optionsConfig: { + label: 'goodsName', + value: 'id', + url: SettingIplatform.apiBaseURL + '/pc/base/goods/template/query/goodsTemplate', + }, + }, + { + type: 'select', + dataIndex: 'states', + label: '鐘舵��', + placeholder: '璇烽�夋嫨', + defaultValue: '', + options: [], }, { type: 'date-picker', - dataIndex: 'val1', - label: '鍑哄簱鏃堕棿', - defaultValue: '' + dataIndex: 'createTimeStart', + label: '鐢宠鏃堕棿', + defaultValue: '', }, { type: 'date-picker', - dataIndex: 'val2', + dataIndex: 'createTimeEnd', label: '鑷�', - defaultValue: '' + defaultValue: '', }, - // { - // type: 'select', - // dataIndex: 'status', - // label: '鐘舵��', - // placeholder: '璇烽�夋嫨', - // defaultValue: '1', - // options: [ - // { - // label: '鍚敤', - // value: '1' - // }, - // { - // label: '绂佺敤', - // value: '0' - // } - // ] - // } + { + type: 'date-picker', + dataIndex: 'startTime', + label: '鎺ユ敹鏃堕棿', + defaultValue: '', + }, + { + type: 'date-picker', + dataIndex: 'endTime', + label: '鑷�', + defaultValue: '', + }, ], - proData: [ - { - order_no:'55555', - customer_name:'閮戝窞甯傞偖鏀垮垎鍏徃', - data:[ - { - order_no:'鐭冲嫆鑺鑹茬⒊绮�', - customer_name:'20浠�' - }, - { - order_no:'鐭冲嫆鑺鑹茬⒊绮�', - customer_name:'666' - }, - ] - }, - { - order_no:'55555', - customer_name:'閮戝窞甯傞偖鏀垮垎鍏徃', - data:[ - { - order_no:'鐭冲嫆鑺鑹茬⒊绮�', - customer_name:'666' - }, - { - order_no:'鐭冲嫆鑺鑹茬⒊绮�', - customer_name:'666' - }, - { - order_no:'鐭冲嫆鑺鑹茬⒊绮�', - customer_name:'666' - }, - { - order_no:'鐭冲嫆鑺鑹茬⒊绮�', - customer_name:'666' - }, - { - order_no:'鐭冲嫆鑺鑹茬⒊绮�', - customer_name:'閮戝窞甯傞偖鏀垮垎鍏徃' - }, - ] - }, - { - order_no:'55555', - customer_name:'閮戝窞甯傞偖鏀垮垎鍏徃', - data:[ - { - order_no:'鐭冲嫆鑺鑹茬⒊绮�', - customer_name:'20浠�' - }, - { - order_no:'鐭冲嫆鑺鑹茬⒊绮�', - customer_name:'666' - }, - ] - }, - { - order_no:'55555', - customer_name:'閮戝窞甯傞偖鏀垮垎鍏徃', - data:[ - { - order_no:'鐭冲嫆鑺鑹茬⒊绮�', - customer_name:'20浠�' - }, - { - order_no:'鐭冲嫆鑺鑹茬⒊绮�', - customer_name:'666' - }, - ] - - }, - { - order_no:'55555', - customer_name:'閮戝窞甯傞偖鏀垮垎鍏徃', - data:[ - { - order_no:'鐭冲嫆鑺鑹茬⒊绮�', - customer_name:'20浠�' - }, - { - order_no:'鐭冲嫆鑺鑹茬⒊绮�', - customer_name:'666' - }, - ] - - }, - { - order_no:'55555', - customer_name:'閮戝窞甯傞偖鏀垮垎鍏徃', - data:[ - { - order_no:'鐭冲嫆鑺鑹茬⒊绮�', - customer_name:'20浠�' - }, - { - order_no:'鐭冲嫆鑺鑹茬⒊绮�', - customer_name:'666' - }, - ] - - }, - { - order_no:'55555', - customer_name:'閮戝窞甯傞偖鏀垮垎鍏徃', - data:[ - { - order_no:'鐭冲嫆鑺鑹茬⒊绮�', - customer_name:'20浠�' - }, - { - order_no:'鐭冲嫆鑺鑹茬⒊绮�', - customer_name:'666' - }, - ] - - } - ], - // 鏍戞暟鎹� - treeDataList: [], - // 鎼滅储鏉′欢 - filterFrom: { - tenantId: null, - userName: null, - userPhone: null, - status: 1 - }, - // 瀵煎叆 - 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, - }, - } - }, - computed: { - clientHeight () { - return document.documentElement.clientHeight - }, + filterFrom: {}, + }; }, created() { + this.filterFrom = { + inAgencyId: this.userInfo.tenantId, + }; + this.fetchData(); + this.items.map((v) => { + if (v.label == '鐘舵��') { + v.options = this.statesOptions; + } + return v; + }); }, methods: { - handleSizeChange(){}, - handleCurrentChange(){}, - //瀵煎叆 - importOrg() { - this.importSetting.dialogShow = true - this.importSetting.onSuccess = (response, callBack) => { - if (response.code===1){ - this.$message.success(response.msg) - this.search(1) - }else{ - this.$message.warning(response.msg) - } - callBack() - } + fetchData() { + this.loading = true; + transferList({ + pageNum: this.pageNum, + pageSize: this.pageSize, + ...this.filterFrom, + }).then((res) => { + this.list = res.datas; + this.total = res.totalRows; + this.loading = false; + }); }, - - addtable() { - this.adddialog = true + + // 鍏ュ簱 + handleIncome(row) { + this.$confirm(`鎮ㄧ‘瀹� 鍗曞彿锛�${row.businessFormCode} 鎺ユ敹鍏ュ簱鍚�?`, '鎺ユ敹鍏ュ簱', { + beforeClose: (action, instance, done) => { + if (action == 'confirm') { + instance.confirmButtonLoading = true; + instance.confirmButtonText = '鎵ц涓�...'; + transfeIncome({ id: row.id }) + .then((res) => { + this.$message.success('鎺ユ敹鍏ュ簱鎴愬姛锛�'); + done(); + instance.confirmButtonLoading = false; + this.search(1); + }) + .catch(() => { + done(); + }); + } else { + done(); + } + }, + }); }, - // 鏌ヨtable鍒楄〃 - search(pageNum) { - if (pageNum != undefined) { - // this.$refs.myTable.search(pageNum) - } else { - // this.$refs.myTable.search() - } + + // 鎾ら攢 + handleRevoke(row) { + this.$confirm(`鎮ㄧ‘瀹氭挙閿�鍗曞彿涓�"${row.businessFormCode}" 鐨勬暟鎹悧?`, '鎾ら攢').then(() => { + transferUpdStatus({ id: row.id }).then((res) => { + this.$message.success('鎾ら攢鎴愬姛锛�'); + this.search(1); + }); + }); }, - fifterForm(params) { - console.log(params,'555'); - this.filterFrom = Object.assign(this.filterFrom, params) - this.search(1) - } - } -} + // 瀵煎叆 + handleUploadPage(row) { + this.uploadPageSetting.id = row.id; + this.uploadPageSetting.title = '瀵煎叆'; + this.uploadPageSetting.show = true; + }, + /** + * 瀵煎嚭璋冩嫧鍏ュ簱鍗� + * @param api + * @param fileName + * @param params + */ + handleExport(api, fileName, params) { + let loading = this.$loading({ + lock: true, + text: '瀵煎嚭涓紝璇风◢鍊�...', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)', + }); + // 鍒ゆ柇鎬绘潯鏁版槸鍚﹀ぇ浜庢渶澶ф敮鎸佹潯鏁� + dataExport[api](params) + .then((res) => { + console.log(res) + downLoad(res) + this.$message.success('瀵煎嚭鎴愬姛锛�'); + loading.close(); + }) + .catch(() => { + loading.close(); + }); + }, + }, +}; </script> -<style scoped> -.card { - display: flex; - flex-wrap: wrap; - margin: 0px !important; - .cm-item { - width: 100%; - } - .cm-item /deep/ .el-card__body { - padding: 10px; - } -} -.card-data{ - position: relative; - margin-top: 8px; - .card-container{ - display: inline-block; - width: 70%; - .hed-one{ - color: #2298EE; - font-size: 18px; - } - .one-hed{ - margin-top: 5px; - .box{ - display: inline-block; - margin-right: 20px; - margin-top: 10px; - } - } - .span-two{ - color: #83919e; - font-size: 14px; - } - .card-end{ - font-size: 14px; - color: #3d3d3d; - margin-top: 15px; - display: flex; - flex-wrap: wrap; - .two-end{ - width: calc(33.33% - 20px); - margin-bottom: 15px; - } - } - - } - .card-but{ - position: absolute; - right: 20px; - top: 40%; - } - -} - +<style scoped lang="scss"> +@import url(../../index.scss); </style> -- Gitblit v1.9.1