浏览代码

Merge remote-tracking branch 'origin/master'

user5 1 年之前
父节点
当前提交
8c328ba449

+ 167 - 0
src/views/cw/projectBusinessType/CwProjectBusinessTypeListForm1.vue

@@ -0,0 +1,167 @@
+<template>
+  <div>
+    <el-dialog
+      :title="title"
+      :close-on-click-modal="false"
+	  draggable
+      width="850px"
+      height="500px"
+      append-to-body
+      @close="close"
+      @keyup.enter.native="getBusinessType"
+      v-model="visible">
+      <div style="height: calc(100% - 50px);">
+        <el-form size="primary" :inline="true" class="query-form" ref="searchForm" :model="searchForm"  @submit.native.prevent>
+          <el-form-item label="业务类型" prop="name">
+            <el-input size="primary" v-model="searchForm.name" placeholder="请输入业务类型" clearable></el-input>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button type="primary" @click="list()" size="primary" icon="el-icon-search">查询</el-button>
+            <el-button @click="resetSearch()" size="primary" icon="el-icon-refresh-right">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <vxe-table
+          border="inner"
+          auto-resize
+          resizable
+          height="450px"
+          :loading="loading"
+          size="small"
+          ref="businessTypeTable"
+          show-header-overflow
+          show-overflow
+          highlight-hover-row
+          :row-config="{isCurrent: true}"
+          :radio-config="{trigger: 'row'}"
+          :menu-config="{}"
+          :sort-config="{remote:true}"
+          :data="dataList"
+          :tree-config="{transform: true, rowField: 'id', parentField: 'parentId'}"
+          :checkbox-config="{}">
+          <vxe-column type="radio" width="40" ></vxe-column>
+          <vxe-column min-width="350" title="业务类型" field="name" align="left" tree-node></vxe-column>
+<!--          <vxe-column min-width="50" align="center" title="序号" field="sort"></vxe-column>-->
+<!--          <vxe-column min-width="50" align="center" title="级别" field="level"></vxe-column>-->
+<!--          <vxe-column min-width="50" align="center" title="备注" field="remarks"></vxe-column>-->
+        </vxe-table>
+<!--        <vxe-pager-->
+<!--          background-->
+<!--          size="small"-->
+<!--          :current-page="tablePage.currentPage"-->
+<!--          :page-size="tablePage.pageSize"-->
+<!--          :total="tablePage.total"-->
+<!--          :page-sizes="[10, 20, 100, 1000, {label: '全量数据', value: 1000000}]"-->
+<!--          :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"-->
+<!--          @page-change="currentChangeHandle">-->
+<!--        </vxe-pager>-->
+      </div>
+		<template #footer>
+      		<span slot="footer" class="dialog-footer" style="float: right">
+      			<el-button size="primary" @click="close()" icon="el-icon-circle-close">关闭</el-button>
+      			<el-button size="primary" type="primary" v-if="method != 'view'" @click="getBusinessType()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
+    		</span>
+		</template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import CwProjectBusinessTypeService from '@/api/cw/projectBusinessType/CwProjectBusinessTypeService'
+  export default {
+    data () {
+      return {
+        title: '',
+        method: '',
+        visible: false,
+        loading: false,
+        tablePage: {
+          total: 0,
+          currentPage: 1,
+          pageSize: 10,
+          orders: []
+        },
+        dataList: [],
+        searchForm: {
+          name: ''
+        }
+      }
+    },
+    cwProjectBusinessTypeService: null,
+    created () {
+      this.cwProjectBusinessTypeService = new CwProjectBusinessTypeService()
+    },
+    components: {
+    },
+    methods: {
+      init (deputy) {
+        this.title = '业务类型选择'
+        this.visible = true
+        this.list()
+      },
+      // 表单提交
+      getBusinessType () {
+        let row = this.$refs.businessTypeTable.getRadioRecord()
+        if (this.commonJS.isEmpty(row)) {
+          this.$message.error('请至少选择一条数据')
+        } else {
+          let _this = this
+          const waitForEach = function () {
+            return new Promise(function (resolve, reject) {
+              _this.dataList.forEach((item) => {
+                if (item.parentId === row.id) {
+                  _this.$message.error('只可以选择最小节点的数据')
+                  throw new Error('只可以选择最小节点的数据')
+                }
+              })
+              resolve()
+            })
+          }
+          waitForEach().then(() => {
+            this.close()
+            this.$emit('getBusinessType', row)
+          }).catch((reject) => {
+            console.log('waitForEach.catch', reject)
+          })
+        }
+      },
+      list () {
+        this.dataList = []
+        this.loading = true
+        this.cwProjectBusinessTypeService.findListByIsShow({
+          'current': this.tablePage.currentPage,
+          'size': this.tablePage.pageSize,
+          'orders': this.tablePage.orders,
+          ...this.searchForm
+        }).then((data) => {
+          this.dataList = data.records
+          this.tablePage.total = data.total
+          this.loading = false
+        })
+      },
+      // 当前页
+      currentChangeHandle ({currentPage, pageSize}) {
+        this.tablePage.currentPage = currentPage
+        this.tablePage.pageSize = pageSize
+        this.list()
+      },
+      resetSearch () {
+        this.$refs.searchForm.resetFields()
+        this.list()
+      },
+      close () {
+        this.$refs.searchForm.resetFields()
+        this.visible = false
+      }
+    }
+  }
+</script>
+<style scoped>
+  /deep/ .el-dialog__body {
+    padding-top: 0;
+  }
+  /deep/ .el-form-item--mini.el-form-item, .el-form-item--small.el-form-item {
+    margin-bottom: 0px;
+  }
+</style>

