diff --git a/src/components/daterange-picker/index.vue b/src/components/daterange-picker/index.vue
index 5ad8f04..402bf69 100644
--- a/src/components/daterange-picker/index.vue
+++ b/src/components/daterange-picker/index.vue
@@ -1,13 +1,6 @@
<template>
- <el-date-picker
- v-model="content"
- type="datetimerange"
- range-separator="-"
- start-placeholder="开始时间"
- end-placeholder="结束时间"
- value-format="YYYY-MM-DD HH:mm:ss"
- clearable
- ></el-date-picker>
+ <el-date-picker v-model="content" type="datetimerange" range-separator="-" start-placeholder="开始时间"
+ end-placeholder="结束时间" value-format="YYYY-MM-DD " clearable></el-date-picker>
</template>
<script lang="ts" setup>
diff --git a/src/components/paylist/index.vue b/src/components/paylist/index.vue
index 080f657..3f82f14 100644
--- a/src/components/paylist/index.vue
+++ b/src/components/paylist/index.vue
@@ -41,7 +41,7 @@
</el-table>
</div>
- <div class="flex mt-4 justify-end">
+ <div class="flex justify-end mt-4">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
@@ -53,12 +53,16 @@ import { usePaging } from "@/hooks/usePaging"
import { useDictData } from "@/hooks/useDictOptions"
import { paymentplanLists } from '@/api/paymentplan'
-import { defineEmits } from "vue"
+import { defineEmits, defineProps } from "vue"
import { timeFormat } from '@/utils/util'
+const props = defineProps({
+ contract_id: Number
+})
// 查询条件
const queryParams = reactive({
status: 1,
+ contract_id: props.contract_id
});
// 获取字典数据
diff --git a/src/components/procurementsubcontracting_selector/subcontracting.vue b/src/components/procurementsubcontracting_selector/subcontracting.vue
new file mode 100644
index 0000000..7ed4a63
--- /dev/null
+++ b/src/components/procurementsubcontracting_selector/subcontracting.vue
@@ -0,0 +1,79 @@
+<template>
+ <div>
+ <el-card class="!border-none" shadow="never">
+ <el-form class="mb-[-16px]" :model="queryParams" inline>
+ <el-form-item label="查询" prop="name">
+ <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入内容" />
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" @click="resetPage">查询</el-button>
+ <el-button @click="resetParams">重置</el-button>
+ </el-form-item>
+ </el-form>
+ </el-card>
+
+ <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+ <div class="mt-4">
+ <el-table :data="pager.lists" @cell-click="handleCurrentChange">
+ <el-table-column type="selection" width="55" />
+ <el-table-column label="序号" type="index" width="55" />
+ <el-table-column label="供应商名称" prop="supplier_name" show-overflow-tooltip />
+ <el-table-column label="供应商编码" prop="department_id" show-overflow-tooltip />
+ <el-table-column label="供应商合同号 " prop="department_id" show-overflow-tooltip />
+ <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
+ <el-table-column label="合同编号" prop="contract_no" show-overflow-tooltip />
+ <el-table-column label="合同名称" prop="contract_name" show-overflow-tooltip />
+ <el-table-column label="合同类型" prop="contract_type">
+ <template #default="{ row }">
+ <dict-value :options="dictData.procurement_contract_type" :value="row.contract_type" />
+ </template>
+ </el-table-column>
+ <el-table-column label="合同金额" prop="signing_date" show-overflow-tooltip />
+ <el-table-column label="实际合同金额" prop="pay_type" show-overflow-tooltip />
+ <el-table-column label="合同金额" prop="amount" show-overflow-tooltip />
+ <el-table-column label="已付款金额" prop="amount_daxie" show-overflow-tooltip />
+ <el-table-column label="未付款金额" prop="amount_excluding_tax" show-overflow-tooltip />
+ <el-table-column label="已开票金额" prop="retention_money" show-overflow-tooltip />
+ <el-table-column label="未开票金额" prop="retention_money_rate" show-overflow-tooltip />
+ </el-table>
+
+ </div>
+ <div class="flex justify-end mt-4">
+ <pagination v-model="pager" @change="getLists" />
+ </div>
+ </el-card>
+ </div>
+</template>
+
+<script lang="ts" setup>
+import { usePaging } from "@/hooks/usePaging"
+import { useDictData } from "@/hooks/useDictOptions"
+import { apiSubcontractingContractDetailLists } from '@/api/subcontracting_contract_detail'
+
+import { defineEmits } from "vue"
+
+// 查询条件
+const queryParams = reactive({
+ project_id: '',
+ supplier_id: '',
+ contract_no: '',
+ all: 1,
+});
+
+const { dictData } = useDictData('procurement_contract_type,account_period,tax_rate,pay_type,pay_period ')
+// 选中数据
+const emits = defineEmits(["customEvent"]);
+
+// 选中数据子父传递
+const handleCurrentChange = (value: any) => {
+ emits("customEvent", value);
+};
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+ fetchFun: apiSubcontractingContractDetailLists,
+ params: queryParams,
+});
+
+getLists();
+</script>
\ No newline at end of file
diff --git a/src/components/supplier/index.vue b/src/components/supplier/index.vue
index 6401832..5112f62 100644
--- a/src/components/supplier/index.vue
+++ b/src/components/supplier/index.vue
@@ -32,7 +32,7 @@
</el-table>
</div>
- <div class="flex mt-4 justify-end">
+ <div class="flex justify-end mt-4">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
diff --git a/src/views/AssetManagement/Asset depreciation/edit.vue b/src/views/AssetManagement/Asset depreciation/edit.vue
index c9f0fe5..8e2f8ee 100644
--- a/src/views/AssetManagement/Asset depreciation/edit.vue
+++ b/src/views/AssetManagement/Asset depreciation/edit.vue
@@ -26,8 +26,8 @@
<el-form-item label="折旧日期" prop="invoicing_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss">
+ <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable
+ value-format="YYYY-MM-DD ">
</el-date-picker>
</el-form-item>
diff --git a/src/views/AssetManagement/AssetPurchasing/edit.vue b/src/views/AssetManagement/AssetPurchasing/edit.vue
index 2d8e927..93e9836 100644
--- a/src/views/AssetManagement/AssetPurchasing/edit.vue
+++ b/src/views/AssetManagement/AssetPurchasing/edit.vue
@@ -30,8 +30,8 @@
<el-form-item label="申请日期" prop="invoicing_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择申请日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择申请日期">
</el-date-picker>
</el-form-item>
@@ -41,8 +41,8 @@
<el-form-item label="希望到货日期" prop="invoicing_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择希望到货日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择希望到货日期">
</el-date-picker>
</el-form-item>
diff --git a/src/views/Materialmanagement/Inquiry/edit.vue b/src/views/Materialmanagement/Inquiry/edit.vue
index bacaa9a..b17c1ac 100644
--- a/src/views/Materialmanagement/Inquiry/edit.vue
+++ b/src/views/Materialmanagement/Inquiry/edit.vue
@@ -26,8 +26,8 @@
<el-form-item label="询价日期" prop="invoicing_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择询价日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择询价日期">
</el-date-picker>
</el-form-item>
diff --git a/src/views/Materialmanagement/Inventorygapanalysis/edit.vue b/src/views/Materialmanagement/Inventorygapanalysis/edit.vue
index 6af39a4..4d343d5 100644
--- a/src/views/Materialmanagement/Inventorygapanalysis/edit.vue
+++ b/src/views/Materialmanagement/Inventorygapanalysis/edit.vue
@@ -14,12 +14,14 @@
<el-row>
<el-col :span="8">
- <el-form-item label="供应商名称" prop="supplier_id" @click="showDialog1 = true" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
+ <el-form-item label="供应商名称" prop="supplier_id" @click="showDialog1 = true"
+ :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
<el-input v-model="supplier_name" readonly clearable placeholder="请选择供应商" />
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="供应商编码" prop="supplier_id" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
+ <el-form-item label="供应商编码" prop="supplier_id"
+ :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
<el-input v-model="supplier_code" clearable disabled placeholder="系统自动填写" />
</el-form-item>
</el-col>
@@ -27,11 +29,13 @@
<el-form-item label="审批id" prop="approve_id">
<el-input v-model="formData.approve_id" clearable placeholder="请输入审批id" />
</el-form-item> </el-col> <el-col :span="8">
- <el-form-item label="项目名称" prop="project_id" @click="showDialog = true" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
+ <el-form-item label="项目名称" prop="project_id" @click="showDialog = true"
+ :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
<el-input v-model="project_name" readonly clearable placeholder="请选择项目" />
</el-form-item> </el-col>
<el-col :span="8">
- <el-form-item label="项目编码" prop="project_id" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
+ <el-form-item label="项目编码" prop="project_id"
+ :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
<el-input v-model="project_code" readonly disabled placeholder="系统自动填写" />
</el-form-item> </el-col>
<el-col :span="8">
@@ -42,27 +46,33 @@
<el-input v-model="supplier_contract_no" clearable placeholder="请输入供应商合同号" />
</el-form-item> </el-col> <el-col :span="24">
<el-form-item label="合同类型" prop="contract_type">
- <el-radio-group v-model="formData.contract_type" placeholder="请选择合同类型" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
- <el-radio v-for="(item, index) in dictData.procurement_contract_type" :key="index" :label="parseInt(item.value)">
+ <el-radio-group v-model="formData.contract_type" placeholder="请选择合同类型"
+ :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+ <el-radio v-for="(item, index) in dictData.procurement_contract_type" :key="index"
+ :label="parseInt(item.value)">
{{ item.name }}
</el-radio>
</el-radio-group>
</el-form-item> </el-col> <el-col :span="8">
- <el-form-item label="签订日期" prop="signing_date" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.signing_date" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择签订日期">
+ <el-form-item label="签订日期" prop="signing_date"
+ :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+ <el-date-picker class="flex-1 !flex" v-model="formData.signing_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择签订日期">
</el-date-picker>
</el-form-item>
</el-col> <el-col :span="24">
<el-form-item label="付款方式" prop="pay_type">
<el-radio-group v-model="formData.pay_type" placeholder="请选择付款方式">
- <el-radio v-for="(item, index) in dictData.pay_type" :key="index" :label="parseInt(item.value)">
+ <el-radio v-for="(item, index) in dictData.pay_type" :key="index"
+ :label="parseInt(item.value)">
{{ item.name }}
</el-radio>
</el-radio-group>
</el-form-item> </el-col> <el-col :span="24">
<el-form-item label="账期" prop="account_period">
<el-radio-group v-model="formData.account_period" placeholder="请选择账期">
- <el-radio v-for="(item, index) in dictData.account_period" :key="index" :label="parseInt(item.value)">
+ <el-radio v-for="(item, index) in dictData.account_period" :key="index"
+ :label="parseInt(item.value)">
{{ item.name }}
</el-radio>
</el-radio-group>
@@ -73,20 +83,26 @@
<el-form-item label="不含税金额" prop="amount_excluding_tax">
<el-input v-model="formData.amount_excluding_tax" clearable placeholder="请输入不含税金额" />
</el-form-item> </el-col> <el-col :span="8">
- <el-form-item label="金额大写" prop="amount_daxie" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+ <el-form-item label="金额大写" prop="amount_daxie"
+ :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="formData.amount_daxie" clearable placeholder="请输入金额大写" />
</el-form-item> </el-col> <el-col :span="8">
<el-form-item label="质保金比例" prop="retention_money_rate">
<el-input v-model="formData.retention_money_rate" clearable placeholder="请输入质保金比例" />
</el-form-item> </el-col> <el-col :span="8">
- <el-form-item label="质保金" prop="retention_money" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+ <el-form-item label="质保金" prop="retention_money"
+ :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="formData.retention_money" clearable placeholder="请输入质保金" />
</el-form-item> </el-col> <el-col :span="8">
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" clearable placeholder="请输入备注" />
</el-form-item> </el-col> <el-col :span="8">
<el-form-item label="附件" prop="field127">
- <el-upload accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv" class="upload-demo" :show-file-list="false" aria-hidden="true" :headers="{ Token: userStore.token }" :action="base_url + '/upload/file'" :on-success="handleAvatarSuccess_four" ref="upload">
+ <el-upload
+ accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv"
+ class="upload-demo" :show-file-list="false" aria-hidden="true"
+ :headers="{ Token: userStore.token }" :action="base_url + '/upload/file'"
+ :on-success="handleAvatarSuccess_four" ref="upload">
<el-button type="primary">
上传
</el-button>
@@ -94,7 +110,8 @@
<div>
<div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
- <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
+ <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
+ target="_blank">{{ item.name }}</a>
<span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
</div>
</div>
@@ -118,9 +135,13 @@
</template>
</el-table-column>
<el-table-column label="材料名称" prop="material_procurement_application_id">
- <template #default="{ row }"> <el-input v-model="row.material_procurement_application_id" /> </template></el-table-column>
+ <template #default="{ row }"> <el-input
+ v-model="row.material_procurement_application_id" />
+ </template></el-table-column>
<el-table-column label="材料编码" prop="material_procurement_application_id">
- <template #default="{ row }"> <el-input v-model="row.material_procurement_application_id" /> </template></el-table-column>
+ <template #default="{ row }"> <el-input
+ v-model="row.material_procurement_application_id" />
+ </template></el-table-column>
<el-table-column label="规格型号" prop="material_procurement_application_id">
<template #default="{ row }">
@@ -181,17 +202,20 @@
<el-table-column label="期次" prop="name1">
<template #default="{ row }">
<el-select v-model="row.period" clearable placeholder="请选择期次">
- <el-option v-for="(item, index) in dictData.pay_period " :key="index" :label="item.name" :value="item.id" />
+ <el-option v-for="(item, index) in dictData.pay_period " :key="index"
+ :label="item.name" :value="item.id" />
</el-select>
</template>
</el-table-column>
<el-table-column label="计划付款日期" prop="pay_date">
<template #default="{ row }">
- <el-date-picker v-model="row.pay_date" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择签订日期">
+ <el-date-picker v-model="row.pay_date" clearable value-format="YYYY-MM-DD "
+ placeholder="选择签订日期">
</el-date-picker>
</template></el-table-column>
<el-table-column label="金额" prop="pay_amount">
- <template #default="{ row }"> <el-input v-model="row.pay_amount" /> </template></el-table-column>
+ <template #default="{ row }"> <el-input v-model="row.pay_amount" />
+ </template></el-table-column>
<el-table-column label="备注" prop="remark">
<template #default="{ row }">
@@ -403,7 +427,7 @@ const setFormData = async (data: Record<any, any>) => {
project_code.value = data.project.project_code
//@ts-ignore
- formData.signing_date = timeFormat(formData.signing_date, 'yyyy-mm-dd hh:MM:ss')
+ formData.signing_date = timeFormat(formData.signing_date, 'YYYY-MM-DD ')
}
const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/Materialmanagement/Monthlyinventory/edit.vue b/src/views/Materialmanagement/Monthlyinventory/edit.vue
index 50b2f1b..a92ae3f 100644
--- a/src/views/Materialmanagement/Monthlyinventory/edit.vue
+++ b/src/views/Materialmanagement/Monthlyinventory/edit.vue
@@ -30,8 +30,8 @@
<el-col :span="8">
<el-form-item label="盘点日期" prop="invoicing_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择询价日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择询价日期">
</el-date-picker>
</el-form-item>
</el-col>
diff --git a/src/views/Materialmanagement/Selfpurchasereceipt/edit.vue b/src/views/Materialmanagement/Selfpurchasereceipt/edit.vue
index ac0cfba..84d5ccd 100644
--- a/src/views/Materialmanagement/Selfpurchasereceipt/edit.vue
+++ b/src/views/Materialmanagement/Selfpurchasereceipt/edit.vue
@@ -38,8 +38,8 @@
<el-form-item label="入库日期" prop="invoicing_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择入库日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择入库日期">
</el-date-picker>
</el-form-item>
diff --git a/src/views/Materialmanagement/Selfpurchasereceipt_detail/edit.vue b/src/views/Materialmanagement/Selfpurchasereceipt_detail/edit.vue
index dbee804..6e1963d 100644
--- a/src/views/Materialmanagement/Selfpurchasereceipt_detail/edit.vue
+++ b/src/views/Materialmanagement/Selfpurchasereceipt_detail/edit.vue
@@ -32,8 +32,8 @@
<el-form-item label="申请日期" prop="invoicing_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择申请日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择申请日期">
</el-date-picker>
</el-form-item>
@@ -42,8 +42,8 @@
<el-form-item label="希望到货日期" prop="invoicing_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择希望到货日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择希望到货日期">
</el-date-picker>
</el-form-item>
diff --git a/src/views/Materialmanagement/Serialnumberoutbound/edit.vue b/src/views/Materialmanagement/Serialnumberoutbound/edit.vue
index 0536a40..031e4a8 100644
--- a/src/views/Materialmanagement/Serialnumberoutbound/edit.vue
+++ b/src/views/Materialmanagement/Serialnumberoutbound/edit.vue
@@ -20,8 +20,8 @@
<el-form-item label="出库日期" prop="invoicing_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择出库日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择出库日期">
</el-date-picker>
</el-form-item>
diff --git a/src/views/Materialmanagement/Serialnumberstorage/edit.vue b/src/views/Materialmanagement/Serialnumberstorage/edit.vue
index a5d7e87..c1ba1fd 100644
--- a/src/views/Materialmanagement/Serialnumberstorage/edit.vue
+++ b/src/views/Materialmanagement/Serialnumberstorage/edit.vue
@@ -25,8 +25,8 @@
<el-form-item label="入库日期" prop="invoicing_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择入库日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择入库日期">
</el-date-picker>
</el-form-item>
diff --git a/src/views/Materialmanagement/TransferOrder/edit.vue b/src/views/Materialmanagement/TransferOrder/edit.vue
index 1ff17fd..8d0dd01 100644
--- a/src/views/Materialmanagement/TransferOrder/edit.vue
+++ b/src/views/Materialmanagement/TransferOrder/edit.vue
@@ -44,8 +44,8 @@
<el-form-item label="调拨日期" prop="invoicing_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择调拨日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择调拨日期">
</el-date-picker>
</el-form-item>
diff --git a/src/views/Materialmanagement/TransferOrder_detail/edit.vue b/src/views/Materialmanagement/TransferOrder_detail/edit.vue
index 1ff17fd..8d0dd01 100644
--- a/src/views/Materialmanagement/TransferOrder_detail/edit.vue
+++ b/src/views/Materialmanagement/TransferOrder_detail/edit.vue
@@ -44,8 +44,8 @@
<el-form-item label="调拨日期" prop="invoicing_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择调拨日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择调拨日期">
</el-date-picker>
</el-form-item>
diff --git a/src/views/Materialmanagement/materialHandlingForm/edit.vue b/src/views/Materialmanagement/materialHandlingForm/edit.vue
index 9ff2f67..f59be65 100644
--- a/src/views/Materialmanagement/materialHandlingForm/edit.vue
+++ b/src/views/Materialmanagement/materialHandlingForm/edit.vue
@@ -26,8 +26,8 @@
<el-form-item label="处理日期" prop="invoicing_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择处理日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择处理日期">
</el-date-picker>
</el-form-item>
diff --git a/src/views/Materialmanagement/materialgapanalysis/edit.vue b/src/views/Materialmanagement/materialgapanalysis/edit.vue
index dbee804..6e1963d 100644
--- a/src/views/Materialmanagement/materialgapanalysis/edit.vue
+++ b/src/views/Materialmanagement/materialgapanalysis/edit.vue
@@ -32,8 +32,8 @@
<el-form-item label="申请日期" prop="invoicing_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择申请日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择申请日期">
</el-date-picker>
</el-form-item>
@@ -42,8 +42,8 @@
<el-form-item label="希望到货日期" prop="invoicing_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择希望到货日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择希望到货日期">
</el-date-picker>
</el-form-item>
diff --git a/src/views/Materialmanagement/outboundflow/edit.vue b/src/views/Materialmanagement/outboundflow/edit.vue
index 6615fd2..9c4f134 100644
--- a/src/views/Materialmanagement/outboundflow/edit.vue
+++ b/src/views/Materialmanagement/outboundflow/edit.vue
@@ -37,8 +37,8 @@
<el-form-item label="出库日期" prop="invoicing_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择出库日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择出库日期">
</el-date-picker>
</el-form-item>
diff --git a/src/views/Materialmanagement/outboundorder/edit.vue b/src/views/Materialmanagement/outboundorder/edit.vue
index 54f694e..e8c5f88 100644
--- a/src/views/Materialmanagement/outboundorder/edit.vue
+++ b/src/views/Materialmanagement/outboundorder/edit.vue
@@ -29,8 +29,8 @@
<el-form-item label="出库日期" prop="invoicing_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择出库日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择出库日期">
</el-date-picker>
</el-form-item>
diff --git a/src/views/Materialmanagement/receiptstatement/edit.vue b/src/views/Materialmanagement/receiptstatement/edit.vue
index b967b9c..401ce83 100644
--- a/src/views/Materialmanagement/receiptstatement/edit.vue
+++ b/src/views/Materialmanagement/receiptstatement/edit.vue
@@ -53,8 +53,8 @@
<el-form-item label="入库日期" prop="invoicing_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择入库日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择入库日期">
</el-date-picker>
</el-form-item>
diff --git a/src/views/Materialmanagement/returndetails/edit.vue b/src/views/Materialmanagement/returndetails/edit.vue
index dbee804..6e1963d 100644
--- a/src/views/Materialmanagement/returndetails/edit.vue
+++ b/src/views/Materialmanagement/returndetails/edit.vue
@@ -32,8 +32,8 @@
<el-form-item label="申请日期" prop="invoicing_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择申请日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择申请日期">
</el-date-picker>
</el-form-item>
@@ -42,8 +42,8 @@
<el-form-item label="希望到货日期" prop="invoicing_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择希望到货日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择希望到货日期">
</el-date-picker>
</el-form-item>
diff --git a/src/views/Materialmanagement/returnorder/edit.vue b/src/views/Materialmanagement/returnorder/edit.vue
index c7275e7..26127c5 100644
--- a/src/views/Materialmanagement/returnorder/edit.vue
+++ b/src/views/Materialmanagement/returnorder/edit.vue
@@ -62,8 +62,8 @@
<el-form-item label="退库日期" prop="invoicing_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择退库日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择退库日期">
</el-date-picker>
</el-form-item>
diff --git a/src/views/acceptance_bill/edit.vue b/src/views/acceptance_bill/edit.vue
index 8a20814..c8ca422 100644
--- a/src/views/acceptance_bill/edit.vue
+++ b/src/views/acceptance_bill/edit.vue
@@ -63,8 +63,8 @@
<el-col :span="8">
<el-form-item label="收票日期" prop="receipt_date"
:rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.receipt_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择收票日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.receipt_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择收票日期">
</el-date-picker>
</el-form-item>
</el-col>
@@ -114,8 +114,8 @@
<el-col :span="8">
<el-form-item label="汇票到期日期" prop="bill_due_date"
:rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.bill_due_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择汇票到期日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.bill_due_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择汇票到期日期">
</el-date-picker>
</el-form-item>
</el-col>
diff --git a/src/views/administrativeContracts/edit.vue b/src/views/administrativeContracts/edit.vue
index 4c30cbd..3fd7915 100644
--- a/src/views/administrativeContracts/edit.vue
+++ b/src/views/administrativeContracts/edit.vue
@@ -77,23 +77,23 @@
<el-col :span="8">
<el-form-item label="开始日期" prop="start_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.start_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择签订日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.start_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择签订日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="结束日期" prop="end_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.end_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择签订日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.end_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择签订日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="签约日期" prop="signing_date">
- <el-date-picker class="flex-1 !flex" v-model="formData.signing_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择签订日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.signing_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择签订日期">
</el-date-picker>
</el-form-item>
</el-col>
@@ -311,7 +311,7 @@ const setFormData = async (data: Record<any, any>) => {
supplier_code.value = data.supplier_code
//@ts-ignore
- formData.signing_date = timeFormat(formData.signing_date, 'yyyy-mm-dd hh:MM:ss')
+ formData.signing_date = timeFormat(formData.signing_date, 'YYYY-MM-DD ')
}
const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/administrativeContracts/index.vue b/src/views/administrativeContracts/index.vue
index 61dbfc9..2347c46 100644
--- a/src/views/administrativeContracts/index.vue
+++ b/src/views/administrativeContracts/index.vue
@@ -58,7 +58,7 @@
</el-table-column>
<el-table-column label="签约日期" prop="signing_date">
<template #default="{ row }">
- <span>{{ row.signing_date ? timeFormat(row.signing_date, 'yyyy-mm-dd hh:MM:ss') : '' }}</span>
+ <span>{{ row.signing_date ? timeFormat(row.signing_date, 'YYYY-MM-DD ') : '' }}</span>
</template>
</el-table-column>
diff --git a/src/views/administrative_payments/edit.vue b/src/views/administrative_payments/edit.vue
index b7838d9..bf0a65c 100644
--- a/src/views/administrative_payments/edit.vue
+++ b/src/views/administrative_payments/edit.vue
@@ -16,7 +16,8 @@
<el-row :gutter="10">
<el-col :span="8">
- <el-form-item label="合同编号" prop="administrative_contract_id" @click="showDialog1 = true" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+ <el-form-item label="合同编号" prop="administrative_contract_id" @click="showDialog1 = true"
+ :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="contract_no" clearable placeholder="请输入合同编号" />
</el-form-item>
</el-col>
@@ -26,7 +27,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="供应商名称" rop="administrative_contract_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+ <el-form-item label="供应商名称" rop="administrative_contract_id"
+ :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="supplier_name" readonly clearable disabled placeholder="系统自动填写" />
</el-form-item>
</el-col>
@@ -45,14 +47,17 @@
<el-col :span="8">
<el-form-item label="申请日期" prop="apply_date">
- <el-date-picker class="flex-1 !flex" v-model="formData.apply_date" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择开票日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.apply_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择开票日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24">
- <el-form-item label="付款方式" prop="pay_type" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
+ <el-form-item label="付款方式" prop="pay_type"
+ :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
<el-radio-group v-model="formData.pay_type" placeholder="请选择付款方式">
- <el-radio v-for="(item, index) in dictData.pay_type" :key="index" :label="parseInt(item.value)">
+ <el-radio v-for="(item, index) in dictData.pay_type" :key="index"
+ :label="parseInt(item.value)">
{{ item.name }}
</el-radio>
</el-radio-group>
@@ -75,7 +80,8 @@
</el-col>
<el-col :span="8">
<el-form-item label="本次支付金额" prop="payment_amount">
- <el-input v-model="formData.payment_amount" clearable placeholder="请输入支付金额" @input="amountinput" />
+ <el-input v-model="formData.payment_amount" clearable placeholder="请输入支付金额"
+ @input="amountinput" />
</el-form-item>
</el-col>
<el-col :span="8">
@@ -95,7 +101,11 @@
<el-col :span="24">
<el-form-item label="附件" prop="field87">
- <el-upload accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv" class="upload-demo" :show-file-list="false" aria-hidden="true" :headers="{ Token: userStore.token }" :action="base_url + '/upload/file'" :on-success="handleAvatarSuccess_four" ref="upload">
+ <el-upload
+ accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv"
+ class="upload-demo" :show-file-list="false" aria-hidden="true"
+ :headers="{ Token: userStore.token }" :action="base_url + '/upload/file'"
+ :on-success="handleAvatarSuccess_four" ref="upload">
<el-button type="primary">
上传
</el-button>
@@ -103,7 +113,8 @@
<div>
<div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
- <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
+ <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
+ target="_blank">{{ item.name }}</a>
<span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
</div>
</div>
diff --git a/src/views/administrative_ticket_collection/edit.vue b/src/views/administrative_ticket_collection/edit.vue
index 1274d28..850dd26 100644
--- a/src/views/administrative_ticket_collection/edit.vue
+++ b/src/views/administrative_ticket_collection/edit.vue
@@ -40,8 +40,8 @@
<el-col :span="8">
<el-form-item label="开票日期" prop="invoicing_date">
- <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择开票日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择开票日期">
</el-date-picker>
</el-form-item>
</el-col>
@@ -104,8 +104,8 @@
<el-form-item label="收票日期" prop="receipt_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
<!-- <el-input v-model="formData.receipt_date" clearable placeholder="请输入收票日期" /> -->
- <el-date-picker class="flex-1 !flex" v-model="formData.receipt_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择收票日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.receipt_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择收票日期">
</el-date-picker>
</el-form-item>
</el-col>
diff --git a/src/views/bid_buy_bidding_document/edit.vue b/src/views/bid_buy_bidding_document/edit.vue
index 3f0d624..a16d745 100644
--- a/src/views/bid_buy_bidding_document/edit.vue
+++ b/src/views/bid_buy_bidding_document/edit.vue
@@ -61,13 +61,13 @@
</el-radio-group>
</el-form-item></el-col><el-col :span="8">
<el-form-item label="投标时间" prop="bid_date">
- <el-date-picker class="flex-1 !flex" v-model="formData.bid_date" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择投标时间">
+ <el-date-picker class="flex-1 !flex" v-model="formData.bid_date" clearable value-format="YYYY-MM-DD " placeholder="选择投标时间">
</el-date-picker>
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item label="购买标书时间" prop="buy_date">
- <el-date-picker class="flex-1 !flex" v-model="formData.buy_date" clearable type="datetime"
+ <el-date-picker class="flex-1 !flex" v-model="formData.buy_date" clearable
value-format="YYYY-MM-DD" placeholder="选择购买标书时间">
</el-date-picker>
</el-form-item>
diff --git a/src/views/bid_document_examination/edit.vue b/src/views/bid_document_examination/edit.vue
index 69cd3b2..3408c34 100644
--- a/src/views/bid_document_examination/edit.vue
+++ b/src/views/bid_document_examination/edit.vue
@@ -107,13 +107,13 @@
<!-- <el-col :span="8"><el-form-item label="开标日期" prop="bid_opening_date">
- <el-date-picker class="flex-1 !flex" v-model="formData.bid_opening_date" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择开标日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.bid_opening_date" clearable value-format="YYYY-MM-DD " placeholder="选择开标日期">
</el-date-picker>
<el-input v-model="bid_opening_date" clearable disabled placeholder="系统自动填写" />
</el-form-item></el-col> <el-col :span="8"> -->
<!-- <el-col :span="8"><el-form-item label="保证金退还时间" prop="deposit_refund_time">
- <el-date-picker class="flex-1 !flex" v-model="formData.deposit_refund_time" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择保证金退还时间">
+ <el-date-picker class="flex-1 !flex" v-model="formData.deposit_refund_time" clearable value-format="YYYY-MM-DD " placeholder="选择保证金退还时间">
</el-date-picker>
<el-input v-model="deposit_refund_time" clearable disabled placeholder="系统自动填写" />
</el-form-item>
@@ -589,9 +589,9 @@ const setFormData = async (data: Record<any, any>) => {
project_introduction.value = data.project_desc
// //@ts-ignore
- // formData.bid_opening_date = timeFormat(formData.bid_opening_date, 'yyyy-mm-dd hh:MM:ss')
+ // formData.bid_opening_date = timeFormat(formData.bid_opening_date, 'YYYY-MM-DD ')
// //@ts-ignore
- // formData.deposit_refund_time = timeFormat(formData.deposit_refund_time, 'yyyy-mm-dd hh:MM:ss')
+ // formData.deposit_refund_time = timeFormat(formData.deposit_refund_time, 'YYYY-MM-DD ')
}
const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/build/build_report/edit.vue b/src/views/build/build_report/edit.vue
index 230287f..cfa9596 100644
--- a/src/views/build/build_report/edit.vue
+++ b/src/views/build/build_report/edit.vue
@@ -235,7 +235,7 @@ const project_id = ref(0)
const quality_control_points = ref('')
const process_file = ref([])
const filluser = userInfo.name
-const filluserdate = timeFormat(new Date(), 'yyyy-mm-dd hh:MM:ss')
+const filluserdate = timeFormat(new Date(), 'YYYY-MM-DD ')
const personnel = ref<any>()
const num = ref(0)
defineProps({
diff --git a/src/views/custom_service/edit.vue b/src/views/custom_service/edit.vue
index 3e34485..cbe339a 100644
--- a/src/views/custom_service/edit.vue
+++ b/src/views/custom_service/edit.vue
@@ -55,8 +55,8 @@
<el-col :span="12">
<el-form-item label="日期" prop="date"
:rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
@@ -348,7 +348,7 @@ const setFormData = async (data: Record<any, any>) => {
}
//@ts-ignore
- formData.date = timeFormat(formData.date, 'yyyy-mm-dd hh:MM:ss')
+ formData.date = timeFormat(formData.date, 'YYYY-MM-DD ')
}
const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/customer_demand_solution/edit.vue b/src/views/customer_demand_solution/edit.vue
index a82801a..56c1ae4 100644
--- a/src/views/customer_demand_solution/edit.vue
+++ b/src/views/customer_demand_solution/edit.vue
@@ -32,7 +32,7 @@
<el-input v-model="formData.theme" clearable placeholder="请输入解决方案主题" />
</el-form-item>
<el-form-item label="提交时间" prop="submission_time">
- <el-date-picker class="flex-1 !flex" v-model="formData.submission_time" clearable type="datetime"
+ <el-date-picker class="flex-1 !flex" v-model="formData.submission_time" clearable
value-format="YYYY-MM-DD" placeholder="选择提交时间">
</el-date-picker>
</el-form-item>
diff --git a/src/views/expense_reimbursement/edit.vue b/src/views/expense_reimbursement/edit.vue
index c4fd159..1fdd012 100644
--- a/src/views/expense_reimbursement/edit.vue
+++ b/src/views/expense_reimbursement/edit.vue
@@ -28,7 +28,7 @@
<el-form-item label="报销日期" prop="reimbursement_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
<el-date-picker class="flex-1 !flex" v-model="formData.reimbursement_date" clearable
- type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择报销日期">
+ value-format="YYYY-MM-DD " placeholder="选择报销日期">
</el-date-picker>
</el-form-item>
</el-col>
diff --git a/src/views/finance_payment_apply/edit.vue b/src/views/finance_payment_apply/edit.vue
index eb99ec0..24228d9 100644
--- a/src/views/finance_payment_apply/edit.vue
+++ b/src/views/finance_payment_apply/edit.vue
@@ -24,7 +24,15 @@
<el-input v-model="supplier_code" clearable disabled placeholder="系统自动填写" />
</el-form-item>
</el-col>
+ <el-col :span="8">
+ <el-form-item label="合同类型" prop="contract_cate">
+ <el-select v-model="formData.contract_cate" placeholder="请选择">
+ <el-option label="采购合同" :value="1"></el-option>
+ <el-option label="分包合同" :value="2"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
<el-col :span="8">
<el-form-item label="合同编号" prop="contract_no" @click="showDialog1 = true">
<el-input v-model="contract_no" clearable placeholder="请选择合同" />
@@ -47,23 +55,15 @@
</el-col>
- <el-col :span="8">
- <el-form-item label="累计已支付" prop="reason">
- <el-input v-model="reason" clearable placeholder="请输入累计已支付" />
- </el-form-item>
- </el-col>
+
<el-col :span="8">
<el-form-item label="付款日期" prop="pay_date">
- <el-date-picker class="flex-1 !flex" v-model="formData.pay_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.pay_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="8">
- <el-form-item label="累计已开票" prop="reason">
- <el-input v-model="reason" readonly clearable placeholder="请输入累计已开票" />
- </el-form-item>
- </el-col>
+
<el-col :span="8">
<el-form-item label="期次" prop="period"
@@ -78,8 +78,8 @@
<el-button @click="showDialog2 = true" type="primary">选择待付款计划</el-button>
</el-col>
<el-col :span="8">
- <el-form-item label="付款性质" prop="payment_natrue">
- <el-select class="flex-1" v-model="formData.payment_natrue" clearable placeholder="请选择付款性质">
+ <el-form-item label="付款性质" prop="payment_nature">
+ <el-select class="flex-1" v-model="formData.payment_nature" clearable placeholder="请选择付款性质">
<el-option v-for="(item, index) in dictData.payment_natrue" :key="index" :label="item.name"
:value="parseInt(item.value)" />
</el-select>
@@ -164,28 +164,39 @@
</el-col>
<el-col :span="8">
- <el-form-item label="开户名称" prop="account_name">
- <el-input v-model="formData.account_name" clearable placeholder="请输入开户名称" />
+ <el-form-item label="开户名称" prop="payee_bank">
+ <el-input v-model="formData.payee_bank" clearable placeholder="请输入开户名称" />
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="账号" prop="account">
- <el-input v-model="formData.account" clearable placeholder="请输入账号" />
+ <el-form-item label="账号" prop="payee_account">
+ <el-input v-model="formData.payee_account" clearable placeholder="请输入账号" />
</el-form-item>
</el-col>
</el-row>
<el-dialog v-model="showDialog" title="选择供应商" width="70%">
- <procurementDialog @customEvent="customEvent"></procurementDialog>
- </el-dialog>
- <el-dialog v-model="showDialog1" title="选择合同" width="70%">
- <subcontractingDialog @customEvent="customEvent1"></subcontractingDialog>
+ <suppliertable @customEvent="customEvent"></suppliertable>
</el-dialog>
+ <div v-if="formData.contract_cate == 1">
+ <el-dialog v-model="showDialog1" title="选择采购合同" width="70%">
+ <subcontractingDialog @customEvent="customEvent1">
+ </subcontractingDialog>
+ </el-dialog>
+ </div>
+
+ <div v-if="formData.contract_cate == 2">
+ <el-dialog v-model="showDialog1" title="选择分包合同" width="70%">
+ <subcontracting @customEvent="customEvent1">
+ </subcontracting>
+ </el-dialog>
+
+ </div>
<el-dialog v-model="showDialog2" title="选择待付款计划" width="70%">
- <paylistDialog @customEvent="customEvent2"></paylistDialog>
+ <paylistDialog @customEvent="customEvent2" :contract_id="formData.contract_id"></paylistDialog>
</el-dialog>
<el-dialog v-model="showDialog3" title="选择收款人信息" width="70%">
<bankaccountDialog @customEvent="customEvent3"></bankaccountDialog>
@@ -200,9 +211,11 @@
import customDialog from '@/components/custom-dialog/index.vue'
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
-import procurementDialog from '@/components/procurement/index.vue'
+// import procurementDialog from '@/components/procurement/index.vue'
+import suppliertable from '@/components/supplier/index.vue'
import subcontractingDialog from '@/components/procurementsubcontracting_selector/index.vue'
import paylistDialog from '@/components/paylist/index.vue'
+import subcontracting from '@/components/procurementsubcontracting_selector/subcontracting.vue'
const active = ref(0)
import bankaccountDialog from '@/components/bankaccount/index.vue'
@@ -305,19 +318,20 @@ const customEvent1 = (e: any) => {
};
const customEvent2 = (e: any) => {
- formData.payment_plan_id = e.id;
+ formData.finance_payment_plan_id = e.id;
formData.period = e.period
formData.amount = e.amount
project_name.value = e.project_name;
project_code.value = e.project_code;
formData.amount_daxie = toChinesNum(e.amount)
showDialog2.value = false;
+ console.log(formData, "formdata")
};
const customEvent3 = (e: any) => {
formData.bank = e.deposit_bank
- formData.account_name = e.account_name
- formData.account = e.account
+ formData.payee_bank = e.account_name
+ formData.payee_account = e.account
showDialog3.value = false;
};
@@ -340,8 +354,7 @@ const formData = reactive({
contract_id: '',
pay_date: '',
period: '',
- payment_plan_id: '',
- payment_natrue: '',
+ finance_payment_plan_id: '',
pay_type: '',
applier: '',
invoice_status: '',
@@ -352,7 +365,14 @@ const formData = reactive({
annex: [],
bank: '',
account_name: '',
- account: ''
+ account: '',
+ contract_cate: 1,
+ "payment_nature": 0,
+ "apply_user": "string",
+ "payee_bank": "string",
+ "payee_account_name": "string",
+ "payee_account": "string",
+ "bank_account_id": ''
})
diff --git a/src/views/finance_payment_plan/detail.vue b/src/views/finance_payment_plan/detail.vue
index ff97e86..62c1b12 100644
--- a/src/views/finance_payment_plan/detail.vue
+++ b/src/views/finance_payment_plan/detail.vue
@@ -21,7 +21,7 @@
<el-col :span="12">
<el-form-item label="项目编码">
- {{ formData.project.project_code
+ {{ formData.project?.project_code || formData.project_code
}}
</el-form-item>
</el-col>
@@ -67,7 +67,8 @@
<el-col :span="12">
<el-form-item label="附件">
<div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
- <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
+ <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
+ target="_blank">{{ item.name }}</a>
<span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
</div>
</el-form-item>
diff --git a/src/views/finance_payment_plan/edit.vue b/src/views/finance_payment_plan/edit.vue
index c1e386a..940d705 100644
--- a/src/views/finance_payment_plan/edit.vue
+++ b/src/views/finance_payment_plan/edit.vue
@@ -17,7 +17,15 @@
<el-input v-model="supplier_code" clearable disabled placeholder="系统自动填写" />
</el-form-item>
</el-col>
+ <el-col :span="8">
+ <el-form-item label="合同类型" prop="contract_cate">
+ <el-select v-model="formData.contract_cate" placeholder="请选择">
+ <el-option label="采购合同" :value="1"></el-option>
+ <el-option label="分包合同" :value="2"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
<el-col :span="8">
@@ -39,8 +47,8 @@
<el-col :span="8">
<el-form-item label="计划付款日期" prop="pay_date">
- <el-date-picker class="flex-1 !flex" v-model="formData.pay_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.pay_date" clearable
+ value-format="YYYY-MM-DD" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
@@ -61,7 +69,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="外币备注" prop="foreign_currency_remark">
- <el-input v-model="formData.foreign_currency_remark" readonly clearable placeholder="请输入外币备注" />
+ <el-input v-model="formData.foreign_currency_remark" clearable placeholder="请输入外币备注" />
</el-form-item>
</el-col>
@@ -106,14 +114,21 @@
<el-dialog v-model="showDialog" title="选择供应商" width="70%">
- <procurementDialog @customEvent="customEvent"></procurementDialog>
- </el-dialog>
- <el-dialog v-model="showDialog1" title="选择合同" width="70%">
- <subcontractingDialog @customEvent="customEvent1"></subcontractingDialog>
+ <supplier @customEvent="customEvent"></supplier>
</el-dialog>
+ <div v-if="formData.contract_cate == 1">
+ <el-dialog v-model="showDialog1" title="选择采购合同" width="70%">
+ <subcontractingDialog @customEvent="customEvent1">
+ </subcontractingDialog>
+ </el-dialog>
+ </div>
-
-
+ <div v-if="formData.contract_cate == 2">
+ <el-dialog v-model="showDialog1" title="选择分包合同" width="70%">
+ <subcontracting @customEvent="customEvent1">
+ </subcontracting>
+ </el-dialog>
+ </div>
</el-form>
</popup>
@@ -124,9 +139,9 @@
import customDialog from '@/components/custom-dialog/index.vue'
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
-import procurementDialog from '@/components/procurement/index.vue'
+import supplier from '@/components/supplier/index.vue'
import subcontractingDialog from '@/components/procurementsubcontracting_selector/index.vue'
-
+import subcontracting from '@/components/procurementsubcontracting_selector/subcontracting.vue'
import { paymentplanAdd, paymentplanEdit, paymentplanDetail } from '@/api/paymentplan'
import { toChinesNum } from "@/utils/util";
import { getAllProjectTypes } from '@/api/projecttype'
@@ -147,7 +162,6 @@ const contract_no = ref('')
const supplier_name = ref('')
const supplier_code = ref('')
const userInfo = userStore.userInfo
-console.log(userInfo, '222222')
// 上传文件
const handleAvatarSuccess_four = (
response,
@@ -246,7 +260,8 @@ const formData = reactive({
foreign_currency_remark: "",
status: '',
remark: "",
- annex: []
+ annex: [],
+ contract_cate: 1
})
@@ -258,6 +273,13 @@ const formRules = reactive<any>({
// 获取详情
const setFormData = async (data: Record<any, any>) => {
+
+
+
+
+
+
+
if (data.annex && data.annex.length > 0) {
const arry1 = data.annex.map((item: any, index: any) => {
@@ -277,14 +299,16 @@ const setFormData = async (data: Record<any, any>) => {
formData[key] = data[key]
}
}
-
- project_name.value = data.project.name
- project_code.value = data.project.project_code
- project_amount.value = data.contract.amount
- contract_name.value = data.contract.contract_name;
- contract_no.value = data.contract.contract_no
+ project_name.value = data.project?.name || data.project_name
+ project_code.value = data.project?.project_code || data.project_code
+ project_amount.value = data.contract?.amount || data.amount
+ contract_name.value = data.contract?.contract_name || data.contract_name
+ contract_no.value = data.contract?.contract_no || data.contract_no
+ formData.contract_cate = data.contract_type
supplier_code.value = data.supplier_code;
supplier_name.value = data.supplier_name;
+ // supplier_code
+ console.log(supplier_name.value, data)
}
const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/finance_receipt_record/detail.vue b/src/views/finance_receipt_record/detail.vue
index 1e4409e..1d19c2e 100644
--- a/src/views/finance_receipt_record/detail.vue
+++ b/src/views/finance_receipt_record/detail.vue
@@ -21,7 +21,7 @@
<el-col :span="12">
<el-form-item label="项目编码">
- {{ formData.project.project_code
+ {{ formData.project?.project_code || formData.project_code
}}
</el-form-item>
</el-col>
@@ -93,7 +93,8 @@
<el-form-item label="附件">
<div>
<div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
- <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
+ <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start"
+ :href="item.uri" target="_blank">{{ item.name }}</a>
<span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
</div>
</div>
@@ -140,6 +141,7 @@ const formData = reactive({
// 获取详情
const setFormData = async (data: Record<any, any>) => {
Object.assign(formData, data)
+ console.log(data, "data")
diff --git a/src/views/finance_receipt_record/edit.vue b/src/views/finance_receipt_record/edit.vue
index 8820b7d..3f71f71 100644
--- a/src/views/finance_receipt_record/edit.vue
+++ b/src/views/finance_receipt_record/edit.vue
@@ -18,13 +18,11 @@
</el-col>
<el-col :span="8">
<el-form-item label="合同类型" prop="contract_cate">
-
<el-select v-model="formData.contract_cate" placeholder="请选择">
<el-option label="采购合同" :value="1"></el-option>
<el-option label="分包合同" :value="2"></el-option>
</el-select>
-
</el-form-item>
</el-col>
@@ -51,8 +49,8 @@
</el-col>
<el-col :span="8">
<el-form-item label="开票日期" prop="invoicing_date">
- <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择开票日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable
+ value-format="YYYY-MM-DD" placeholder="选择开票日期">
</el-date-picker>
</el-form-item>
</el-col>
@@ -74,7 +72,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="发票编号" prop="invoice_no">
+ <el-form-item label="发票编号">
<el-input v-model="formData.invoice_no" clearable placeholder="请输入发票编号" />
</el-form-item>
</el-col>
@@ -94,7 +92,12 @@
<el-col :span="8">
<el-form-item label="发票税率" prop="invoice_tax_rate">
- <el-input v-model="formData.invoice_tax_rate" clearable placeholder="请输入发票税率" />
+ <el-select v-model="formData.invoice_tax_rate" placeholder="请选择">
+ <el-option :label="item.name" :value="item.value"
+ v-for="item in dictData.tax_rate"></el-option>
+ </el-select>
+
+ <!-- <dict-value :options="dictData.tax_rate" :value="row.tax_rate" /> -->
</el-form-item>
</el-col>
@@ -115,8 +118,8 @@
<el-form-item label="收票日期" prop="receipt_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
<!-- <el-input v-model="formData.receipt_date" clearable placeholder="请输入收票日期" /> -->
- <el-date-picker class="flex-1 !flex" v-model="formData.receipt_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择收票日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.receipt_date" clearable
+ value-format="YYYY-MM-DD" placeholder="选择收票日期">
</el-date-picker>
</el-form-item>
</el-col>
@@ -151,17 +154,24 @@
</el-form-item>
</el-col>
</el-row>
-
-
-
<el-dialog v-model="showDialog" title="选择供应商" width="70%">
<suppliertable @customEvent="customEvent"></suppliertable>
</el-dialog>
- <el-dialog v-model="showDialog1" title="选择合同" width="70%">
- <subcontractingDialog @customEvent="customEvent1"></subcontractingDialog>
- </el-dialog>
+ <div v-if="formData.contract_cate == 1">
+ <el-dialog v-model="showDialog1" title="选择采购合同" width="70%">
+ <subcontractingDialog @customEvent="customEvent1">
+ </subcontractingDialog>
+ </el-dialog>
+ </div>
+ <div v-if="formData.contract_cate == 2">
+ <el-dialog v-model="showDialog1" title="选择分包合同" width="70%">
+ <subcontracting @customEvent="customEvent1">
+ </subcontracting>
+ </el-dialog>
+
+ </div>
</el-form>
</popup>
@@ -175,6 +185,9 @@ import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import suppliertable from '@/components/supplier/index.vue'
import subcontractingDialog from '@/components/procurementsubcontracting_selector/index.vue'
+import subcontracting from '@/components/procurementsubcontracting_selector/subcontracting.vue'
+
+
import { apifinancereceiptAdd, apifinancereceiptEdit, apifinancereceiptDetail } from '@/api/receiptrecord'
import { toChinesNum } from "@/utils/util";
@@ -184,6 +197,11 @@ import { isEmail, isIdCard, isPhone } from '@/utils/validate'
import type { PropType } from 'vue'
import configs from "@/config"
import useUserStore from "@/stores/modules/user";
+import { useDictData } from "@/hooks/useDictOptions"
+
+
+// const { dictData } = useDictData('tax_rate ')
+
const protype = reactive([])
const base_url = configs.baseUrl + configs.urlPrefix
const userStore = useUserStore();
@@ -197,7 +215,7 @@ const contract_no = ref('')
const supplier_name = ref('')
const supplier_code = ref('')
const userInfo = userStore.userInfo
-console.log(userInfo, '222222')
+// console.log(dictData, '222222')
// 上传文件
const handleAvatarSuccess_four = (
response,
@@ -364,8 +382,7 @@ const handleSubmit = async () => {
const data = { ...formData }
- console.log(data, "data")
- return
+
mode.value == 'edit'
? await apifinancereceiptEdit(data)
diff --git a/src/views/finance_receipt_record/index.vue b/src/views/finance_receipt_record/index.vue
index d4c7527..130cd6f 100644
--- a/src/views/finance_receipt_record/index.vue
+++ b/src/views/finance_receipt_record/index.vue
@@ -115,7 +115,7 @@ const handleSelectionChange = (val: any[]) => {
}
// 获取字典数据
-const { dictData } = useDictData('invoice_type,contract_type')
+const { dictData } = useDictData('invoice_type,contract_type,tax_rate')
// 分页相关
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apifinancereceiptLists,
diff --git a/src/views/finance_refund_record/edit.vue b/src/views/finance_refund_record/edit.vue
index 92874db..a20b26b 100644
--- a/src/views/finance_refund_record/edit.vue
+++ b/src/views/finance_refund_record/edit.vue
@@ -19,7 +19,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="退款日期" prop="refund_date">
- <el-date-picker class="flex-1 !flex" v-model="formData.refund_date" clearable type="datetime"
+ <el-date-picker class="flex-1 !flex" v-model="formData.refund_date" clearable
value-format="YYYY-MM-DD" placeholder="选择日期">
</el-date-picker>
</el-form-item>
@@ -144,7 +144,7 @@
<el-form-item label="开始计息日期" prop="interest_calculation_start_date">
<el-date-picker class="flex-1 !flex" v-model="formData.interest_calculation_start_date"
- clearable type="datetime" value-format="YYYY-MM-DD" placeholder="选择日期">
+ clearable value-format="YYYY-MM-DD" placeholder="选择日期">
</el-date-picker>
</el-form-item>
diff --git a/src/views/financialManagement/Administrative/administrative_payments/edit.vue b/src/views/financialManagement/Administrative/administrative_payments/edit.vue
index 5a241ff..b5fb231 100644
--- a/src/views/financialManagement/Administrative/administrative_payments/edit.vue
+++ b/src/views/financialManagement/Administrative/administrative_payments/edit.vue
@@ -16,7 +16,8 @@
<el-row :gutter="10">
<el-col :span="8">
- <el-form-item label="合同编号" prop="administrative_contract_id" @click="showDialog1 = true" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+ <el-form-item label="合同编号" prop="administrative_contract_id" @click="showDialog1 = true"
+ :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="contract_no" clearable placeholder="请输入合同编号" />
</el-form-item>
</el-col>
@@ -26,7 +27,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="供应商名称" rop="administrative_contract_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+ <el-form-item label="供应商名称" rop="administrative_contract_id"
+ :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="supplier_name" readonly clearable placeholder="请选择客户" />
</el-form-item>
</el-col>
@@ -45,14 +47,17 @@
<el-col :span="8">
<el-form-item label="申请日期" prop="apply_date">
- <el-date-picker class="flex-1 !flex" v-model="formData.apply_date" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择开票日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.apply_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择开票日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24">
- <el-form-item label="付款方式" prop="pay_type" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
+ <el-form-item label="付款方式" prop="pay_type"
+ :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
<el-radio-group v-model="formData.pay_type" placeholder="请选择付款方式">
- <el-radio v-for="(item, index) in dictData.pay_type" :key="index" :label="parseInt(item.value)">
+ <el-radio v-for="(item, index) in dictData.pay_type" :key="index"
+ :label="parseInt(item.value)">
{{ item.name }}
</el-radio>
</el-radio-group>
@@ -70,7 +75,8 @@
</el-col>
<el-col :span="8">
<el-form-item label="本次支付金额" prop="payment_amount">
- <el-input v-model="formData.payment_amount" clearable placeholder="请输入支付金额" @input="amountinput" />
+ <el-input v-model="formData.payment_amount" clearable placeholder="请输入支付金额"
+ @input="amountinput" />
</el-form-item>
</el-col>
@@ -91,7 +97,11 @@
<el-col :span="24">
<el-form-item label="附件" prop="field87">
- <el-upload accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv" class="upload-demo" :show-file-list="false" aria-hidden="true" :headers="{ Token: userStore.token }" :action="base_url + '/upload/file'" :on-success="handleAvatarSuccess_four" ref="upload">
+ <el-upload
+ accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv"
+ class="upload-demo" :show-file-list="false" aria-hidden="true"
+ :headers="{ Token: userStore.token }" :action="base_url + '/upload/file'"
+ :on-success="handleAvatarSuccess_four" ref="upload">
<el-button type="primary">
上传
</el-button>
@@ -99,7 +109,8 @@
<div>
<div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
- <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
+ <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
+ target="_blank">{{ item.name }}</a>
<span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
</div>
</div>
diff --git a/src/views/financialManagement/bankAccount/interestRate/index.vue b/src/views/financialManagement/bankAccount/interestRate/index.vue
index adf8217..62603eb 100644
--- a/src/views/financialManagement/bankAccount/interestRate/index.vue
+++ b/src/views/financialManagement/bankAccount/interestRate/index.vue
@@ -58,7 +58,7 @@
</el-table-column>
<el-table-column label="签约日期" prop="signing_date">
<template #default="{ row }">
- <span>{{ row.signing_date ? timeFormat(row.signing_date, 'yyyy-mm-dd hh:MM:ss') : '' }}</span>
+ <span>{{ row.signing_date ? timeFormat(row.signing_date, 'YYYY-MM-DD ') : '' }}</span>
</template>
</el-table-column>
diff --git a/src/views/financialManagement/bankAccount/revenueWater/edit.vue b/src/views/financialManagement/bankAccount/revenueWater/edit.vue
index b7ddfe2..1ecc57c 100644
--- a/src/views/financialManagement/bankAccount/revenueWater/edit.vue
+++ b/src/views/financialManagement/bankAccount/revenueWater/edit.vue
@@ -259,7 +259,7 @@ const setFormData = async (data: Record<any, any>) => {
amountinput(data.amount_daxie)
}
//@ts-ignore
- formData.signing_date = timeFormat(formData.signing_date, 'yyyy-mm-dd hh:MM:ss')
+ formData.signing_date = timeFormat(formData.signing_date, 'YYYY-MM-DD ')
}
const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/financialManagement/draft/acceptance_bill/edit.vue b/src/views/financialManagement/draft/acceptance_bill/edit.vue
index 0ad0956..61ce895 100644
--- a/src/views/financialManagement/draft/acceptance_bill/edit.vue
+++ b/src/views/financialManagement/draft/acceptance_bill/edit.vue
@@ -63,8 +63,8 @@
<el-col :span="8">
<el-form-item label="收票日期" prop="receipt_date"
:rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.receipt_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择收票日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.receipt_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择收票日期">
</el-date-picker>
</el-form-item>
</el-col>
@@ -114,8 +114,8 @@
<el-col :span="8">
<el-form-item label="汇票到期日期" prop="bill_due_date"
:rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.bill_due_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择汇票到期日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.bill_due_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择汇票到期日期">
</el-date-picker>
</el-form-item>
</el-col>
diff --git a/src/views/financialManagement/expense_reimbursement/edit.vue b/src/views/financialManagement/expense_reimbursement/edit.vue
index b513fb5..52cd798 100644
--- a/src/views/financialManagement/expense_reimbursement/edit.vue
+++ b/src/views/financialManagement/expense_reimbursement/edit.vue
@@ -28,7 +28,7 @@
<el-form-item label="报销日期" prop="reimbursement_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
<el-date-picker class="flex-1 !flex" v-model="formData.reimbursement_date" clearable
- type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择报销日期">
+ value-format="YYYY-MM-DD " placeholder="选择报销日期">
</el-date-picker>
</el-form-item>
</el-col>
diff --git a/src/views/ordermanagement/saleorder/edit.vue b/src/views/ordermanagement/saleorder/edit.vue
index bb68a88..d94b5d9 100644
--- a/src/views/ordermanagement/saleorder/edit.vue
+++ b/src/views/ordermanagement/saleorder/edit.vue
@@ -113,8 +113,8 @@
</el-col>
<el-col :span="8">
<el-form-item label="开始日期" prop="contract_id">
- <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择结束日期
+ <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择结束日期
">
</el-date-picker>
</el-form-item>
@@ -122,8 +122,8 @@
<el-col :span="8">
<el-form-item label="结束日期" prop="contract_id">
- <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择结束日期
+ <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择结束日期
"> </el-date-picker>
</el-form-item>
</el-col>
@@ -174,8 +174,8 @@
<el-col :span="8">
<el-form-item label="签约日期" prop="contract_id">
- <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择签约日期
+ <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择签约日期
"> </el-date-picker>
</el-form-item>
</el-col>
diff --git a/src/views/procurement_contract/edit.vue b/src/views/procurement_contract/edit.vue
index 1bde722..74f4ca7 100644
--- a/src/views/procurement_contract/edit.vue
+++ b/src/views/procurement_contract/edit.vue
@@ -54,7 +54,7 @@
<el-form-item label="签约日期" prop="signing_date"
:rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.signing_date" clearable type="datetime"
+ <el-date-picker class="flex-1 !flex" v-model="formData.signing_date" clearable
value-format="YYYY-MM-DD " placeholder="选择签约日期">
</el-date-picker>
</el-form-item>
diff --git a/src/views/procurement_contract_change/edit.vue b/src/views/procurement_contract_change/edit.vue
index 56d013b..0ff5922 100644
--- a/src/views/procurement_contract_change/edit.vue
+++ b/src/views/procurement_contract_change/edit.vue
@@ -220,8 +220,8 @@
</el-table-column>
<el-table-column label="计划付款日期" prop="pay_date">
<template #default="{ row }">
- <el-date-picker v-model="row.pay_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择签订日期">
+ <el-date-picker v-model="row.pay_date" clearable value-format="YYYY-MM-DD "
+ placeholder="选择签订日期">
</el-date-picker>
</template></el-table-column>
<el-table-column label="金额" prop="pay_amount">
@@ -442,7 +442,7 @@ const setFormData = async (data: Record<any, any>) => {
}
//@ts-ignore
- formData.signing_date = timeFormat(formData.signing_date, 'yyyy-mm-dd hh:MM:ss')
+ formData.signing_date = timeFormat(formData.signing_date, 'YYYY-MM-DD ')
}
const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/procurement_contract_change/index.vue b/src/views/procurement_contract_change/index.vue
index d7321d1..fb3b064 100644
--- a/src/views/procurement_contract_change/index.vue
+++ b/src/views/procurement_contract_change/index.vue
@@ -67,7 +67,7 @@
</el-table-column>
<el-table-column label="签订日期" prop="signing_date">
<template #default="{ row }">
- <span>{{ row.signing_date ? timeFormat(row.signing_date, 'yyyy-mm-dd hh:MM:ss') : '' }}</span>
+ <span>{{ row.signing_date ? timeFormat(row.signing_date, 'YYYY-MM-DD ') : '' }}</span>
</template>
</el-table-column>
<el-table-column label="付款方式" prop="pay_type">
diff --git a/src/views/project/edit.vue b/src/views/project/edit.vue
index bc4767f..a9e4585 100644
--- a/src/views/project/edit.vue
+++ b/src/views/project/edit.vue
@@ -110,10 +110,16 @@
<el-col :span="8">
<el-form-item label="发现时间" prop="discovery_time"
:rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.discovery_time" clearable type="datetime"
- value-format="YYYY-MM-DD" placeholder="选择发现时间">
+ <el-date-picker class="flex-1 !flex" v-model="formData.discovery_time" clearable type="date"
+ value-format="YYYY-MM-DD" placeholder="选择投标时间">
</el-date-picker>
</el-form-item>
+
+ <!-- <el-form-item label="投标时间" prop="bidding_time">
+ <el-date-picker class="flex-1 !flex" v-model="formData.bidding_time" clearable type="date"
+ value-format="YYYY-MM-DD" placeholder="选择投标时间">
+ </el-date-picker>
+ </el-form-item> -->
</el-col>
<el-col :span="8">
<el-form-item label="信息来源" prop="information_sources"
diff --git a/src/views/project_alarm/outputvalue/details/edit.vue b/src/views/project_alarm/outputvalue/details/edit.vue
index 6a72c14..05ee74f 100644
--- a/src/views/project_alarm/outputvalue/details/edit.vue
+++ b/src/views/project_alarm/outputvalue/details/edit.vue
@@ -101,8 +101,8 @@
</el-table-column>
<el-table-column label="分部工程" prop="pay_date">
<template #default="{ row }">
- <el-date-picker v-model="row.pay_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择签订日期">
+ <el-date-picker v-model="row.pay_date" clearable value-format="YYYY-MM-DD "
+ placeholder="选择签订日期">
</el-date-picker>
</template></el-table-column>
<el-table-column label="子分部工程" prop="pay_amount">
diff --git a/src/views/project_alarm/outputvalue/report/edit.vue b/src/views/project_alarm/outputvalue/report/edit.vue
index 6a72c14..05ee74f 100644
--- a/src/views/project_alarm/outputvalue/report/edit.vue
+++ b/src/views/project_alarm/outputvalue/report/edit.vue
@@ -101,8 +101,8 @@
</el-table-column>
<el-table-column label="分部工程" prop="pay_date">
<template #default="{ row }">
- <el-date-picker v-model="row.pay_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择签订日期">
+ <el-date-picker v-model="row.pay_date" clearable value-format="YYYY-MM-DD "
+ placeholder="选择签订日期">
</el-date-picker>
</template></el-table-column>
<el-table-column label="子分部工程" prop="pay_amount">
diff --git a/src/views/project_alarm/warningrecords/edit.vue b/src/views/project_alarm/warningrecords/edit.vue
index 6a72c14..05ee74f 100644
--- a/src/views/project_alarm/warningrecords/edit.vue
+++ b/src/views/project_alarm/warningrecords/edit.vue
@@ -101,8 +101,8 @@
</el-table-column>
<el-table-column label="分部工程" prop="pay_date">
<template #default="{ row }">
- <el-date-picker v-model="row.pay_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择签订日期">
+ <el-date-picker v-model="row.pay_date" clearable value-format="YYYY-MM-DD "
+ placeholder="选择签订日期">
</el-date-picker>
</template></el-table-column>
<el-table-column label="子分部工程" prop="pay_amount">
diff --git a/src/views/project_attendance_detail/edit.vue b/src/views/project_attendance_detail/edit.vue
index b513f09..6dac551 100644
--- a/src/views/project_attendance_detail/edit.vue
+++ b/src/views/project_attendance_detail/edit.vue
@@ -43,14 +43,14 @@
<el-col :span="8">
<el-form-item label="上班时间" prop="work_start_time">
<el-date-picker class="flex-1 !flex" clearable v-model="formData.work_start_time"
- type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择日期">
+ value-format="YYYY-MM-DD " placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="下班时间" prop="work_end_time">
- <el-date-picker class="flex-1 !flex" clearable v-model="formData.work_end_time" type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择日期">
+ <el-date-picker class="flex-1 !flex" clearable v-model="formData.work_end_time"
+ value-format="YYYY-MM-DD " placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
diff --git a/src/views/project_attendance_record/edit.vue b/src/views/project_attendance_record/edit.vue
index e7ef6e3..3fb6ba2 100644
--- a/src/views/project_attendance_record/edit.vue
+++ b/src/views/project_attendance_record/edit.vue
@@ -58,6 +58,16 @@
</el-form-item>
</el-col>
+
+
+ <div class="tit">考勤记录清单</div>
+
+
+
+
+
+
+
</el-row>
</el-form>
</popup>
diff --git a/src/views/project_cost_temp_set/edit.vue b/src/views/project_cost_temp_set/edit.vue
index 38015ca..b340830 100644
--- a/src/views/project_cost_temp_set/edit.vue
+++ b/src/views/project_cost_temp_set/edit.vue
@@ -4,18 +4,20 @@
<el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
<el-row>
<el-col :span="8">
- <el-form-item label="项目类型" prop="project_id" @click="showDialog = true" :rules="[{ required: true, message: '不可为空', trigger: 'cahange' }]">
+ <el-form-item label="项目类型" prop="project_type_id" @click="showDialog = true"
+ :rules="[{ required: true, message: '不可为空', trigger: 'cahange' }]">
<el-select class="w-[280px]" v-model="formData.project_type_id" clearable placeholder="请选择项目类型">
- <el-option label="全部" value=""></el-option>
- <el-option v-for="(item, index) in list" :key="index" :label="item.name" :value="parseInt(item.id)" />
+ <el-option v-for="(item, index) in list" :key="index" :label="item.name"
+ :value="(item.id)" />
</el-select>
</el-form-item> </el-col>
<el-col :span="8">
<el-form-item label="科目编码" prop="formData.subject_code">
- <el-input v-model="formData.subject_code" clearable disabled placeholder="系统自动生成" />
+ <el-input v-model="formData.subject_code" clearable />
</el-form-item> </el-col>
<el-col :span="8">
- <el-form-item label="一级科目" prop="first_level_subject" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+ <el-form-item label="一级科目" prop="first_level_subject"
+ :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="formData.first_level_subject" clearable placeholder="请输入一级科目" />
</el-form-item> </el-col>
<el-col :span="8">
@@ -36,7 +38,8 @@
<el-form-item label="差旅科目" prop="is_travel">
<el-select class="w-[280px]" v-model="formData.is_travel" clearable placeholder="请选择的是否属于差旅科目">
- <el-option v-for="(item, index) in list1" :key="index" :label="item.name" :value="parseInt(item.id)" />
+ <el-option v-for="(item, index) in list1" :key="index" :label="item.name"
+ :value="parseInt(item.id)" />
</el-select>
</el-form-item>
</el-col>
diff --git a/src/views/project_estimate/edit.vue b/src/views/project_estimate/edit.vue
index 50a516e..cebb9d6 100644
--- a/src/views/project_estimate/edit.vue
+++ b/src/views/project_estimate/edit.vue
@@ -312,7 +312,7 @@ const setFormData = async (data: Record<any, any>) => {
Object.assign(formDataannex, arry1)
}
//@ts-ignore
- // formData.quotation_date = timeFormat(formData.quotation_date, 'yyyy-mm-dd hh:MM:ss')
+ // formData.quotation_date = timeFormat(formData.quotation_date, 'YYYY-MM-DD ')
}
const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/project_finance/expense_reimbursement/edit.vue b/src/views/project_finance/expense_reimbursement/edit.vue
index 7d32713..fb28c50 100644
--- a/src/views/project_finance/expense_reimbursement/edit.vue
+++ b/src/views/project_finance/expense_reimbursement/edit.vue
@@ -131,8 +131,8 @@
</el-table-column>
<el-table-column label="三级科目" prop="pay_date">
<template #default="{ row }">
- <el-date-picker v-model="row.pay_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择签订日期">
+ <el-date-picker v-model="row.pay_date" clearable value-format="YYYY-MM-DD "
+ placeholder="选择签订日期">
</el-date-picker>
</template></el-table-column>
<el-table-column label="交通" prop="pay_amount">
diff --git a/src/views/project_finance/travel_reimbursement/edit.vue b/src/views/project_finance/travel_reimbursement/edit.vue
index f5e821f..185edc8 100644
--- a/src/views/project_finance/travel_reimbursement/edit.vue
+++ b/src/views/project_finance/travel_reimbursement/edit.vue
@@ -131,8 +131,8 @@
</el-table-column>
<el-table-column label="三级科目" prop="pay_date">
<template #default="{ row }">
- <el-date-picker v-model="row.pay_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择签订日期">
+ <el-date-picker v-model="row.pay_date" clearable value-format="YYYY-MM-DD "
+ placeholder="选择签订日期">
</el-date-picker>
</template></el-table-column>
<el-table-column label="交通" prop="pay_amount">
diff --git a/src/views/project_follow_up/edit.vue b/src/views/project_follow_up/edit.vue
index 792858c..f8d4d09 100644
--- a/src/views/project_follow_up/edit.vue
+++ b/src/views/project_follow_up/edit.vue
@@ -243,9 +243,9 @@ const setFormData = async (data: Record<any, any>) => {
}
//@ts-ignore
- // formData.follow_date = timeFormat(formData.follow_date, 'yyyy-mm-dd hh:MM:ss')
+ // formData.follow_date = timeFormat(formData.follow_date, 'YYYY-MM-DD ')
//@ts-ignore
- // formData.next_follow_up_date = timeFormat(formData.next_follow_up_date, 'yyyy-mm-dd hh:MM:ss')
+ // formData.next_follow_up_date = timeFormat(formData.next_follow_up_date, 'YYYY-MM-DD ')
}
const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/project_logs/edit.vue b/src/views/project_logs/edit.vue
index 361053e..71e86da 100644
--- a/src/views/project_logs/edit.vue
+++ b/src/views/project_logs/edit.vue
@@ -24,8 +24,8 @@
<el-col :span="8">
<el-form-item label="日期" prop="date"
:rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择下次回访日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择下次回访日期">
</el-date-picker>
</el-form-item>
</el-col>
@@ -53,7 +53,7 @@
<el-col :span="8">
<el-form-item label="下次回访日期" prop="next_follow_up_date">
<el-date-picker class="flex-1 !flex" v-model="formData.next_follow_up_date" clearable
- type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择下次回访日期">
+ value-format="YYYY-MM-DD " placeholder="选择下次回访日期">
</el-date-picker>
</el-form-item>
</el-col>
diff --git a/src/views/project_manager_appointment/edit.vue b/src/views/project_manager_appointment/edit.vue
index e8c46e0..2defb09 100644
--- a/src/views/project_manager_appointment/edit.vue
+++ b/src/views/project_manager_appointment/edit.vue
@@ -40,8 +40,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="合同编号" prop="contract_no" @click="showDialog1 = true"
- :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+ <el-form-item label="合同编号" @click="showDialog1 = true">
<el-input v-model="contract_no" clearable placeholder="请选择合同" />
</el-form-item>
</el-col>
@@ -54,7 +53,6 @@
<el-form-item label="项目类型" prop="project_type_id"
:rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-select class="w-[280px]" v-model="formData.project_type_id" clearable placeholder="请选择项目类型">
- <el-option label="全部" value=""></el-option>
<el-option v-for="(item, index) in protype" :key="index" :label="item.name"
:value="item.id" />
</el-select>
diff --git a/src/views/project_profit_set/edit.vue b/src/views/project_profit_set/edit.vue
index 5030516..15b0d50 100644
--- a/src/views/project_profit_set/edit.vue
+++ b/src/views/project_profit_set/edit.vue
@@ -4,14 +4,17 @@
<el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
<el-row>
<el-col :span="8">
- <el-form-item label="项目类型" prop="project_type_id" @click="showDialog = true" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
+ <el-form-item label="项目类型" prop="project_type_id" @click="showDialog = true"
+ :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
<el-select class="w-[280px]" v-model="formData.project_type_id" clearable placeholder="请选择项目类型">
<el-option label="全部" value=""></el-option>
- <el-option v-for="(item, index) in list" :key="index" :label="item.name" :value="parseInt(item.id)" />
+ <el-option v-for="(item, index) in list" :key="index" :label="item.name"
+ :value="parseInt(item.id)" />
</el-select>
</el-form-item> </el-col>
<el-col :span="8">
- <el-form-item label="最低利润率(%)" prop="formData.profit_rate" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+ <el-form-item label="最低利润率(%)" prop="profit_rate"
+ :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="formData.profit_rate" type="number" clearable placeholder="请输入最低利润率(%)" />
</el-form-item> </el-col>
<el-col :span="8">
diff --git a/src/views/project_settlement/edit.vue b/src/views/project_settlement/edit.vue
index 163c48d..0f200a5 100644
--- a/src/views/project_settlement/edit.vue
+++ b/src/views/project_settlement/edit.vue
@@ -239,7 +239,7 @@ const setFormData = async (data: Record<any, any>) => {
}
//@ts-ignore
- formData.recording_time = timeFormat(formData.recording_time, 'yyyy-mm-dd hh:MM:ss')
+ formData.recording_time = timeFormat(formData.recording_time, 'YYYY-MM-DD ')
}
const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/project_settlement/partsettlement/edit.vue b/src/views/project_settlement/partsettlement/edit.vue
index 9133f0f..4b7e173 100644
--- a/src/views/project_settlement/partsettlement/edit.vue
+++ b/src/views/project_settlement/partsettlement/edit.vue
@@ -215,7 +215,7 @@ const setFormData = async (data: Record<any, any>) => {
}
//@ts-ignore
- formData.recording_time = timeFormat(formData.recording_time, 'yyyy-mm-dd hh:MM:ss')
+ formData.recording_time = timeFormat(formData.recording_time, 'YYYY-MM-DD ')
}
const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/project_settlement/partsettlement/index.vue b/src/views/project_settlement/partsettlement/index.vue
index 28f359f..02f0a0a 100644
--- a/src/views/project_settlement/partsettlement/index.vue
+++ b/src/views/project_settlement/partsettlement/index.vue
@@ -85,7 +85,8 @@
<script lang="ts" setup name="projectLists">
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
-import { insurancemanagementLists, insurancemanagementDelete, insurancemanagementDetail } from '@/api/project_salary'
+import { subcontractsettlementLists, subcontractsettlementDelete, subcontractsettlementDetail } from '@/api/project_subcontract_settlement'
+// import { insurancemanagementLists, insurancemanagementDelete, insurancemanagementDetail } from '@/api/project_salary'
import { timeFormat } from '@/utils/util'
import { getAllProjectTypes } from '@/api/projecttype'
const protype = reactive([])
@@ -122,7 +123,7 @@ const handleSelectionChange = (val: any[]) => {
const { dictData } = useDictData('labor_contract_status,labor_contract_type,labor_contract_name')
// 分页相关
const { pager, getLists, resetParams, resetPage } = usePaging({
- fetchFun: insurancemanagementLists,
+ fetchFun: subcontractsettlementLists,
params: queryParams
})
@@ -137,7 +138,7 @@ const handleAdd = async () => {
// 编辑
const handleEdit = async (data: any) => {
console.log(data.id)
- let res = await insurancemanagementDetail({ id: data.id })
+ let res = await subcontractsettlementDetail({ id: data.id })
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
@@ -147,11 +148,11 @@ const handleEdit = async (data: any) => {
// 删除
const handleDelete = async (id: number | any[]) => {
await feedback.confirm('确定要删除？')
- await insurancemanagementDelete({ id })
+ await subcontractsettlementDelete({ id })
getLists()
}
const handledetail = async (data: any) => {
- let res = await insurancemanagementDetail({ id: data.id })
+ let res = await subcontractsettlementDetail({ id: data.id })
showDtail.value = true
await nextTick()
detailRef.value?.open()
diff --git a/src/views/project_settlement/projectclosure/edit.vue b/src/views/project_settlement/projectclosure/edit.vue
index 1e36877..cb7cab3 100644
--- a/src/views/project_settlement/projectclosure/edit.vue
+++ b/src/views/project_settlement/projectclosure/edit.vue
@@ -218,7 +218,7 @@ const setFormData = async (data: Record<any, any>) => {
}
//@ts-ignore
- formData.recording_time = timeFormat(formData.recording_time, 'yyyy-mm-dd hh:MM:ss')
+ formData.recording_time = timeFormat(formData.recording_time, 'YYYY-MM-DD ')
}
const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/project_subcontract_settlement/edit.vue b/src/views/project_subcontract_settlement/edit.vue
index b6a6388..9ed742e 100644
--- a/src/views/project_subcontract_settlement/edit.vue
+++ b/src/views/project_subcontract_settlement/edit.vue
@@ -239,7 +239,7 @@ const setFormData = async (data: Record<any, any>) => {
}
//@ts-ignore
- formData.recording_time = timeFormat(formData.recording_time, 'yyyy-mm-dd hh:MM:ss')
+ formData.recording_time = timeFormat(formData.recording_time, 'YYYY-MM-DD ')
}
const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/redemption_bill/edit.vue b/src/views/redemption_bill/edit.vue
index a144450..5e2e7b3 100644
--- a/src/views/redemption_bill/edit.vue
+++ b/src/views/redemption_bill/edit.vue
@@ -57,8 +57,8 @@
<el-col :span="8">
<el-form-item label="汇票到期日期" prop="acceptance_bill_id"
:rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
- <el-date-picker class="flex-1 !flex" readonly v-model="bill_due_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择汇票到期日期">
+ <el-date-picker class="flex-1 !flex" readonly v-model="bill_due_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择汇票到期日期">
</el-date-picker>
</el-form-item>
</el-col>
@@ -82,8 +82,8 @@
<el-col :span="8">
<el-form-item label="兑现日期" prop="maturity_date"
:rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
- <el-date-picker class="flex-1 !flex" v-model="formData.maturity_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择兑现日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.maturity_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择兑现日期">
</el-date-picker>
</el-form-item>
</el-col>
diff --git a/src/views/refundbidDeposit/index.vue b/src/views/refundbidDeposit/index.vue
index 30bec2d..32a161f 100644
--- a/src/views/refundbidDeposit/index.vue
+++ b/src/views/refundbidDeposit/index.vue
@@ -3,8 +3,8 @@
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="退款日期" prop="refund_date">
- <el-date-picker class="flex-1 !flex" v-model="queryParams.refund_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择日期">
+ <el-date-picker class="flex-1 !flex" v-model="queryParams.refund_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="银行账号" prop="bank_account_id">
diff --git a/src/views/subcontracting_contract_negotiation/edit.vue b/src/views/subcontracting_contract_negotiation/edit.vue
index 9fe4b6c..f275180 100644
--- a/src/views/subcontracting_contract_negotiation/edit.vue
+++ b/src/views/subcontracting_contract_negotiation/edit.vue
@@ -48,7 +48,7 @@
<el-col :span="8">
<el-form-item label="签订日期" prop="sign_date">
- <el-date-picker class="flex-1 !flex" v-model="formData.sign_date" clearable type="datetime"
+ <el-date-picker class="flex-1 !flex" v-model="formData.sign_date" clearable
value-format="YYYY-MM-DD" placeholder="选择签订日期">
</el-date-picker>
</el-form-item>
@@ -76,7 +76,7 @@
<el-col :span="8">
<el-form-item label="洽商质保到期时间" prop="Warranty_expire_date">
<el-date-picker class="flex-1 !flex" v-model="formData.Warranty_expire_date" clearable
- type="datetime" value-format="YYYY-MM-DD" placeholder="选择洽商质保到期时间">
+ value-format="YYYY-MM-DD" placeholder="选择洽商质保到期时间">
</el-date-picker>
</el-form-item> </el-col>
@@ -323,7 +323,7 @@ const setFormData = async (data: Record<any, any>) => {
}
//@ts-ignore
- formData.signing_date = timeFormat(formData.signing_date, 'yyyy-mm-dd hh:MM:ss')
+ formData.signing_date = timeFormat(formData.signing_date, 'YYYY-MM-DD ')
}
const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/transfer_bill/edit.vue b/src/views/transfer_bill/edit.vue
index 484935a..3bd4ecd 100644
--- a/src/views/transfer_bill/edit.vue
+++ b/src/views/transfer_bill/edit.vue
@@ -112,15 +112,15 @@
<el-col :span="8">
<el-form-item label="汇票到期日期" prop="acceptance_bill_id"
:rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
- <el-date-picker class="flex-1 !flex" v-model="bill_due_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择汇票到期日期">
+ <el-date-picker class="flex-1 !flex" v-model="bill_due_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择汇票到期日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="付款日期" prop="payment_date">
- <el-date-picker class="flex-1 !flex" v-model="formData.payment_date" clearable type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择付款日期">
+ <el-date-picker class="flex-1 !flex" v-model="formData.payment_date" clearable
+ value-format="YYYY-MM-DD " placeholder="选择付款日期">
</el-date-picker>
</el-form-item>
</el-col>