瀏覽代碼

财务模块代码提交

wangqiang 1 年之前
父節點
當前提交
e2fa2133de

+ 3 - 3
src/views/cw/workClientInfo/WorkClientAddForm.vue

@@ -396,7 +396,7 @@
                         :disabled="disabled_up || status === 'audit' || status === 'taskFormDetail'"
                         v-model="inputForm.cwWorkClientTypeDTO.releaseDate"
                         type="date"
-                        value-format="yyyy-MM-dd"
+                        value-format="YYYY-MM-DD"
                         placeholder="选择发行日期"
                         style="width:100%"
                         placement="bottom-start"
@@ -412,7 +412,7 @@
                         :disabled="disabled_up || status === 'audit' || status === 'taskFormDetail'"
                         v-model="inputForm.cwWorkClientTypeDTO.listedDate"
                         type="date"
-                        value-format="yyyy-MM-dd"
+                        value-format="YYYY-MM-DD"
                         placeholder="选择上市日期"
                         style="width:100%"
                         placement="bottom-start"
@@ -462,7 +462,7 @@
                       <el-date-picker
                         v-model="inputForm.cwWorkClientTypeDTO.undertakeBusinessDate"
                         type="date"
-                        value-format="yyyy-MM-dd"
+                        value-format="YYYY-MM-DD"
                         placeholder="选择首次承接业务日期"
                         style="width:100%"
                         placement="bottom-start"

+ 15 - 15
src/views/cw/workClientInfo/WorkClientForm.vue

@@ -284,10 +284,10 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="创建时间" prop="createDate"
+                  <el-form-item label="创建时间" prop="createTime"
                                 :rules="[
                    ]">
-                    <el-input :disabled="true" v-model="inputForm.createDate" placeholder="请填写创建时间" clearable></el-input>
+                    <el-input :disabled="true" v-model="inputForm.createTime" placeholder="请填写创建时间" clearable></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -378,7 +378,7 @@
                       :disabled="disabled_up || method==='view'"
                       v-model="inputForm.cwWorkClientTypeDTO.releaseDate"
                       type="date"
-                      value-format="yyyy-MM-dd"
+                      value-format="YYYY-MM-DD"
                       placeholder="选择发行日期"
                       style="width:100%"
                       placement="bottom-start"
@@ -394,7 +394,7 @@
                       :disabled="disabled_up || method==='view'"
                       v-model="inputForm.cwWorkClientTypeDTO.listedDate"
                       type="date"
-                      value-format="yyyy-MM-dd"
+                      value-format="YYYY-MM-DD"
                       placeholder="选择上市日期"
                       style="width:100%"
                       placement="bottom-start"
@@ -438,13 +438,13 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="首次承接业务日期" prop="cwWorkClientTypeDTO.undertakeBusinessDate"
+                  <el-form-item label="首次承接业务日期" prop="inputForm.cwWorkClientTypeDTO.undertakeBusinessDate"
                                 :rules="[
                    ]">
                     <el-date-picker
                       v-model="inputForm.cwWorkClientTypeDTO.undertakeBusinessDate"
-                      type="date"
-                      value-format="yyyy-MM-dd"
+                      value-format="YYYY-MM-DD"
+					  format="YYYY-MM-DD"
                       placeholder="选择首次承接业务日期"
                       style="width:100%"
                       placement="bottom-start"
@@ -718,7 +718,7 @@
               <vxe-column min-width="160" align="center" title="项目编号" field="projectNumber"></vxe-column>
               <vxe-column min-width="160" align="center" title="项目经理" field="projectMasterName"></vxe-column>
               <vxe-column min-width="160" align="center" title="创建人" field="createName"></vxe-column>
-              <vxe-column min-width="160" align="center" title="创建时间" field="createDate"></vxe-column>
+              <vxe-column min-width="160" align="center" title="创建时间" field="createTime"></vxe-column>
             </vxe-table>
           </el-tab-pane>
           <el-tab-pane label="关联合同" name="contract">
@@ -763,7 +763,7 @@
               <vxe-column min-width="160" align="center" title="合同金额(元)" field="contractAmount"></vxe-column>
               <vxe-column min-width="160" align="center" title="所属部门" field="departmentName"></vxe-column>
               <vxe-column min-width="160" align="center" title="创建人" field="createName"></vxe-column>
-              <vxe-column min-width="160" align="center" title="创建日期" field="createDate"></vxe-column>
+              <vxe-column min-width="160" align="center" title="创建日期" field="createTime"></vxe-column>
             </vxe-table>
           </el-tab-pane>
           <el-tab-pane label="关联报告" name="report">
