Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-web

src/api/modules/financeInvoice.js

@@ -18,9 +18,6 @@ export default {
   edit(params) {
     return request.put(`financeInvoice`, params)
   },
-  invoiceCheck(params){
-    return request.put(`financeInvoice/check`, params)
-  },
    delete(params) {
      return request.delete(`financeInvoice/${params}`)
    },

src/utils/tableUtil.js

@@ -8,7 +8,7 @@ export function getOperatorWidth() {
     // 内间距
     let paddingSpacing = 5
     // 外边距
-    let margin = 21;
+    let margin = 20;
 
     const operatorColumn = document.getElementsByClassName('optionDiv')
     // 如果节点数量大于0-循环这个节点，

src/views/assets/addAssetsOrder.vue

@@ -27,7 +27,7 @@
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                                         <el-form-item label="分单类型：" prop="clientManager" label-width="120px"
                                             class="postInfo-container-item">
-                                            <el-select v-model="assetsForm.allotType" :disabled="!editdepartmentId">
+                                            <el-select v-model="assetsForm.allotType">
                                                 <el-option label="指派" value="指派"></el-option>
                                                 <el-option label="轮单" value="轮单"></el-option>
                                             </el-select>
@@ -36,7 +36,7 @@
                                     <el-col v-if="assetsForm.allotType === '指派'" :xs="24" :sm="12" :lg="4" :span="6">
                                         <el-form-item label="接单部门：" prop="departmentId" label-width="120px"
                                             class="postInfo-container-item">
-                                            <el-select v-model="assetsForm.departmentId" :disabled="!editdepartmentId">
+                                            <el-select v-model="assetsForm.departmentId">
                                                 <el-option v-for="(d, id) in allotDepartment" :label="d.name"
                                                     :value="d.id"></el-option>
                                             </el-select>
@@ -537,7 +537,6 @@ export default {
         return {
             couldEdit: null,
             couldBack: null,
-            editdepartmentId: true,
             // 页面传参
             pageParams: {
                 back: null,
@@ -774,7 +773,6 @@ export default {
     created() {
         this.couldEdit = this.$route.query.couldEdit === 'true';
         this.couldBack = this.$route.query.couldBack === 'true';
-        this.editdepartmentId = this.$route.query.editdepartmentId === 'true';
         this.pageParams.back = this.$route.query.back;
         if (this.$route.query.row != null || this.$route.query.row != undefined) {
             this.pageParams.row = JSON.parse(this.$route.query.row);
@@ -1074,10 +1072,6 @@ export default {
                             }
                         })
                     }
-                    // 判断是否是重新下单
-                    if (this.$route.query.reorder) {
-                        this.assetsForm.id = null;
-                    }
                 }
             })
         },

src/views/assets/archivedList.vue

@@ -20,11 +20,11 @@
                     style=" width: 200px;margin-left: 10px;float: left;">
                     <el-option v-for="(s, value) in assetsBusinessGeners" :label="s.label" :value="s.value"></el-option>
                 </el-select>
-                <!-- <el-select v-model="listQuery.nodeCode" filterable placeholder="流程节点（可搜索）"
+                <el-select v-model="listQuery.nodeCode" filterable placeholder="流程节点（可搜索）"
                     style=" width: 200px;margin-left: 10px;float: left;">
                     <el-option v-for="item in nodes" :label="item.name" :value="item.code">
                     </el-option>
-                </el-select> -->
+                </el-select>
                 <el-select v-model="listQuery.departmentId" filterable placeholder="接单部门"
                     style=" width: 200px;margin-left: 10px;float: left;">
                     <el-option v-for="(d, id) in allotDepartment" :label="d.name" :value="d.id"></el-option>

src/views/assets/departmentDoneList.vue

@@ -31,7 +31,7 @@
                 </el-table-column>
                 <el-table-column label="项目名称" align="center" width="300">
                     <template slot-scope="{row}">
-                        <span>{{ row.reportName || row.statementName || row.assetsName }}</span>
+                        <span>{{ row.reportName || row.statementName || row.name }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="意见书号" align="center" width="250">

src/views/assets/doneList.vue

@@ -27,7 +27,7 @@
                 </el-table-column>
                 <el-table-column label="项目名称" align="center" width="300">
                     <template slot-scope="{row}">
-                        <span>{{ row.reportName || row.statementName || row.assetsName }}</span>
+                        <span>{{ row.reportName || row.statementName || row.name }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="意见书号" align="center" width="250">

src/views/assets/myOrderList.vue

@@ -7,7 +7,7 @@
             <template slot="left">
                 <PermissionButton menu-code="_views_assets_add_order" class-name="filter-item" type="danger"
                     icon="el-icon-circle-plus-outline" :page-jump="true" round style="float: left"
-                    :page-query="{ 'couldEdit': true, 'saveOrderBtn': '保存订单', 'showBtn': true, 'couldBack': true ,'editdepartmentId' : true}" />
+                    :page-query="{ 'couldEdit': true, 'saveOrderBtn': '保存订单', 'showBtn': true, 'couldBack': true }" />
                 <el-input style="margin-left: 20px;width: 300px;float: left;" class="filter-item"
                     v-model="listQuery.keyWord" placeholder="项目编号/报告号/项目名称/业务来源" clearable>
                 </el-input>
@@ -542,10 +542,10 @@ export default {
             // 送达状态下拉列表
             deliverys: [
                 {
-                    value: true,
+                    value: '1',
                     label: '已送达'
                 }, {
-                    value: false,
+                    value: '0',
                     label: '未送达'
                 },
             ],
@@ -957,7 +957,6 @@ export default {
                         type: 'success',
                         duration: 1000
                     });
-                    this.resetParams();
                 }
             })
         },
