bug修改

src/views/finance/cash/refundInfo.vue

@@ -1,6 +1,10 @@
 <template>
     <div class="app-container">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item label="回款编号" prop="refundInfoUuid">
+        <el-input v-model="queryParams.refundInfoUuid" placeholder="请输入回款编号" clearable style="width: 250px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
         <el-form-item label="回款标题" prop="refundTitle">
           <el-input v-model="queryParams.refundTitle" placeholder="请输入回款标题" clearable style="width: 250px"
             @keyup.enter.native="handleQuery" />
@@ -44,9 +48,9 @@
       </el-row>
 
       <el-table v-loading="loading" :data="dataList">
+        <el-table-column label="回款编号" align="center" prop="refundInfoUuid" min-width="350" />
         <el-table-column label="回款标题" align="center" prop="refundTitle" min-width="150" />
-        <!-- <el-table-column label="回款编号" align="center" prop="refundInfoUuid" min-width="100" /> -->
-        <el-table-column label="客户名称" align="center" prop="customerName" min-width="100" />
+        <el-table-column label="客户名称" align="center" prop="customerName" min-width="200" />
         <el-table-column label="合同名称" align="center" prop="contractName" min-width="100" />
         <el-table-column label="回款日期" align="center" prop="refundDate" min-width="100" />
         <el-table-column label="回款金额" align="center" prop="refundMoney" min-width="100" />
@@ -56,7 +60,7 @@
             <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="150">
+        <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width" min-width="150">
           <template v-slot="scope">
             <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
               v-hasPermi="['cash:refund-info:update']">修改</el-button>
