Merge branch 'develop' of https://code.dashoo.cn/chengjian/opms_frontend into develop

src/views/contract/components/DetailsRecords.vue

@@ -55,9 +55,7 @@
       return {}
     },
 
-    mounted() {
-      console.log(this.dynamicsList)
-    },
+    mounted() {},
 
     methods: {},
   }

src/views/contract/components/Edit.vue

@@ -281,7 +281,6 @@
           this.editForm.inchargeName = this.username
           this.editForm.signatoryId = this.userId
           this.editForm.signatoryName = this.username
-          console.log(this.editForm.signatoryName)
         } else {
           this.title = '编辑合同'
           const [err, res] = await to(contractApi.getDetails({ id }))
@@ -329,7 +328,6 @@
         this.editForm.custSignatoryId = business.contactId
         this.editForm.custSignatoryName = business.contactName
         this.businessUserQueryParams = { busId: business.id, custId: business.custId }
-        console.log('项目信息', data)
         // 获取产品信息
         this.getProjectInfo(business.id)
       },
@@ -360,7 +358,6 @@
       },
       // 获取签约人信息
       getUser(userList, property, label) {
-        console.log(userList, property, label)
         this.editForm[label] = userList.map((item) => item.nickName).join()
         if (this.multiple) {
           this.editForm[property] = userList.map((item) => item.id)
@@ -389,7 +386,6 @@
       async getProjectInfo(id) {
         let params = { id }
         const [err, res] = await to(businessApi.getProductByBusinessId(params))
-        console.log(res)
         if (err) return
         if (res.data && res.data.length > 0) this.setProductData(res.data)
       },
@@ -397,6 +393,7 @@
         let projData = data.map((item) => ({
           id: item.prodId ? item.prodId : item.id,
           prodName: item.prodName,
+          prodCode: item.prodCode,
           prodClass: item.prodClass,
           guidPrice: item.guidPrice,
           price: item.prodPrice ? item.prodPrice : item.guidPrice,

src/views/contract/components/EditInvoice.vue

@@ -96,10 +96,8 @@
         if (!id) {
           this.title = '新建发票'
           if (this.details) {
-            console.log(this.details)
             this.editForm.contractCode = this.details.contractCode
             this.editForm.contractId = this.details.id
-            console.log(this.editForm)
           }
         } else {
           this.title = '编辑发票'

src/views/contract/components/ProductTable.vue

@@ -2,8 +2,8 @@
  * @Author: liuzhenlin 461480418@qq.ocm
  * @Date: 2023-01-05 17:43:46
  * @LastEditors: liuzhenlin
- * @LastEditTime: 2023-01-07 14:36:08
- * @FilePath: \订单全流程管理系统\src\components\table\ProductTable.vue
+ * @LastEditTime: 2023-01-11 17:11:37
+ * @FilePath: \订单全流程管理系统\src\views\contract\components\ProductTable.vue
 -->
 <template>
   <div class="table-container">
@@ -128,7 +128,6 @@
     methods: {
       // input修改
       handleChange(row) {
-        console.log('row', row)
         this.$emit('changeProductData', row)
       },
       // 删除

src/views/contract/components/Transfer.vue

@@ -72,7 +72,6 @@
         this.multiple = multiple
         this.property = property
         this.label = label
-        console.log('property', property)
         if (this.userForm[property].length) {
           this.$refs.user.ids = this.userForm[property]
         } else if (this.userForm[property]) {
@@ -84,7 +83,6 @@
       },
       // 获取签约人信息
       getUser(userList, property, label) {
-        console.log(userList, property, label)
         this.userForm[label] = userList.map((item) => item.nickName).join()
         if (this.multiple) {
           this.userForm[property] = userList.map((item) => item.id)
@@ -98,7 +96,6 @@
       },
       async save() {
         let params = { ...this.userForm, id: this.contractId }
-        console.log(params)
         const [valid] = await to(this.$refs.userForm.validate())
         if (valid == false) return
         const [err, res] = await to(contractApi.transferContract(params))

src/views/contract/detail.vue

@@ -140,7 +140,6 @@
           }
 
           this.dynamicsList = records
-          console.log(this.dynamicsList)
         }
       },
       async handleEdit() {

src/views/contract/index.vue

@@ -6,7 +6,7 @@
  * @FilePath: \订单全流程管理系统\src\views\contract\index.vue
 -->
 <template>
-  <div class="contract-manage">
+  <div class="contract-container">
     <vab-query-form>
       <vab-query-form-top-panel>
         <el-form :inline="true" label-width="0px" :model="queryForm" @submit.native.prevent>
@@ -48,12 +48,7 @@
         <table-tool :check-list.sync="checkList" :columns="columns" />
       </vab-query-form-right-panel>
     </vab-query-form>
-    <el-table
-      v-loading="listLoading"
-      border
-      :data="list"
-      height="calc(100vh - 330px)"
-      @selection-change="setSelectRows">
+    <el-table v-loading="listLoading" :data="list" :height="height" @selection-change="setSelectRows">
       <el-table-column align="center" show-overflow-tooltip type="selection" />
       <el-table-column
         v-for="(item, index) in finallyColumns"
@@ -122,6 +117,7 @@
     },
     data() {
       return {
+        height: this.$baseTableHeight(2),
         approStatusOption: [
           { id: 1, label: '审批中' },
           { id: 2, label: '已拒绝' },
@@ -333,11 +329,5 @@
 </script>
 
 <style lang="scss" scoped>
-  $base: '.contract-manage';
-  #{$base} {
-    height: calc(100vh - 60px - 12px * 2 - 40px);
-    padding: 12px;
-    background: #fff;
-    transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1), border 0s, color 0.1s, font-size 0s;
-  }
+  $base: '.contract-container';
 </style>

src/views/proj/business/index.vue

@@ -9,7 +9,7 @@
       <el-tab-pane label="无效项目" name="VOID" />
     </el-tabs>
 
-    <vab-query-form style="margin-top: 10px">
+    <vab-query-form>
       <vab-query-form-top-panel>
         <el-form ref="queryForm" :inline="true" :model="queryForm" @submit.native.prevent>
           <el-form-item prop="nboName">
@@ -118,7 +118,7 @@
     data() {
       return {
         activeName: 'ALL',
-        height: this.$baseTableHeight(2) - 20,
+        height: this.$baseTableHeight(3),
         checkList: [],
         columns: [
           {
@@ -126,7 +126,7 @@
             width: 'auto',
             minWidth: '280',
             prop: 'nboName',
-            sortable: true,
+            sortable: false,
             disableCheck: true,
           },
           {