Browse Source

修复日期

dev-xx
马远东 1 year ago
parent
commit
f69adde2c8
  1. 7
      src/views/financialsector/FinanceHome.vue
  2. 9
      src/views/financialsector/Financialse/FinancialWarehousing.vue
  3. 9
      src/views/warehouse/warehousesignedorder/distributionStockArticle.vue

7
src/views/financialsector/FinanceHome.vue

@ -41,7 +41,7 @@
<span v-if="item.label == '提货'"><FinancialBill /></span> <span v-if="item.label == '提货'"><FinancialBill /></span>
<span v-if="item.label == '干线'"><FinancialTrunkLine /></span> <span v-if="item.label == '干线'"><FinancialTrunkLine /></span>
<span v-if="item.label == '仓储'" <span v-if="item.label == '仓储'"
><FinancialWarehousing :templateData="templateInfo" ><FinancialWarehousing @request-data="provideData" :templateData="templateInfo"
/></span> /></span>
<span v-if="item.label == '配送'"><FinancialDelivery /></span> <span v-if="item.label == '配送'"><FinancialDelivery /></span>
<span v-if="item.label == '安装'">安装</span> <span v-if="item.label == '安装'">安装</span>
@ -124,6 +124,11 @@ const removeTag = value => {
Tabmenu.value = ServiceList.value.find(res => res.state).label; Tabmenu.value = ServiceList.value.find(res => res.state).label;
} }
}; };
//
const provideData = () => {
console.log(`父组件的数据是:${11111}`);
};
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">

9
src/views/financialsector/Financialse/FinancialWarehousing.vue

@ -241,10 +241,14 @@
<script setup> <script setup>
import { ref } from 'vue'; import { ref } from 'vue';
import { defineProps } from 'vue'; import { defineProps , defineEmits} from 'vue';
import { getDictionaryBiz } from '@/api/system/dict'; // import { getDictionaryBiz } from '@/api/system/dict'; //
import {$_priceTemplate} from '@/api/financialsector/index'; // import {$_priceTemplate} from '@/api/financialsector/index'; //
import { defineComponent } from 'vue';
const emit = defineEmits(['request-data']);
defineComponent({
emits: ['request-data']
});
// //
const props = defineProps({ const props = defineProps({
templateData: Object, templateData: Object,
@ -437,6 +441,7 @@ onLoad()
// //
const Submit=()=>{ const Submit=()=>{
console.log(form.value,'表单'); console.log(form.value,'表单');
emit('request-data');
} }
</script> </script>

9
src/views/warehouse/warehousesignedorder/distributionStockArticle.vue

@ -293,10 +293,10 @@ const selectionChange = list => {
const searchChange = () => { const searchChange = () => {
// //
if (TopQuery.value.warehouseEntryTime) { if (TopQuery.value.warehouseEntryTime) {
queryCarn.value.startTaskTime = dayjs(TopQuery.value.warehouseEntryTime[0]).format( queryCarn.value.warehouseEntryTimestartTaskTime = dayjs(TopQuery.value.warehouseEntryTime[0]).format(
'YYYY-MM-DD HH:mm:ss' 'YYYY-MM-DD HH:mm:ss'
); // ); //
queryCarn.value.endTaskTime = dayjs(TopQuery.value.warehouseEntryTime[1]).format( queryCarn.value.warehouseEntryTimeendTaskTime = dayjs(TopQuery.value.warehouseEntryTime[1]).format(
'YYYY-MM-DD HH:mm:ss' 'YYYY-MM-DD HH:mm:ss'
); // ); //
} else { } else {
@ -305,10 +305,10 @@ const searchChange = () => {
} }
if (TopQuery.value.signinTime) { if (TopQuery.value.signinTime) {
queryCarn.value.startTaskTime = dayjs(TopQuery.value.signinTime[0]).format( queryCarn.value.signinTimestartTaskTime = dayjs(TopQuery.value.signinTime[0]).format(
'YYYY-MM-DD HH:mm:ss' 'YYYY-MM-DD HH:mm:ss'
); // ); //
queryCarn.value.endTaskTime = dayjs(TopQuery.value.signinTime[1]).format('YYYY-MM-DD HH:mm:ss'); // queryCarn.value.signinTimeendTaskTime = dayjs(TopQuery.value.signinTime[1]).format('YYYY-MM-DD HH:mm:ss'); //
} else { } else {
delete queryCarn.value.signinTimestartTaskTime; delete queryCarn.value.signinTimestartTaskTime;
delete queryCarn.value.signinTimeendTaskTime; delete queryCarn.value.signinTimeendTaskTime;
@ -340,6 +340,7 @@ const searchHide = () => {
}; };
// //
const searchReset = () => { const searchReset = () => {
queryCarn.query={}
details.query = {}; details.query = {};
details.columnList.forEach(item => { details.columnList.forEach(item => {
item.values = ''; item.values = '';

Loading…
Cancel
Save