@@ -1022,8 +1021,7 @@ export default {
                     back: '/assets/myOrderList',
                     couldEdit: true,
                     couldBack: true,
-                    disabledStatus: false,
-                    editdepartmentId: false
+                    disabledStatus: false
                 }
             })
         },

src/views/assets/orderDetail.vue

@@ -2065,7 +2065,7 @@ export default {
         }
         callback(verify);
       }
-      let specialNodesForReverse = ["GENERATE_STATEMENT", "WRITE_REPORT", "ASSET_REPORT_TAKE_NO"];
+      let specialNodesForReverse = ["GENERATE_STATEMENT", "WRITE_REPORT", "WRITE_LETTER"];
       if (commit.state === 'REVERSE' && specialNodesForReverse.includes(this.currentNode.nodeCode)) {
         this.$refs.board.getPreviousNode();
         let reportNos = this.assetsEvaluationTarget.map(item => item.reportNo);

src/views/assets/repertoryList.vue

@@ -36,7 +36,7 @@
                 </el-table-column>
                 <el-table-column label="项目名称" align="center" width="300">
                     <template slot-scope="{row}">
-                        <span>{{ row.reportName || row.statementName || row.orderName }}</span>
+                        <span>{{ row.reportName || row.statementName || row.name }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="报告号" align="center" width="250">
@@ -261,7 +261,7 @@ export default {
             this.$api.assets.selectRepertoryPage(this.listQuery).then(res => {
                 if (res.code === 200) {
                     this.pageData = res.data;
-                    if (this.listQuery.startTime && this.listQuery.endTime && res.data.records.length > 0) {
+                    if (this.listQuery.startTime !== null && this.listQuery.endTime !== null && res.data.records.length > 0) {
                         this.exportStatus = false;
                     }else {
                         this.exportStatus = true;

src/views/assets/terminateList.vue

@@ -101,13 +101,10 @@
                         <span>{{ row.comment }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="操作" align="center" :min-width="dynamicWidth" fixed="right">
+                <el-table-column label="操作" align="center" width="200" fixed="right">
                     <template slot-scope="{row}">
-                        <div class="optionDiv" style="white-space: nowrap; display: inline-block">
-                            <el-button type="success" size="mini" @click="orderDetail(row)">查看</el-button>
-                            <el-button v-if="hasOpenBar" type="danger" size="mini"
-                                @click="toAddAssetsOrder(row)">重新下单</el-button>
-                        </div>
+                        <el-button type="success" size="mini" @click="orderDetail(row)">查看</el-button>
+                        <el-button type="danger" size="mini" @click="toAddAssetsOrder(row)">重新下单</el-button>
                     </template>
                 </el-table-column>
             </parentTable>
@@ -119,8 +116,6 @@
 import YPageListLayout from '@/components/YPageListLayout'
 import Breadcrumb from '@/components/Breadcrumb'
 import PermissionButton from '@/components/PermissionButton/PermissionButton'
-import { getOperatorWidth } from '@/utils/tableUtil.js'
-import { mapGetters } from 'vuex'
 
 export default {
     name: 'AssetsTerminateList',
@@ -171,37 +166,9 @@ export default {
                     value: '其他',
                     label: '其他'
                 }
-            ],
-            hasOpenBar: false,
-            dynamicWidth: 0,
+            ]
         }
     },
-    computed: {
-        ...mapGetters([
-            'userInfo'
-        ])
-    },
-    watch: {
-        userInfo: {
-            immediate: true, // immediate选项可以开启首次赋值监听
-            deep: true,
-            handler(newv) {
-                if (newv) {
-                    const postList = newv.postList.map(item => item.name)
-                    const marketPosts = ['销售代表', '客户经理', '客户经理-业务员', '市场一部经理', '市场二部经理', '销售主管']
-                    postList.forEach(element => {
-                        if (marketPosts.includes(element)) {
-                            this.hasOpenBar = true;
-                        }
-                    });
-                }
-
-            }
-        }
-    },
-    updated() {
-        this.dynamicWidth = getOperatorWidth();
-    },
     created() {
         // 获取用户下拉列表
         this.getAllUser();
@@ -262,7 +229,7 @@ export default {
                 }
             })
         },
-        toAddAssetsOrder(row) {
+        toAddAssetsOrder(row){
             this.$router.push({
                 path: "/assets/addOrder",
                 query: {
@@ -270,9 +237,7 @@ export default {
                     back: '/assets/terminateList',
                     couldEdit: true,
                     couldBack: true,
-                    disabledStatus: false,
-                    editdepartmentId: true,
-                    reorder: true
+                    disabledStatus: false
                 }
             })
         },

src/views/assets/todoList.vue

@@ -198,7 +198,6 @@ export default {
             this.listQuery = {
                 current: 1,
                 size: 10,
-                handlerId: this.$store.getters.userInfo.id
             }
             this.selectPage();
         },

src/views/finance/calculateAssets.vue

@@ -77,11 +77,6 @@
                                 <span>{{ row.ratio }}%</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="提成下限(￥)" align="center">
-                            <template slot-scope="{row}">
-                                <span>{{ row.lowLimitAmount }}</span>
-                            </template>
-                        </el-table-column>
                         <el-table-column label="总提成额(￥)" align="center">
                             <template slot-scope="{row}">
                                 <span>{{ row.totalAmount }}</span>

src/views/finance/invoiceCheck.vue

@@ -469,13 +469,7 @@ export default {
       })
     },
     businessTypeAlias(code){
-      if(code == "ASSET_BUSINESS"){
-        return '资产'
-      }
-      if(code == "MAJOR_BUSINESS"){
-        return '大中型'
-      }
-      return null;
+      return '大中型'
     },
     openMakeDialog(row){
       this.newInvoiceDialog= true;
@@ -490,7 +484,6 @@ export default {
             type: 'warning',
             center: true
           }).then(()=>{
-            this.invoice.state = '已开票';
             if (this.invoice.realAmount===0){
               this.$notify({
                   title: '提示',
@@ -500,7 +493,7 @@ export default {
                 });
                 return;
             }
-            this.$api.financeInvoice.invoiceCheck(this.invoice).then(res=>{
+            this.$api.financeInvoice.edit(this.invoice).then(res=>{
               if (res.code === 200 && res.data){
                 this.$notify({
                   title: '成功',

src/views/finance/settleAssets.vue

@@ -15,7 +15,7 @@
                         <el-input v-model="listQuery1.orderId" placeholder="项目编号" clearable
                             style="margin-left: 20px;width: 200px;float: left;">
                         </el-input>
-                        <el-input v-model="listQuery1.productionNo" placeholder="产品号" clearable
+                        <el-input v-model="listQuery1.reportNo" placeholder="产品号" clearable
                             style="margin-left: 20px;width: 200px;float: left;">
                         </el-input>
                         <el-input v-model="listQuery1.principal" placeholder="负责人" clearable
@@ -147,7 +147,7 @@
                         <el-input v-model="listQuery2.orderId" placeholder="项目编号" clearable
                             style="margin-left: 20px;width: 200px;float: left;">
                         </el-input>
-                        <el-input v-model="listQuery2.productionNo" placeholder="产品号" clearable
+                        <el-input v-model="listQuery2.reportNo" placeholder="产品号" clearable
                             style="margin-left: 20px;width: 200px;float: left;">
                         </el-input>
                         <el-input v-model="listQuery2.principal" placeholder="负责人" clearable

src/views/major/todoDetail.vue

@@ -378,7 +378,7 @@
                   <el-row class="row-style">
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                       <el-form-item label="终端客户类型：" prop="terminalClienteleType"
-                        :rules="{ required: true, message: '终端客户类型不能为空', trigger: 'blur' }" label-width="140px"
+                         label-width="140px"
                         class="postInfo-container-item">
                         <el-select v-model="major.terminalClienteleType" placeholder="请选择" readonly disabled style=" width: 100%">
                           <el-option label="企业" value="企业"></el-option>
@@ -663,7 +663,7 @@
               <el-col :xs="24" :sm="12" :lg="6" :span="6">
                 <el-form-item label="出具产品类型：" prop="production" label-width="160px" class="postInfo-container-item">
                   <el-checkbox-group v-model="feedback.production" style="width:300px">
-                    <el-tooltip :disabled="!feedback.production.includes('STATEMENT')" class="item" effect="dark" content="意见书已送达，无法取消此类型产品！" placement="top-start">
+                    <el-tooltip :disabled="!feedback.production.includes('STATEMENT')" class="item" effect="dark" content="若意见书已送达，无法取消此类型产品！" placement="top-start">
                       <el-checkbox-button label="STATEMENT" name="production">价值意见书</el-checkbox-button>
                     </el-tooltip>
                     <el-checkbox-button label="REPORT" name="production">报告</el-checkbox-button>
@@ -729,33 +729,37 @@
               <el-form label-position="left" :model="props.row" class="form-container" :ref="'productionFrom'+props.row.id"
                 :rules="rules">
                 <div>
-                  <!-- <el-tag effect="plain" size="medium" disable-transitions><span style="font-size:16px ; margin-top:10px">基本信息</span></el-tag> -->
-                  <!-- <div style="margin-left:10px;margin-bottom:10px;margin-top:10px">
-                    <el-button round type="danger" @click="saveProduction(props.row)">更新产品信息</el-button>
-                  </div> -->
                   <el-row class="row-style">
-                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                    <el-col :xs="24" :sm="12" :lg="12" :span="6">
                       <el-form-item prop="name" :rules="{ required: true, message: '项目不能为空', trigger: 'blur' }"
                         label-width="120px" class="postInfo-container-item" label="项目名称:">
                         <el-input v-model="props.row.name" class="filter-item" />
                       </el-form-item>
                     </el-col>
-                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                    <el-col :xs="24" :sm="12" :lg="12" :span="6">
                       <el-form-item prop="clientName" :rules="{ required: true, message: '委托方不能为空', trigger: 'blur' }"
                         label-width="120px" class="postInfo-container-item" label="委托方：">
                         <el-input v-model="props.row.clientName" class="filter-item" />
                       </el-form-item>
                     </el-col>
+                  </el-row>
+                  <el-row class="row-style">
+                    <el-col :xs="24" :sm="12" :lg="12" :span="6">
+                      <el-form-item prop="clientAddress" :rules="{ required: true, message: '委托方地址不能为空', trigger: 'blur' }"
+                        label-width="140px" class="postInfo-container-item" label="委托方地址：">
+                        <el-input v-model="props.row.clientAddress" class="filter-item" />
+                      </el-form-item>
+                    </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                      <el-form-item prop="clientTel" label-width="120px" class="postInfo-container-item" label="委托方电话：">
+                      <el-form-item prop="clientTel" label-width="140px" class="postInfo-container-item" label="委托方电话：">
                         <el-input v-model="props.row.clientTel" class="filter-item" />
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                      <el-form-item prop="clientAddress" :rules="{ required: true, message: '委托方地址不能为空', trigger: 'blur' }"
-                        label-width="120px" class="postInfo-container-item" label="委托方地址：">
-                        <el-input v-model="props.row.clientAddress" class="filter-item" />
+                      <el-form-item prop="qrCode" label-width="140px" class="postInfo-container-item" label="二维码：">
                       </el-form-item>
+                      <img style="width:200px;height:200px; display:flex ;position:absolute;top:0;right:0"
+                      :src="props.row.qrCode" alt="NULL" />
                     </el-col>
                   </el-row>
                   <el-row class="row-style">
@@ -818,12 +822,6 @@
                       <el-form-item prop="signatoryId" label-width="120px" class="postInfo-container-item">
                       </el-form-item>
                     </el-col>
-                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                      <el-form-item prop="qrCode" label-width="120px" class="postInfo-container-item" label="二维码：">
-                      </el-form-item>
-                      <img style="width:130px;height:120px; display:flex ;position:absolute;top:0;right:0"
-                        :src="props.row.qrCode" alt="NULL" />
-                    </el-col>
                   </el-row>
                   <el-row class="row-style">
                     <el-col :xs="24" :sm="12" :lg="18" :span="6">
@@ -1291,7 +1289,7 @@
           <el-row>
             <el-col :xs="24" :sm="12" :lg="12" :span="6">
               <el-form-item label="使用权类型：" :rules="{ required: true, message: '使用权类型不能为空', trigger: 'blur' }"
-                prop="useRightType" label-width="120px" class="postInfo-container-item">
+                prop="useRightType" label-width="140px" class="postInfo-container-item">
                 <el-input v-model.trim="landTarget.useRightType" class="filter-item" />
               </el-form-item>
             </el-col>
@@ -1409,7 +1407,7 @@
                       <i class="el-icon-question" /></el-tooltip>
                     ：
                   </span>
-                  <el-input v-model="landTarget.checkValue" :placeholder="landTarget.evaluateValue" style="width:100%"
+                  <el-input v-model="landTarget.checkValue" :placeholder="landTarget.evaluateValue" style="width:100%" 
                     class="filter-item">
                     <template slot="append">万</template>
                   </el-input>
@@ -1486,6 +1484,7 @@ import YDetailPageLayout from '@/components/YDetailPageLayout/index_detail'
 import WorkflowBoard from '@/components/workflowBoard'
 import ScanEntry from '@/components/ScanEntry'
 import { isNumber, phoneNumber, postiveInteger, isIdNumber } from '@/utils/validate'
+import { readonly } from 'vue'
 
 export default {
   name: 'majorTodoDetail',
@@ -1520,11 +1519,10 @@ export default {
     feedback: {
       handler(newValue, oldVal) {
         let ps = newValue.production;
-        let isPay = newValue.isPay;
         if (this.currentNode.nodeCode === 'QUOTATION_FEEDBACK' || this.currentNode.nodeCode === 'STATEMENT_FEEDBACK') {
           if (ps.length > 1 && this.currentNode.nodeCode != 'STATEMENT_FEEDBACK' && ps.includes("STATEMENT")) {
             this.$message({
-              message: '警告，一次只能选择一种产品类型',
+              message: '一次只能选择一种产品类型',
               type: 'error'
             });
             this.validFeed = true;
@@ -1535,13 +1533,13 @@ export default {
           }
           else if (ps.includes("REPORT") && ps.includes("LETTER")) {
             this.$message({
-              message: '警告，报告和复评函只能选其一。',
+              message: '报告和复评函只能选其一。',
               type: 'error'
             });
             this.validFeed = true;
           } else if ((ps.includes("REPORT") && ps.includes("NONE")) || (ps.includes("LETTER") && ps.includes("NONE"))) {
             this.$message({
-              message: '警告，产品类型选择有误',
+              message: '产品类型选择有误',
               type: 'error'
             });
             this.validFeed = true;
@@ -2040,6 +2038,7 @@ export default {
       this.landTarget.majorId = this.major.id;
       this.landTarget.principalId = this.major.principalId;
       this.landTarget.sites = this.major.membersId;
+      this.landTarget.owner = this.major.owner;
 
     },
     saveLandTarget(targetType) {