+ 35 - 9
src/views/cw/projectRecords/ProjectRecordsAddForm.vue

@@ -396,6 +396,8 @@
   </div>
 
 
+
+
 </template>
 
 <script>
@@ -406,7 +408,7 @@
   import projectRecordsService from '@/api/cw/projectRecords/ProjectRecordsService'
   import WorkClientChooseForm from '../workClientInfo/WorkClientChooseForm'
   import WorkContractChooseCom from './WorkContractChooseCom'
-  import CwProjectBusinessTypeListForm from '@/views/cw/projectBusinessType/CwProjectBusinessTypeListForm'
+  import CwProjectBusinessTypeListForm from '@/views/cw/projectBusinessType/CwProjectBusinessTypeListForm1'
   import ContractNameForm from '../workContract/ContractNameForm'
   import workClientService from '@/api/cw/workClientInfo/WorkClientService'
   import contractInfoService from '@/api/cw/workContract/ContractInfoService'
@@ -429,6 +431,8 @@
     },
     data () {
       return {
+	    showChildDialog: false,
+	    typeVisible:false,
         title: '',
         method: '',
         loading: false,
@@ -492,10 +496,22 @@
           contactFirst: [
             {required: true, message: '联系方式1不可以为空'}
           ]
-        }
+        },
+		  typeDataList:[],
+		  typeSearchForm:{
+			  name:''
+		  },
+		  tablePage: {
+			  total: 0,
+			  currentPage: 1,
+			  pageSize: 10,
+			  orders: []
+		  },
       }
     },
+	  cwProjectBusinessTypeService: null,
     created () {
+		this.cwProjectBusinessTypeService = new CwProjectBusinessTypeService()
     },
     computed: {
       bus: {
@@ -928,14 +944,7 @@
       openContract () {
         this.$refs.workContractChooseCom.init()
       },
-      getBusinessType (row) {
-        this.inputForm.businessType = row.id
-        this.inputForm.businessTypeName = row.name
-      },
-      // 打开业务类型选择组件
       openBusinessTypeForm () {
-      	this.typeVisible=true
-		  // this.businessTypeList()
         this.$refs.cwProjectBusinessTypeListForm.init()
       },
       // 查看合同详情
@@ -1016,6 +1025,23 @@
           }
         })
       },