@@ -292,6 +296,7 @@
         queryParams: {
           pageNo: 1,
           pageSize: 10,
+          refundInfoUuid:undefined,
           refundTitle: undefined,
           customerId: undefined,
           contractName: undefined,

src/views/finance/contract/customer/index.vue

@@ -102,7 +102,7 @@
       <el-table-column label="客户" align="center" prop="customerName" min-width="150" />
       <el-table-column label="合同开始日期" align="center" prop="startDate" min-width="100" />
       <el-table-column label="合同结束日期" align="center" prop="endDate" min-width="100" />
-      <el-table-column label="合同金额" align="center" prop="money" min-width="100" />
+      <el-table-column label="合同金额(元)" align="center" prop="money" min-width="100" />
       <el-table-column label="负责人" align="center" prop="ownerEmployeeName" min-width="100" />
       <el-table-column label="所属部门" align="center" prop="deptName" min-width="100"/>
 
@@ -281,7 +281,7 @@
           <div class="fx-field x-grid-col-12">
             <div class="field-label">
               <span class="field-required">*</span>
-              <div class="field-name">合同金额</div>
+              <div class="field-name">合同金额(元)</div>
             </div>
             <div class="field-component">
               <span :title="form.money">{{ form.money }}</span>
@@ -304,6 +304,33 @@
               <span :title="form.deptName">{{ form.deptName }}</span>
             </div>
           </div>
+          <div class="fx-field x-grid-col-12" v-if="form.closeReason">
+            <div class="field-label">
+              <span class="field-required">*</span>
+              <div class="field-name">关闭原因</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.closeReason">{{ form.closeReason }}</span>
+            </div>
+          </div>
+          <div class="fx-field x-grid-col-12" v-if="form.terminateDate">
+            <div class="field-label">
+              <span class="field-required">*</span>
+              <div class="field-name">终止日期</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.terminateDate">{{ form.terminateDate }}</span>
+            </div>
+          </div>
+          <div class="fx-field x-grid-col-12" v-if="form.terminateReason">
+            <div class="field-label">
+              <span class="field-required">*</span>
+              <div class="field-name">终止原因</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.terminateReason">{{ form.terminateReason }}</span>
+            </div>
+          </div>
 
           <div class="fx-field x-grid-col-12">
             <div class="field-label">
@@ -442,16 +469,16 @@ export default {
           { required: true, message: '请输入合同名称', trigger: 'blur' },
         ],
         isFrameContract: [
-          { required: true, message: '请选择是否框架合同', trigger: 'blur' }
+          { required: true, message: '请选择是否框架合同', trigger: 'change' }
         ],
         customerId: [
-          { required: true, message: '请选择客户', trigger: 'blur' }
+          { required: true, message: '请选择客户', trigger: 'change' }
         ],
         startDate: [
-          { required: true, message: '请选择开始日期', trigger: 'blur' }
+          { required: true, message: '请选择开始日期', trigger: 'change' }
         ],
         endDate: [
-          { required: true, message: '请选择结束日期', trigger: 'blur' }
+          { required: true, message: '请选择结束日期', trigger: 'change' }
         ],
         money: [
           { required: true, message: '请输入金额', trigger: 'blur' },

src/views/finance/contract/supplier/index.vue

@@ -99,7 +99,7 @@
       <el-table-column label="供应商" align="center" prop="supplierName" min-width="150" />
       <el-table-column label="合同开始日期" align="center" prop="startDate" min-width="100" />
       <el-table-column label="合同结束日期" align="center" prop="endDate" min-width="100" />
-      <el-table-column label="合同金额" align="center" prop="money" min-width="100" />
+      <el-table-column label="合同金额(元)" align="center" prop="money" min-width="100" />
       <el-table-column label="负责人" align="center" prop="ownerEmployeeName" min-width="100" />
       <el-table-column label="所属部门" align="center" prop="deptName" min-width="100"/>
 
@@ -275,7 +275,7 @@
           <div class="fx-field x-grid-col-12">
             <div class="field-label">
               <span class="field-required">*</span>
-              <div class="field-name">合同金额</div>
+              <div class="field-name">合同金额(元)</div>
             </div>
             <div class="field-component">
               <span :title="form.money">{{ form.money }}</span>
@@ -298,7 +298,33 @@
               <span :title="form.deptName">{{ form.deptName }}</span>
             </div>
           </div>
-
+          <div class="fx-field x-grid-col-12" v-if="form.closeReason">
+            <div class="field-label">
+              <span class="field-required">*</span>
+              <div class="field-name">关闭原因</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.closeReason">{{ form.closeReason }}</span>
+            </div>
+          </div>
+          <div class="fx-field x-grid-col-12" v-if="form.terminateDate">
+            <div class="field-label">
+              <span class="field-required">*</span>
+              <div class="field-name">终止日期</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.terminateDate">{{ form.terminateDate }}</span>
+            </div>
+          </div>
+          <div class="fx-field x-grid-col-12" v-if="form.terminateReason">
+            <div class="field-label">
+              <span class="field-required">*</span>
+              <div class="field-name">终止原因</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.terminateReason">{{ form.terminateReason }}</span>
+            </div>
+          </div>
           <div class="fx-field x-grid-col-12">
             <div class="field-label">
               <div class="field-name">附件</div>
@@ -434,16 +460,16 @@ export default {
           { required: true, message: '请输入合同名称', trigger: 'blur' },
         ],
         isFrameContract: [
-          { required: true, message: '请选择是否框架合同', trigger: 'blur' }
+          { required: true, message: '请选择是否框架合同', trigger: 'change' }
         ],
         supplierName: [
-          { required: true, message: '请选择供应商', trigger: 'blur' }
+          { required: true, message: '请选择供应商', trigger: 'change' }
         ],
         startDate: [
-          { required: true, message: '请选择开始日期', trigger: 'blur' }
+          { required: true, message: '请选择开始日期', trigger: 'change' }
         ],
         endDate: [
-          { required: true, message: '请选择结束日期', trigger: 'blur' }
+          { required: true, message: '请选择结束日期', trigger: 'change' }
         ],
         money: [
           { required: true, message: '请输入金额', trigger: 'blur' },

src/views/finance/expense/info/index.vue

@@ -34,12 +34,12 @@
           type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
           :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
-      <el-form-item label="状态" prop="status">
+      <!-- <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="审批" clearable style="width: 250px">
           <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" :key="parseInt(dict.value)"
             :label="dict.label" :value="parseInt(dict.value)" />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -66,17 +66,18 @@
       <el-table-column label="报销类型" align="center" prop="expenseTypeName" min-width="100" />
       <el-table-column label="费用所属期间" align="center" prop="expenseMonth" min-width="100" />
       <el-table-column label="报销总金额(元)" align="center" prop="totalMoney" min-width="100" />
+      <el-table-column label="数据来源" align="center" prop="infoSourceDesc" min-width="100" />
       <el-table-column label="创建人" align="center" prop="createEmployeeName" min-width="80" />
       <el-table-column label="创建时间" align="center" prop="createTime" min-width="150">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="status" min-width="100">
+      <!-- <el-table-column label="状态" align="center" prop="status" min-width="100">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="120">
         <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"

src/views/finance/expense/type/data.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="报销类型" prop="expenseTypeId">
+      <el-form-item label="报销类型">
         <el-select v-model="queryParams.expenseTypeId">
           <el-option v-for="item in typeOptions" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)"/>
         </el-select>
@@ -30,7 +30,7 @@
     <el-table v-loading="loading" :data="dataList" >
       <!-- <el-table-column label="报销类型" align="center" prop="expenseTypeName" /> -->
       <el-table-column label="费用项目" align="center" prop="name" />
-      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" />
+      <el-table-column label="创建人" align="center" prop="createEmployeeName" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -189,8 +189,8 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
-      this.queryParams.expenseTypeId = this.defaultDictType;
+      // this.resetForm("queryForm");
+      this.queryParams.name = undefined;
       this.handleQuery();
     },
     /** 新增按钮操作 */

src/views/finance/expense/type/index.vue

@@ -4,10 +4,10 @@
       <el-form-item label="报销类型" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入报销类型名称" clearable style="width: 240px" @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
+      <!-- <el-form-item label="创建时间" prop="createTime">
         <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
                         range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -34,12 +34,14 @@
           </router-link>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" />
+      <el-table-column label="创建人" align="center" prop="createEmployeeName" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" />
+      
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"

src/views/stamp/sealList/index.vue

@@ -38,6 +38,7 @@
             <span>{{ scope.row.status == 1 ? '打开' : '关闭'}}</span>
           </template>
         </el-table-column>
+        <el-table-column label="创建人" align="center" prop="createEmployeeName" min-width="80" />
         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
           <template v-slot="scope">
             <span>{{ parseTime(scope.row.createTime) }}</span>