From aef2a705884dbb25b24d23fc886c563327f4753e Mon Sep 17 00:00:00 2001 From: 石广澎 <shiguangpeng@163.com> Date: 星期一, 27 十一月 2023 17:34:07 +0800 Subject: [PATCH] feat: --- admin-web/src/views/stock/transfer/transferdetails/index.vue | 17 +++-- admin-web/src/components/upload/index.vue | 2 admin-web/src/views/stock/inventorycount/inventorytask/index.vue | 15 ++-- admin-web/src/views/stock/procure/receiptDetails/index.vue | 12 ++-- admin-web/src/views/stock/scrap/itemScrapping/index.vue | 7 +- admin-web/src/views/stock/scrap/scrapDetails/index.vue | 15 ++-- admin-web/src/components/mySearch/SearchItem.vue | 12 +-- admin-web/src/views/stock/inventorycount/exceptionDetails/index.vue | 51 ++++++++-------- admin-web/src/views/stock/scrap/itemScrapping/detail.vue | 30 ++------- admin-web/src/views/stock/scrap/itemScrapping/edit.vue | 11 +-- admin-web/src/views/stock/inventorycount/inventorytask/detail.vue | 6 + 11 files changed, 81 insertions(+), 97 deletions(-) diff --git a/admin-web/src/components/mySearch/SearchItem.vue b/admin-web/src/components/mySearch/SearchItem.vue index 7e2bdf4..fa2580b 100644 --- a/admin-web/src/components/mySearch/SearchItem.vue +++ b/admin-web/src/components/mySearch/SearchItem.vue @@ -67,6 +67,7 @@ type="year" :clearable="true" style="width: 150px" + :value-format="item.format?item.format:'yyyy'" @change="(v) => panelChange(v, 'yyyy')" /> <!--鏈堥�夋嫨鍣�--> @@ -76,6 +77,7 @@ type="month" :clearable="true" style="width: 150px" + :value-format="item.format?item.format:'yyyyMM'" @change="(v) => panelChange(v, 'yyyy-MM')" /> <!--鏃ラ�夋嫨鍣�--> @@ -85,6 +87,7 @@ type="date" :clearable="true" style="width: 150px" + :value-format="item.format?item.format:'yyyyMMdd'" @change="(v) => panelChange(v, 'yyyy-MM-dd')" /> <!--鏃ユ湡甯︽椂闂撮�夋嫨鍣�--> @@ -243,14 +246,7 @@ } }, panelChange(v, type) { - var info = null - if (v && this.item.type !== 'date-time-picker') { - info = formatDates(v, type) - } else { - info = v - } - this.val = info - this.$emit('change', info) + this.$emit('change', v) }, filterOption(input, option) { return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0; diff --git a/admin-web/src/components/upload/index.vue b/admin-web/src/components/upload/index.vue index f54212b..cc70d3a 100644 --- a/admin-web/src/components/upload/index.vue +++ b/admin-web/src/components/upload/index.vue @@ -85,7 +85,7 @@ title: '闄勪欢涓婁紶', max: 100, // 鏈�澶уぇ灏忥紝鍗曚綅M num: 10, // 鏀寔涓婁紶鍥剧墖涓暟 - accept: '.jpg,.jpeg,.png,.bmp,.pdf,.doc,.docx,.xls,.xlsx,.apk,.zip', // 闄愬埗鏍煎紡 + accept: '.jpg,.jpeg,.png,.pdf,.doc,.docx,.xls,.xlsx', // 闄愬埗鏍煎紡 tip: '', // 鎻愮ず 榛樿锛歚鍙兘涓婁紶${this.defaultSettings.num}涓�${this.defaultSettings.accept}鏂囦欢锛屼笖涓嶈秴杩�${this.defaultSettings.max}kb` uploadUrl: '', // 涓婁紶璺緞 multiple: true, // 鏄惁鏀寔鎵归噺涓婁紶 diff --git a/admin-web/src/views/stock/inventorycount/exceptionDetails/index.vue b/admin-web/src/views/stock/inventorycount/exceptionDetails/index.vue index 3c1b726..2ba53aa 100644 --- a/admin-web/src/views/stock/inventorycount/exceptionDetails/index.vue +++ b/admin-web/src/views/stock/inventorycount/exceptionDetails/index.vue @@ -10,7 +10,7 @@ <el-row style="margin-top: 15px"> <el-col> <!--鍒楄〃--> - <my-table-v2 ref="myTable" :filter="filterFrom" :table="table" /> + <my-table-v2 ref="myTable" :filter="filterFrom" :table="table"/> </el-col> </el-row> </el-card> @@ -23,16 +23,12 @@ 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 { mapGetters } from 'vuex'; -import { selectTenantWarehouse, goodsModel } from '@/api/baseSetting/finsystenant'; -import { getDicts } from '@/api/system/dict/data'; +import {mapGetters} from 'vuex'; import * as DateFormatter from '@/utils/DateFormatter'; export default { name: 'index', - components: { MyButton, MyTableV2 }, + components: {MyButton, MyTableV2}, data() { return { // 鎼滅储妗� @@ -42,7 +38,7 @@ dataIndex: 'agencyId', label: '鏈烘瀯', placeholder: '璇烽�夋嫨', - optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null }, + optionsConfig: {url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null}, defaultValue: '', options: [], }, @@ -66,7 +62,7 @@ placeholder: '璇疯緭鍏�', defaultValue: '', options: [], - cascader: [{ key: 'baseGoodsModelsId', queryKey: 'goodsTemplatesId' }], + cascader: [{key: 'baseGoodsModelsId', queryKey: 'goodsTemplatesId'}], optionsConfig: { label: 'goodsName', value: 'id', @@ -158,8 +154,7 @@ // 鏍戞暟鎹� treeDataList: [], // 鎼滅储鏉′欢 - filterFrom: { - }, + filterFrom: {}, // 琛ㄦ牸鏁版嵁 table: { showIndex: true, // 鏄惁鏄剧ず搴忓彿 @@ -180,30 +175,35 @@ }, // 鍒椾俊鎭� columns: [ - { title: '浠撳簱', field: 'warehouseName', align: 'left' }, - { title: '鐗╁搧鍚嶇О', field: 'goodsTemplateName', align: 'center' }, - { title: '瑙勬牸鍨嬪彿', field: 'baseGoodsModelsName', align: 'center' }, - { title: '绫诲瀷', field: 'inventoryResultType', align: 'center' }, - { title: '搴撳瓨鏁伴噺', field: 'initCounts', align: 'left' }, - { title: '鐩樼偣鏁伴噺', field: 'inventoryCounts', align: 'left' }, - { title: '寮傚父鏁伴噺', field: 'errorCounts', align: 'left' }, + {title: '浠撳簱', field: 'warehouseName', align: 'left', width: 140}, + {title: '鐗╁搧鍚嶇О', field: 'goodsTemplateName', align: 'left', minWidth: 130}, + {title: '瑙勬牸鍨嬪彿', field: 'baseGoodsModelsName', align: 'left', width: 120}, + {title: '绫诲瀷', field: 'inventoryResultType', align: 'center'}, + {title: '搴撳瓨鏁伴噺', field: 'initCounts', align: 'left'}, + {title: '鐩樼偣鏁伴噺', field: 'inventoryCounts', align: 'left'}, + {title: '寮傚父鏁伴噺', field: 'errorCounts', align: 'left'}, { title: '鍑哄叆搴撶被鍨�', field: 'inventoryType', - align: 'left', + align: 'center', + width: 100, formatter: (row) => { - return { value: row.inventoryType, type: row.inventoryType && row.inventoryType.includes('鐩樼泩') ? 'success' : 'danger' }; + return { + value: row.inventoryType, + type: row.inventoryType && row.inventoryType.includes('鐩樼泩') ? 'success' : 'danger' + }; }, }, - { title: '鍑哄叆搴撳崟鍙�', field: 'warehouseFormCode', align: 'left' }, - { title: '鏈烘瀯', field: 'agencyName', align: 'left' }, - { title: '鎿嶄綔浜�', field: 'operatorName', align: 'left' }, + {title: '鍑哄叆搴撳崟鍙�', field: 'warehouseFormCode', align: 'center', width: 130}, + {title: '鏈烘瀯', field: 'agencyName', align: 'left', width: 130}, + {title: '鎿嶄綔浜�', field: 'operatorName', align: 'center', width: 90}, { title: '鎿嶄綔鏃堕棿', field: 'operatorTime', align: 'center', + width: 160, formatter: (row) => { - return { value: row.operatorTime ? DateFormatter.LongToDateTime(row.operatorTime) : '-' }; + return {value: row.operatorTime ? DateFormatter.LongToDateTime(row.operatorTime) : '-'}; }, }, ], @@ -230,7 +230,8 @@ computed: { ...mapGetters(['userInfo']), }, - created() {}, + created() { + }, methods: { showAudit(row) { this.editSetting.id = row.id; diff --git a/admin-web/src/views/stock/inventorycount/inventorytask/detail.vue b/admin-web/src/views/stock/inventorycount/inventorytask/detail.vue index 34f314d..589680a 100644 --- a/admin-web/src/views/stock/inventorycount/inventorytask/detail.vue +++ b/admin-web/src/views/stock/inventorycount/inventorytask/detail.vue @@ -10,7 +10,11 @@ <el-table-column prop="baseGoodsModelsName" label="鍨嬪彿" align="center"> </el-table-column> <el-table-column prop="inventoryCount" label="搴旂洏鏁伴噺" align="center"></el-table-column> <el-table-column prop="realNum" label="瀹炵洏鏁伴噺" align="center"></el-table-column> - <el-table-column prop="states" label="鐘舵��" align="center"></el-table-column> + <el-table-column prop="states" label="鐘舵��" align="center"> + <template slot-scope="{row}"> + {{row.inventoryResultType}} + </template> + </el-table-column> </el-table> </win-md> </template> diff --git a/admin-web/src/views/stock/inventorycount/inventorytask/index.vue b/admin-web/src/views/stock/inventorycount/inventorytask/index.vue index 4e02bcb..28cfe68 100644 --- a/admin-web/src/views/stock/inventorycount/inventorytask/index.vue +++ b/admin-web/src/views/stock/inventorycount/inventorytask/index.vue @@ -162,11 +162,11 @@ }, // 鍒椾俊鎭� columns: [ - { title: '鐩樼偣鍗曞彿', field: 'businessFormCode', align: 'left' }, - { title: '浠诲姟鍚嶇О', field: 'businessFormName', align: 'left' }, - { title: '鐩樼偣浠撳簱', field: 'warehouseName', align: 'left' }, - { title: '鐩樼偣浜�', field: 'operatorName', align: 'left' }, - { title: '鐩戠洏浜�', field: 'operatorName2', align: 'left' }, + { title: '鐩樼偣鍗曞彿', field: 'businessFormCode', align: 'center', width: 130 }, + { title: '浠诲姟鍚嶇О', field: 'businessFormName', align: 'left', minWidth: 140 }, + { title: '鐩樼偣浠撳簱', field: 'warehouseName', align: 'left', minWidth: 130 }, + { title: '鐩樼偣浜�', field: 'operatorName', align: 'center', width: 120 }, + { title: '鐩戠洏浜�', field: 'operatorName2', align: 'center', width: 120 }, { title: '鐩樼偣鏃堕棿', field: 'inventoryDate', @@ -188,7 +188,8 @@ { title: '鐘舵��', field: 'states', - align: 'left', + align: 'center', + width: 90, type: 'primary', formatter: (row) => { return { @@ -263,7 +264,7 @@ }, }, { - title: '鐢熶骇鐩樼偣琛�', + title: '鐢熸垚鐩樼偣琛�', type: 'primary', hidden: (row) => { if (row.states != 2) { diff --git a/admin-web/src/views/stock/procure/receiptDetails/index.vue b/admin-web/src/views/stock/procure/receiptDetails/index.vue index 67a4754..9e884bd 100644 --- a/admin-web/src/views/stock/procure/receiptDetails/index.vue +++ b/admin-web/src/views/stock/procure/receiptDetails/index.vue @@ -159,9 +159,9 @@ }, // 鍒椾俊鎭� columns: [ - { title: '鍗曞彿', field: 'businessFormCode', align: 'center' }, - { title: '鐗╁搧鍚嶇О', field: 'goodsTemplateName', align: 'center' }, - { title: '瑙勬牸鍨嬪彿', field: 'baseGoodsModelsName', align: 'center' }, + { title: '鍗曞彿', field: 'businessFormCode', align: 'center', width: 130 }, + { title: '鐗╁搧鍚嶇О', field: 'goodsTemplateName', align: 'left', width: 140 }, + { title: '瑙勬牸鍨嬪彿', field: 'baseGoodsModelsName', align: 'left', width: 130 }, { title: '鍗曚环', field: 'price', @@ -179,8 +179,8 @@ return { value: row.price / 100 }; }, }, - { title: '鎵�灞炴満鏋�', field: 'agencyName', align: 'center' }, - { title: '鍒涘缓浜�', field: 'buyerName', align: 'center' }, + { title: '鎵�灞炴満鏋�', field: 'agencyName', align: 'center', width: 130 }, + { title: '鍒涘缓浜�', field: 'buyerName', align: 'center', width: 90 }, { title: '鎿嶄綔鏃堕棿', field: 'procureTime', @@ -194,7 +194,7 @@ // 鎿嶄綔淇℃伅 operation: { show: true, // 鏄剧ず鎿嶄綔鍒� - width: '150', // 鍒楀 + width: 100, // 鍒楀 attr: [ { title: '璇︽儏', diff --git a/admin-web/src/views/stock/scrap/itemScrapping/detail.vue b/admin-web/src/views/stock/scrap/itemScrapping/detail.vue index ab9f27f..938b3ad 100644 --- a/admin-web/src/views/stock/scrap/itemScrapping/detail.vue +++ b/admin-web/src/views/stock/scrap/itemScrapping/detail.vue @@ -36,34 +36,18 @@ <el-row :gutter="20"> <el-col :span="8"> <span>鐗╁搧鍒嗙被锛�</span> - <span>{{ goodsItem.baseCategoryName }}</span> + <span>{{ goodsItem.categoryName }}</span> </el-col> <el-col :span="8"> <span>鐗╁搧鍚嶇О锛�</span> - <span>{{ goodsItem.goodsTemplateName }}</span> + <span>{{ goodsItem.goodsName }}</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="scrappedCode" label="鎶ュ簾鍘熷洜" align="center"> - <template slot-scope="scope"> - {{ getDictName(scope.row.scrappedCode) }} - </template> - </el-table-column> + <el-table-column prop="baseGoodsModelsName" label="瑙勬牸鍨嬪彿" align="center"></el-table-column> + <el-table-column label="鍗曚綅" prop="unit" align="center"></el-table-column> + <el-table-column prop="counts" label="鎶ュ簾鏁伴噺" align="center"></el-table-column> + <el-table-column prop="scrappedName" label="鎶ュ簾鍘熷洜" align="center"></el-table-column> </el-table> </div> <div id="uploadPreviewImages" style="display: none"> @@ -113,7 +97,7 @@ states: '', createName: '', time: '', - scrappedGoodsInfo: [], + scrappedGoods: [], }, }; }, diff --git a/admin-web/src/views/stock/scrap/itemScrapping/edit.vue b/admin-web/src/views/stock/scrap/itemScrapping/edit.vue index a4846ec..ea65c12 100644 --- a/admin-web/src/views/stock/scrap/itemScrapping/edit.vue +++ b/admin-web/src/views/stock/scrap/itemScrapping/edit.vue @@ -139,9 +139,9 @@ <el-select v-model="scope.row.scrappedCode" placeholder="璇烽�夋嫨"> <el-option v-for="item in scrapReasonOptions" - :key="item.dict_value" + :key="item.dict_code" :label="item.dict_label" - :value="item.dict_value" + :value="item.dict_code" /> </el-select> </template> @@ -241,7 +241,6 @@ warehouseId: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }], dealTime: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }], buyType: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }], - uploadFiles: [{ required: true, message: '璇蜂笂浼�', trigger: 'change' }], baseCategoryIds: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }], baseGoodsTemplateId: [{ validator: checkGoodsTemplateId, trigger: ['blur', 'change'] }], @@ -252,7 +251,6 @@ title: '涓婁紶', max: 20, // 鏈�澶уぇ灏忥紝鍗曚綅M num: 10, // 鏀寔涓婁紶鍥剧墖涓暟 - accept: '.jpg,.png', // 闄愬埗鏍煎紡 tip: '', // 鎻愮ず 榛樿锛歚鍙兘涓婁紶${this.defaultSettings.num}涓�${this.defaultSettings.accept}鏂囦欢锛屼笖涓嶈秴杩�${this.defaultSettings.max}kb` uploadUrl: getUploadUrl(), // 涓婁紶璺緞 multiple: true, // 鏄惁鏀寔鎵归噺涓婁紶 @@ -272,7 +270,7 @@ this.getWarehouseList(); this.getgoodsTemplate(); this.getgoodsModel(); - this.getCategoryTree(); + await this.getCategoryTree(); this.formData.scrappedGoodsInfo.push(JSON.parse(JSON.stringify(this.goodsItem))); this.formData.operatorId = this.userInfo.id; this.formData.operatorName = this.userInfo.userName; @@ -291,7 +289,7 @@ // 鑾峰彇鎶ュ簾浠撳簱鍒楄〃 getWarehouseList() { - selectTenantWarehouse() + selectTenantWarehouse({ agencyId: this.userInfo.tenantId }) .then((res) => { this.warehouses = res; if (this.warehouses.length && !this.formData.warehouseId) { @@ -427,7 +425,6 @@ handleSubmit() { this.$refs['ruleForm'].validate((valid) => { if (valid) { - console.log('this.formData', this.formData); scrappedAdd(this.formData) .then((res) => { this.$message.success('淇濆瓨鎴愬姛锛�'); diff --git a/admin-web/src/views/stock/scrap/itemScrapping/index.vue b/admin-web/src/views/stock/scrap/itemScrapping/index.vue index 4f2565c..9514920 100644 --- a/admin-web/src/views/stock/scrap/itemScrapping/index.vue +++ b/admin-web/src/views/stock/scrap/itemScrapping/index.vue @@ -21,7 +21,7 @@ <div class="card-header-left"> <span>鎶ュ簾鍗曞彿锛�</span> <span class="value">{{ item.businessFormCode }}</span> - + </div> <div class="card-header-right"> <el-button site="form" type="success" size="mini" @click="handleExport(item)" @@ -138,13 +138,13 @@ }, { type: 'date-picker', - dataIndex: 'incomeTimeStart', + dataIndex: 'startTime', label: '鎶ュ簾鏃堕棿', defaultValue: '', }, { type: 'date-picker', - dataIndex: 'incomeTimeEnd', + dataIndex: 'endTime', label: '鑷�', defaultValue: '', }, @@ -199,7 +199,6 @@ this.list = res.datas; this.total = res.totalRows; this.loading = false; - console.log(this.list); }); }, diff --git a/admin-web/src/views/stock/scrap/scrapDetails/index.vue b/admin-web/src/views/stock/scrap/scrapDetails/index.vue index d694dca..9c8d919 100644 --- a/admin-web/src/views/stock/scrap/scrapDetails/index.vue +++ b/admin-web/src/views/stock/scrap/scrapDetails/index.vue @@ -164,16 +164,17 @@ }, // 鍒椾俊鎭� columns: [ - { title: '鍗曞彿', field: 'businessFormCode', align: 'left' }, - { title: '鐗╁搧鍚嶇О', field: 'goodsTemplateName', align: 'center' }, - { title: '瑙勬牸鍨嬪彿', field: 'baseGoodsModelsName', align: 'center' }, - { title: '鎶ュ簾鏁伴噺', field: 'lv', align: 'center' }, - { title: '鎵�灞炴満鏋�', field: 'agencyName', align: 'left' }, + { title: '鍗曞彿', field: 'businessFormCode', align: 'center', width: 130 }, + { title: '鐗╁搧鍚嶇О', field: 'goodsTemplateName', align: 'left', minWidth: 130 }, + { title: '瑙勬牸鍨嬪彿', field: 'baseGoodsModelsName', align: 'left', width: 130 }, + { title: '鎶ュ簾鏁伴噺', field: 'counts', align: 'center' }, + { title: '鎵�灞炴満鏋�', field: 'agencyName', align: 'left', width: 130 }, { title: '鍒涘缓浜�', field: 'operatorName', align: 'left' }, { title: '鎿嶄綔鏃堕棿', field: 'dealTime', - align: 'left', + align: 'center', + width: 160, formatter: (row) => { return { value: DateFormatter.LongToDateTime(row.dealTime) }; }, @@ -182,7 +183,7 @@ // 鎿嶄綔淇℃伅 operation: { show: true, // 鏄剧ず鎿嶄綔鍒� - width: '150', // 鍒楀 + width: 100, // 鍒楀 attr: [ { title: '璇︽儏', diff --git a/admin-web/src/views/stock/transfer/transferdetails/index.vue b/admin-web/src/views/stock/transfer/transferdetails/index.vue index 0817f63..b630062 100644 --- a/admin-web/src/views/stock/transfer/transferdetails/index.vue +++ b/admin-web/src/views/stock/transfer/transferdetails/index.vue @@ -160,12 +160,12 @@ }, // 鍒椾俊鎭� columns: [ - { title: '鍗曞彿', field: 'businessFormCode', align: 'center' }, - { title: '鐗╁搧鍚嶇О', field: 'goodsName', align: 'center' }, - { title: '瑙勬牸鍨嬪彿', field: 'baseGoodsModelsName', align: 'center' }, - { title: '鏁伴噺', field: 'counts', align: 'left' }, - { title: '鎺ュ彈鏈烘瀯', field: 'inAgencyName', align: 'left' }, - { title: '鍒涘缓浜�', field: 'operatorName', align: 'left' }, + { title: '鍗曞彿', field: 'businessFormCode', align: 'center', width: 130 }, + { title: '鐗╁搧鍚嶇О', field: 'goodsName', align: 'left', width: 140 }, + { title: '瑙勬牸鍨嬪彿', field: 'baseGoodsModelsName', align: 'left', width: 130 }, + { title: '鏁伴噺', field: 'counts', align: 'center' }, + { title: '鎺ュ彈鏈烘瀯', field: 'inAgencyName', align: 'left', width: 130 }, + { title: '鍒涘缓浜�', field: 'operatorName', align: 'center', width: 90 }, { title: '鐢宠鏃堕棿', field: 'createTime', @@ -184,11 +184,12 @@ return { value: row.inTime ? DateFormatter.LongToDateTime(row.inTime) : '-' }; }, }, - { title: '璋冩嫧鏈烘瀯', field: 'outAgencyName', align: 'left' }, + { title: '璋冩嫧鏈烘瀯', field: 'outAgencyName', align: 'left', width: 130 }, { title: '璋冩嫧浜�', field: 'outOperatorName', align: 'center', + width: 90, formatter: (row) => { return { value: row.outOperatorName || '-' }; }, @@ -206,7 +207,7 @@ // 鎿嶄綔淇℃伅 operation: { show: true, // 鏄剧ず鎿嶄綔鍒� - width: '150', // 鍒楀 + width: 100, // 鍒楀 attr: [ { title: '璇︽儏', -- Gitblit v1.9.1