+	  businessTypeList(){
+		  this.cwProjectBusinessTypeService.findListByIsShow({
+			  'current': this.tablePage.currentPage,
+			  'size': this.tablePage.pageSize,
+			  'orders': this.tablePage.orders,
+			  ...this.typeSearchForm
+		  }).then((data) => {
+		  		console.log(data)
+				this.typeDataList = data.records
+				this.tablePage.total = data.total
+				this.loading = false
+			})
+	  },
+		getBusinessType (row) {
+			this.inputForm.businessType = row.id
+			this.inputForm.businessTypeName = row.name
+		},
     }
   }
 </script>

+ 11 - 7
src/views/cw/projectReportArchive/ProjectReportArchiveTaskForm.vue

@@ -108,12 +108,11 @@
                   {required: true, message:'请输入审计收费(元)', trigger:'blur'}
                		]">
 						  <el-input
-							  type="text"
 							  v-on:input="inputForm.auditMoney=inputForm.auditMoney.replace(/[^\d.]/g,'')
 							  .replace(/^\./g,'')
 							  .replace(/\.{2,}/g,'.')
 							  .replace('.','$#$').replace(/\./g,'').replace('$#$','.')
-							  .replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
+							  .replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3').replace(/^0+/, '0')"
 							  v-model="inputForm.auditMoney"
 							  controls-position="right"
 							  :controls="false"
@@ -644,6 +643,7 @@
         this.inputForm.id = id
         this.loading = false
         this.$nextTick(() => {
+        	console.log(this.inputForm.id)
           this.$refs.inputForm.resetFields()
           this.loading = true
           this.projectReportArchiveService.queryById(this.inputForm.id).then((data) => {
@@ -1050,8 +1050,8 @@
       		this.dialogTableVisible=true
 
 		},
-		getReportList(id){
-			console.log(id)
+		getReportList(){
+      	console.log(this.inputForm.id)
 			ProjectRecordsService.getReportById({
 				id:this.inputForm.id,
 				cwProjectRecordsDTO:this.searchForm
@@ -1118,9 +1118,13 @@
 			this.dialogTableVisible = false
 		},
 		inputMoney(){
-      	if (this.inputForm.auditMoney==0 || this.inputForm.auditMoney==''){
-      		this.isShow=!this.isShow
-			this.inputForm.connectReport=''
+			// if (/^0+$/.test(this.inputForm.auditMoney)) {
+			// 	this.inputForm.auditMoney = "0";
+			// }
+      	if (this.inputForm.auditMoney==='0'){
+      		this.isShow=true
+		}else {
+			this.isShow=false
 		}
 		}
 	}

+ 1 - 2
src/views/cw/reportCancellApply/ReportCancellApplyList.vue

@@ -103,13 +103,12 @@
           </vxe-column>
           <vxe-column min-width="160" align="center" title="项目编号" field="projectNumber"></vxe-column>
           <vxe-column min-width="160" align="center" title="项目名称" field="projectName"></vxe-column>
-          <vxe-column min-width="160" align="center" title="报告号" field="projectNo"></vxe-column>
           <vxe-column min-width="160" align="center" title="报告所属部门" field="departmentName"></vxe-column>
           <vxe-column min-width="160" align="center" title="项目经理1" field="projectMasterName"></vxe-column>
           <vxe-column min-width="160" align="center" title="项目经理2" field="projectMaster2Name"></vxe-column>
           <vxe-column min-width="160" align="center" title="报告主办人" field="reportSponsor"></vxe-column>
           <vxe-column min-width="160" align="center" title="创建人" field="userName"></vxe-column>
-          <vxe-column min-width="160" align="center" title="创建时间" field="createTime"></vxe-column>
+          <vxe-column min-width="160" align="center" title="创建时间" field="createDateT"></vxe-column>
           <vxe-column  min-width="150px" align="center" fixed="right" title="状态" field="status" >
             <template #default="scope">
               <el-button  @click="detail(scope.row)" effect="dark"