@@ -814,7 +814,7 @@
               <vxe-column min-width="150" title="所属部门" align="center" field="officeName"></vxe-column>
               <vxe-column min-width="150" title="项目经理" align="center" field="projectMasterName"></vxe-column>
               <vxe-column min-width="120" title="报告创建人" align="center" field="createName"></vxe-column>
-              <vxe-column min-width="180" title="报告创建时间" align="center" field="createDate"></vxe-column>
+              <vxe-column min-width="180" title="报告创建时间" align="center" field="createTime"></vxe-column>
             </vxe-table>
           </el-tab-pane>
           <el-tab-pane label="关联发票" name="invoice">
@@ -925,7 +925,7 @@
         loading: false,
         inputForm: {
           id: '',
-          createDate: '',
+			createTime: '',
           createBy: {
             id: '',
             name: ''
@@ -1128,7 +1128,7 @@
         }
         this.inputForm = {
           id: '',
-          createDate: '',
+			createTime: '',
           createBy: {
             id: '',
             name: this.$store.state.user.name
@@ -1370,8 +1370,8 @@
             this.contactSubmit()
             this.baseSubmit()
             this.inputForm.workAttachmentDtoList = this.$refs.uploadComponent.getDataList()
-            if (this.commonJS.isEmpty(this.inputForm.createDate)) {
-              this.inputForm.createDate = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+            if (this.commonJS.isEmpty(this.inputForm.createTime)) {
+              this.inputForm.createTime = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
             }
             workClientService.saveForm(this.inputForm).then((data) => {
               callback(data.businessTable, data.businessId, this.inputForm)
@@ -1413,7 +1413,7 @@
         this.tableKeyContact = Math.random()
         this.inputForm = {
           id: '',
-          createDate: '',
+			createTime: '',
           createBy: {
             id: '',
             name: ''

+ 6 - 4
src/views/cw/workClientInfo/manageLevelType/ManageLevelTypeListForm.vue

@@ -58,10 +58,12 @@
 <!--          @page-change="currentChangeHandle">-->
 <!--        </vxe-pager>-->
       </div>
-      <span slot="footer" class="dialog-footer">
-      <el-button size="small" @click="close()" icon="el-icon-circle-close">关闭</el-button>
-      <el-button size="small" type="primary" v-if="method != 'view'" @click="getManageLevelType()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
-    </span>
+		<template #footer>
+			<span class="dialog-footer">
+			  <el-button @click="close()" icon="el-icon-circle-close">关闭</el-button>
+			  <el-button type="primary" v-if="method != 'view'" @click="getManageLevelType()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
+			</span>
+		</template>
     </el-dialog>
   </div>
 </template>

+ 6 - 4
src/views/cw/workClientInfo/organizationType/OrganizationTypeListForm.vue

@@ -58,10 +58,12 @@
 <!--          @page-change="currentChangeHandle">-->
 <!--        </vxe-pager>-->
       </div>
-      <span slot="footer" class="dialog-footer">
-      <el-button size="small" @click="close()" icon="el-icon-circle-close">关闭</el-button>
-      <el-button size="small" type="primary" v-if="method != 'view'" @click="getOrganizationType()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
-    </span>
+		<template #footer>
+			<span class="dialog-footer">
+			  <el-button @click="close()" icon="el-icon-circle-close">关闭</el-button>
+			  <el-button type="primary" v-if="method != 'view'" @click="getOrganizationType()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
+			</span>
+		</template>
     </el-dialog>
   </div>
 </template>

+ 5 - 4
src/views/cw/workContract/ContractRegistration.vue

@@ -47,7 +47,7 @@
 				  end-placeholder="结束日期">
 			  </el-date-picker>
 		  </el-form-item>
-		  <el-form-item v-if="showHideItem" prop="createBy" label="创建人:">
+		  <el-form-item v-if="showHideItem" prop="createById" label="创建人:">
 			  <SelectUserTree
 				  ref="companyTree"
 				  :props="{
@@ -56,11 +56,11 @@
                   children: 'children'    // 子级字段名
                 }"
 				  :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"
-				  :value="searchForm.createBy"
+				  :value="searchForm.createById"
 				  :clearable="true"
 				  :accordion="true"
 				  size="default"
-				  @getValue="(value) => {searchForm.createBy=value}"/>
+				  @getValue="(value) => {searchForm.createById=value}"/>
 		  </el-form-item>
 		  <el-form-item  v-if="showHideItem" prop="department" label="所属部门:">
 			  <SelectTree
@@ -288,7 +288,7 @@
           type: '',
           filedType: '',
           contractAmounts: [],
-		  createBy: '',
+			createById: '',
           createId: '',
           department: '',
           status: '',
@@ -873,6 +873,7 @@
             this.refreshList()
           })
         })
+		  this.refreshList()
       },
       // 纸质归档详情
       detailPaperFiled (row) {