Kaynağa Gözat

大中型流程优化3

wucl 1 yıl önce
ebeveyn
işleme
c057e47573

+ 76 - 93
src/components/BaseTable/parentTable.vue

@@ -1,113 +1,96 @@
 <template>
-  <el-table
-    ref="table"
-    slot="table"
-    size="medium"
-    :data="data"
-    :isBoard="isBoard"
-    :show-summary="showSummary"
-    :summary-method="summaryMethod"
-    :row-key="getRowKeys"
-    fit
-    stripe
-    highlight-current-row
-    :header-row-style="{ color: '#333333'}"
-    style="
+  <el-table ref="table" slot="table" size="medium" :data="data" :show-summary="showSummary"  border
+    :summary-method="summaryMethod" :row-key="getRowKeys" :height=maxHeight fit stripe highlight-current-row
+    :header-row-style="{ color: '#333333' }" style="
       border-left: 1px solid #ebeced;
       border-right: 1px solid #ebeced;
       color: #333333;
-    "
-    @selection-change="selectionChange"
-    @sort-change="sortChange"
-    @row-click="clickRow"
-    @row-dblclick="expandRow"
-  >
-
-    
+    " @selection-change="selectionChange" @sort-change="sortChange" @row-click="clickRow" @row-dblclick="expandRow">
     <slot></slot>
   </el-table>
 </template>
 
 <script>
-  export default {
-    name: "parentTable",
-    props: {
-      data: {
-        default() {
-          return [];
-        },
-        require: true,
-        type: Array,
-      },
-      noPage: {
-        default: false,
-        type: Boolean,
-      },
-      isBoard: {
-        default: -1,
-        type: Number,
+export default {
+  name: "parentTable",
+  props: {
+    data: {
+      default() {
+        return [];
       },
-      hasStatic: {
+      require: true,
+      type: Array,
+    },
+    noPage: {
       default: false,
       type: Boolean,
-      },
-      showSummary:false,
-      summaryMethod:null,
-      selectionChange:{
-        type: Function,
-        default: function () {
+    },
+    isBoard: {
+      default: -1,
+      type: Number,
+    },
+    hasStatic: {
+      default: false,
+      type: Boolean,
+    },
+    showSummary: false,
+    summaryMethod: null,
+    selectionChange: {
+      type: Function,
+      default: function () {
 
-        }
-      },
-      clickRowToPick:{
-        default: true,
-        type: Boolean,
       }
+    },
+    clickRowToPick: {
+      default: true,
+      type: Boolean,
+    },
+
+  },
 
+  computed: {
+    maxHeight() {
+      if (this.isBoard > 0) {
+        return this.isBoard  ////如果是首页传过来的,不需要适配高度,直接指定该值返回就好了
+      }
+      else {
+        let plus = this.noPage ? 100 : 0;
+        let sub = this.hasStatic ? 130 : 0;
+        let clientHeight = document.documentElement.clientHeight;
+        return clientHeight - 250 + plus - sub;
+      }
     },
-    computed: {
-      maxHeight() {
-        if(this.isBoard > 0){
-          return this.isBoard  ////如果是首页传过来的,不需要适配高度,直接指定该值返回就好了
-        }
-        else {
-          let plus = this.noPage ? 100 : 0;
-          let sub = this.hasStatic ? 130 : 0;
-          let clientHeight = document.documentElement.clientHeight;
-          return clientHeight - 350 + plus - sub;
-        }
-      },
+  },
+  methods: {
+    // selectionChange(val) {
+    //   this.$emit("selectionChange", val);
+    // },
+    clickRow(row) {
+      if (this.clickRowToPick) {
+        this.$refs.table.toggleRowSelection(row);
+      }
     },
-    methods: {
-      // selectionChange(val) {
-      //   this.$emit("selectionChange", val);
-      // },
-      clickRow(row){
-        if (this.clickRowToPick){
-          this.$refs.table.toggleRowSelection(row);
-        }
-      },
-      expandRow(row){
-        row.expand = !row.expand
-        this.$refs.table.toggleRowExpansion(row, row.expend);
-      },
-      sortChange(val) {
-        let sortParam = {};
-        if (val.order === "ascending") {
-          sortParam.ascs = val.prop;
-          sortParam.descs = null;
-        } else if (val.order === "descending") {
-          sortParam.descs = val.prop;
-          sortParam.ascs = null;
-        } else {
-          sortParam.descs = "id";
-          sortParam.ascs = null;
-        }
-        this.$emit("sortTable", sortParam);
-      },
-      getRowKeys(row){
-          return row.id;
+    expandRow(row) {
+      row.expand = !row.expand
+      this.$refs.table.toggleRowExpansion(row, row.expend);
+    },
+    sortChange(val) {
+      let sortParam = {};
+      if (val.order === "ascending") {
+        sortParam.ascs = val.prop;
+        sortParam.descs = null;
+      } else if (val.order === "descending") {
+        sortParam.descs = val.prop;
+        sortParam.ascs = null;
+      } else {
+        sortParam.descs = "id";
+        sortParam.ascs = null;
       }
+      this.$emit("sortTable", sortParam);
     },
-  };
+    getRowKeys(row) {
+      return row.id;
+    }
+  },
+};
 </script>

+ 1 - 1
src/components/YDetailPageLayout/index_detail.vue

@@ -131,7 +131,7 @@
       // right: 9px;
       // top: 9px;
       text-align: right;
-      margin-bottom: 5px;
+      margin-right: 30px;
     }
 
     /*.el-tabs__item {*/

+ 5 - 2
src/components/workflowBoard.vue

@@ -195,7 +195,8 @@ export default {
                   title: '成功',
                   message: '工作流节点提交成功。',
                   type: 'success',
-                  duration: 2000
+                  duration: 1000,
+                  offset: 100
                 });
                 this.goBack();
             }else{
@@ -203,7 +204,8 @@ export default {
                   title: '失败',
                   message: '工作流节点提交失败,请联系管理员。',
                   type: 'error',
-                  duration: 2000
+                  duration: 1000,
+                  offset: 100
                 });
             }
           })
@@ -247,5 +249,6 @@ export default {
 /deep/.nodeDialog {
 border-radius: 20px;
 }
+
 </style>
 

+ 4 - 0
src/layout/components/Navbar.vue

@@ -148,6 +148,10 @@ export default {
         let m = JSON.parse(message.params);
         this.$router.push(`/major/my/order?todoBusinessId=${m.majorId}&rNo=${m.reportNo}`)
       }
+      if (message.type === 'MAJOR_ALLOT_COMMISSION_REMIND1'){
+        let m = JSON.parse(message.params);
+        this.$router.push(`/major/production/performance?reportNo=${m.reportNo}&id=${m.id}&majorId=${m.majorId}`)
+      }
     },
 
     setRead(messageId) {

+ 0 - 2
src/views/assets/departmentTodoList.vue

@@ -121,14 +121,12 @@
 <script>
 import YPageListLayout from '@/components/YPageListLayout'
 import Breadcrumb from '@/components/Breadcrumb'
-import PermissionButton from '@/components/PermissionButton/PermissionButton'
 
 export default {
     name: 'AssetsDepartmentToDoList',
     components: {
         Breadcrumb,
         YPageListLayout,
-        PermissionButton,
     },
     data() {
         return {

+ 0 - 2
src/views/assets/doneList.vue

@@ -94,14 +94,12 @@
 <script>
 import YPageListLayout from '@/components/YPageListLayout'
 import Breadcrumb from '@/components/Breadcrumb'
-import PermissionButton from '@/components/PermissionButton/PermissionButton'
 
 export default {
     name: 'AssetsDoneList',
     components: {
         Breadcrumb,
         YPageListLayout,
-        PermissionButton,
     },
     data() {
         return {

+ 0 - 2
src/views/assets/repertoryList.vue

@@ -167,14 +167,12 @@
 <script>
 import YPageListLayout from '@/components/YPageListLayout'
 import Breadcrumb from '@/components/Breadcrumb'
-import PermissionButton from '@/components/PermissionButton/PermissionButton'
 
 export default {
     name: 'AssetsRepertoryList',
     components: {
         Breadcrumb,
         YPageListLayout,
-        PermissionButton,
     },
     data() {
         return {

+ 0 - 2
src/views/assets/todoList.vue

@@ -115,14 +115,12 @@
 <script>
 import YPageListLayout from '@/components/YPageListLayout'
 import Breadcrumb from '@/components/Breadcrumb'
-import PermissionButton from '@/components/PermissionButton/PermissionButton'
 
 export default {
     name: 'AssetsToDoList',
     components: {
         Breadcrumb,
         YPageListLayout,
-        PermissionButton,
     },
     data() {
         return {

+ 4 - 4
src/views/complex/index.vue

@@ -290,7 +290,7 @@
                   @click="goToTodoPage('/major/todo')">查看更多<i class="el-icon-arrow-right el-icon--right"></i></el-button>
               </div>
               <div class="left-content">
-                <parentTable v-loading="listLoading" :data="majorTodoList" stripe border style="width: 100%">
+                <parentTable v-loading="listLoading" :data="majorTodoList" stripe border :isBoard=450 style="width: 100%">
                   <el-table-column label="项目名称" align="center" width="200" show-overflow-tooltip>
                     <template slot-scope="{row}">
                       <span>{{ row.productionName == null ? row.orderName : row.productionName }}</span>
@@ -365,7 +365,7 @@
                     class="el-icon-arrow-right el-icon--right"></i></el-button>
               </div>
               <div class="left-content">
-                <parentTable v-loading="listLoading" :data="personalTodoList" stripe border style="width: 100%">
+                <parentTable v-loading="listLoading" :data="personalTodoList" stripe  border :isBoard=450 style="width: 100%">
                   <el-table-column label="坐落" align="center" width="200" show-overflow-tooltip>
                     <template slot-scope="{row}">
                       <span>{{ row.location }}</span>
@@ -528,7 +528,7 @@
                     class="el-icon-arrow-right el-icon--right"></i></el-button>
               </div>
               <div class="left-content">
-                <parentTable :data="majorDeclareCheckList" stripe border style="width: 100%">
+                <parentTable :data="majorDeclareCheckList" stripe border :isBoard=450 style="width: 100%">
                   <el-table-column label="审批类型" width="150" align="center">
                     <template slot-scope="{row}">
                       <span style="color:red">{{ row.businessType === 'COMMISSION_DECLARE_MAJOR_MARKET' ? '市场人员提成申报' :
@@ -619,7 +619,7 @@
                     class="el-icon-arrow-right el-icon--right"></i></el-button>
               </div>
               <div class="left-content">
-                <parentTable :data="assetsDeclareCheckList" stripe border style="width: 100%">
+                <parentTable :data="assetsDeclareCheckList" stripe  :isBoard=450 style="width: 100%">
                   <el-table-column label="审批类型" width="150" align="center">
                     <template slot-scope="{row}">
                       <span style="color:red">{{ row.businessType === 'COMMISSION_DECLARE_ASSET_MARKET' ? '市场人员提成申报' :

+ 152 - 90
src/views/major/detail.vue

@@ -41,7 +41,7 @@
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                        <el-input :value="major.clientManager" class="filter-item" readonly disabled style=" width: 225px" />
+                        <el-input :value="major.clientManager" class="filter-item" readonly disabled  />
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
@@ -52,7 +52,7 @@
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                      <el-select v-model="major.financial" placeholder="请选择">
+                      <el-select v-model="major.financial" placeholder="请选择" style="width: 100%">
                               <el-option label="金融" :value="true">金融</el-option> 
                               <el-option label="非金融" :value="false">非金融</el-option>
                             </el-select>
@@ -66,20 +66,20 @@
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                      <el-select v-model="major.allotType" placeholder="请选择" >
+                      <el-select v-model="major.allotType" placeholder="请选择" style="width: 100%">
                               <el-option label="部门轮单" value="轮单"></el-option> 
                               <el-option label="部门指派" value="指派"></el-option>
                             </el-select>
                       </el-form-item>
                     </el-col>
-                    <el-col :xs="24" :sm="12" :lg="4" :span="6" v-if="major.allotType==='指派' || nodeBusinessInfo.currentNodeInstanceId ">
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6" v-if="major.allotType==='指派' || nodeBusinessInfo.currentNodeInstanceId ">
                       <el-form-item
                         label="接单部门:"
                         prop="departmentId"
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                      <el-select v-model="major.departmentId" >
+                      <el-select v-model="major.departmentId" style="width: 100%">
                               <el-option v-for="(d,id) in allotDepartment" :label="d.name" :value="d.id"></el-option> 
                         </el-select>
                       </el-form-item>
@@ -94,7 +94,7 @@
                         :class="['postInfo-container-item']"
                       >
                         <el-select v-model="major.principalId" 
-                          placeholder="待定" 
+                          placeholder="待定"  style="width: 100%"
                           readonly
                           disabled>
                               <el-option v-for="(p,id) in principals" :label="p.name" :value="p.id"></el-option> 
@@ -113,14 +113,14 @@
                           multiple
                           readonly
                           disabled
-                          style=" width: 686px" >
+                          style="width: 100%">
                               <el-option v-for="(u,id) in allUsers" :label="u.name" :value="u.id"></el-option> 
                         </el-select>
                       </el-form-item>
                     </el-col>
                   </el-row>
                   <el-row class="row-style">
-                    <el-col :xs="12" :sm="12" :lg="23" :span="6">
+                    <el-col :xs="12" :sm="12" :lg="18" :span="6">
                       <el-form-item
                         label="订单名称:"
                         prop="name"
@@ -141,7 +141,7 @@
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                      <el-select v-model="major.businessObjectType" placeholder="请选择" @change="changeType">
+                      <el-select v-model="major.businessObjectType" placeholder="请选择" @change="changeType" style="width: 100%">
                         <el-option label="土地" value="土地"></el-option>
                         <el-option label="房地产" value="房地产"></el-option> 
                       </el-select>
@@ -154,7 +154,7 @@
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                      <el-select v-model="major.specialType" placeholder="请选择">
+                      <el-select v-model="major.specialType" placeholder="请选择" style="width: 100%">
                               <el-option label="在建工程" value="在建工程"></el-option> 
                               <el-option label="加油加气站" value="加油加气站"></el-option>
                               <el-option label="电站" value="电站"></el-option> 
@@ -169,7 +169,7 @@
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                          <el-select v-model="major.businessGener" placeholder="请选择" >
+                          <el-select v-model="major.businessGener" placeholder="请选择" clearable style="width: 100%" >
                               <el-option v-for="(type,index) in types" :label="type" :value="type"></el-option> 
                             </el-select>
                       </el-form-item>
@@ -182,7 +182,7 @@
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                      <el-select v-model="major.evaluateAim" placeholder="请选择">
+                      <el-select v-model="major.evaluateAim" placeholder="请选择" style="width: 100%">
                               <el-option label="抵押" value="抵押"></el-option> 
                               <el-option label="咨询" value="咨询"></el-option>
                               <el-option label="融资" value="融资"></el-option> 
@@ -202,8 +202,8 @@
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                      <el-radio class="major-radio" v-model="major.entrustAgain" :label="false" border size="medium" >否</el-radio>
-                      <el-radio class="major-radio" v-model="major.entrustAgain" :label="true" border size="medium" >是</el-radio>
+                      <el-radio  v-model="major.entrustAgain" :label="false"  size="medium" >否</el-radio>
+                      <el-radio  v-model="major.entrustAgain" :label="true"  size="medium" >是</el-radio>
                       </el-form-item>
                     </el-col>
                       <el-col :xs="24" :sm="12" :lg="6" :span="6">
@@ -214,8 +214,8 @@
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                      <el-radio class="major-radio" v-model="major.multipleRemoval" :label="false" border size="medium" >否</el-radio>
-                      <el-radio class="major-radio" v-model="major.multipleRemoval" :label="true" border size="medium" >是</el-radio>
+                      <el-radio  v-model="major.multipleRemoval" :label="false"  size="medium" >否</el-radio>
+                      <el-radio  v-model="major.multipleRemoval" :label="true"  size="medium" >是</el-radio>
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
@@ -226,8 +226,8 @@
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                      <el-radio class="major-radio" v-model="major.informalEvaluate" :label="false" border size="medium" >否</el-radio>
-                      <el-radio class="major-radio" v-model="major.informalEvaluate" :label="true" border size="medium" >是</el-radio>
+                      <el-radio  v-model="major.informalEvaluate" :label="false"  size="medium" >否</el-radio>
+                      <el-radio  v-model="major.informalEvaluate" :label="true"  size="medium" >是</el-radio>
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -240,7 +240,7 @@
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                      <el-select v-model="major.clienteleType" placeholder="请选择" @change="changeCustomerType(0)">
+                      <el-select v-model="major.clienteleType" placeholder="请选择" @change="changeCustomerType(0)" style="width: 100%">
                               <el-option label="企业" value="企业"></el-option> 
                               <el-option label="个人" value="个人"></el-option>
                             </el-select>
@@ -253,10 +253,10 @@
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                        <el-select v-model="major.clienteleId" placeholder="请选择(可搜索)" @change="findSubClientele(0)" clearable filterable  v-if="couldEdit">
+                        <el-select v-model="major.clienteleId" placeholder="请选择(可搜索)" @change="findSubClientele(0)" clearable filterable style="width: 100%" v-if="couldEdit">
                           <el-option v-for="(c,id) in customerCompany" :label="c.name" :value="c.id"></el-option> 
                         </el-select>
-                        <el-input :value="major.cclienteleName" class="filter-item"  style=" width: 225px" v-else/>
+                        <el-input :value="major.cclienteleName" class="filter-item"   v-else/>
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6" v-if="major.clienteleType==='企业'">
@@ -266,10 +266,10 @@
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                        <el-select v-model="major.clienteleSubId" placeholder="请选择(可搜索)"  @change="getCustomerContract" clearable filterable  v-if="couldEdit">
+                        <el-select v-model="major.clienteleSubId" placeholder="请选择(可搜索)"  @change="getCustomerContract" clearable filterable style="width: 100%" v-if="couldEdit">
                           <el-option v-for="(s,id) in subCustomerCompany" :label="s.name" :value="s.id"></el-option> 
                         </el-select>
-                        <el-input :value="major.cclienteleSubName" class="filter-item"  style=" width: 225px" v-else />
+                        <el-input :value="major.cclienteleSubName" class="filter-item"   v-else />
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
@@ -281,14 +281,14 @@
                         class="postInfo-container-item"
                       >   
                       <div  v-if="couldEdit">
-                        <el-select v-model="major.clienteleContactId" placeholder="请选择(可搜索)"  clearable filterable @change="getContactInfo" style="width:60%">
+                        <el-select v-model="major.clienteleContactId" placeholder="请选择(可搜索)"  clearable filterable @change="getContactInfo" style="width:80%">
                             <el-option v-for="(c,id) in customerContract" :label="c.name" :value="c.id"></el-option> 
                         </el-select>
                         <el-tooltip class="item" effect="dark" content="没有联系人?点击新增" placement="top-end">
                           <span style="margin-left:5%;color:RGB(64,158,255);cursor:pointer" @click="createLinkman(false)">新增</span>
                         </el-tooltip>
                       </div>
-                      <el-input :value="major.cclienteleContactName" class="filter-item"  style=" width: 225px" v-else/>
+                      <el-input :value="major.cclienteleContactName" class="filter-item" v-else/>
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -300,7 +300,7 @@
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                      <el-input :value="major.cmobile" class="filter-item"  style=" width: 225px" readonly disabled/>
+                      <el-input :value="major.cmobile" class="filter-item"   readonly disabled/>
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
@@ -310,7 +310,7 @@
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                      <el-input :value="major.cDepartment" class="filter-item" style="width: 225px"  readonly disabled/>
+                      <el-input :value="major.cDepartment" class="filter-item" readonly disabled/>
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
@@ -320,7 +320,7 @@
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                      <el-input :value="major.cDuty" class="filter-item"  style=" width: 225px"  readonly disabled/>
+                      <el-input :value="major.cDuty" class="filter-item"   readonly disabled/>
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -333,8 +333,8 @@
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                      <el-radio class="major-radio" v-model="major.dispenseBenefit" :label="false" border size="medium" >否</el-radio>
-                      <el-radio class="major-radio" v-model="major.dispenseBenefit" :label="true" border size="medium">是</el-radio>
+                      <el-radio  v-model="major.dispenseBenefit" :label="false"  size="medium" >否</el-radio>
+                      <el-radio  v-model="major.dispenseBenefit" :label="true"  size="medium">是</el-radio>
                       </el-form-item>
                     </el-col>
                       <el-col :xs="24" :sm="12" :lg="6" :span="6">
@@ -345,8 +345,8 @@
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                      <el-radio class="major-radio" v-model="major.nonnative" :label="false" border size="medium" >否</el-radio>
-                      <el-radio class="major-radio" v-model="major.nonnative" :label="true" border size="medium" >是</el-radio>
+                      <el-radio  v-model="major.nonnative" :label="false"  size="medium" >否</el-radio>
+                      <el-radio  v-model="major.nonnative" :label="true"  size="medium" >是</el-radio>
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
@@ -357,8 +357,8 @@
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                      <el-radio class="major-radio" v-model="major.refinance" :label="false" border size="medium" >否</el-radio>
-                      <el-radio class="major-radio" v-model="major.refinance" :label="true" border size="medium">是</el-radio>
+                      <el-radio  v-model="major.refinance" :label="false"  size="medium" >否</el-radio>
+                      <el-radio  v-model="major.refinance" :label="true"  size="medium">是</el-radio>
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
@@ -368,8 +368,8 @@
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                      <el-radio class="major-radio" v-model="major.loanExpire" :label="false" border size="medium" >否</el-radio>
-                      <el-radio class="major-radio" v-model="major.loanExpire" :label="true" border size="medium">是</el-radio>
+                      <el-radio  v-model="major.loanExpire" :label="false"  size="medium" >否</el-radio>
+                      <el-radio  v-model="major.loanExpire" :label="true"  size="medium">是</el-radio>
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -381,7 +381,7 @@
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                      <el-input v-model="major.loanLimit" clearable class="filter-item" style=" width: 225px">
+                      <el-input v-model="major.loanLimit" clearable class="filter-item" >
                         <template slot="append">万</template>
                       </el-input>
                       </el-form-item>
@@ -393,7 +393,7 @@
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                      <el-input v-model="major.loanPeriod" clearable class="filter-item" style=" width: 225px" >
+                      <el-input v-model="major.loanPeriod" clearable class="filter-item"  >
                         <template slot="append">年</template>
                       </el-input>
                       </el-form-item>
@@ -405,7 +405,7 @@
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                      <el-input v-model="major.loanNature" clearable class="filter-item" style=" width: 225px"  />
+                      <el-input v-model="major.loanNature" clearable class="filter-item"   />
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
@@ -415,12 +415,12 @@
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                      <el-input v-model="major.loanAim" clearable class="filter-item" style=" width: 225px"  />
+                      <el-input v-model="major.loanAim" clearable class="filter-item"   />
                       </el-form-item>
                     </el-col>
                   </el-row>
                   <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
                         label="委托人:"
                         prop="bailor"
@@ -428,19 +428,21 @@
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                      <el-input v-model="major.bailor" clearable class="filter-item" style=" width: 225px"  />
+                      <el-input v-model="major.bailor" clearable 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
                         label="委托人地址:"
                         prop="bailorAddress"
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                      <el-input v-model="major.bailorAddress" clearable class="filter-item" style=" width: 225px" />
+                      <el-input v-model="major.bailorAddress" clearable class="filter-item"   />
                       </el-form-item>
                     </el-col>
+                  </el-row>
+                  <el-row class="row-style">
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                       <el-form-item
                         label="委托联系人:"
@@ -449,7 +451,7 @@
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                      <el-input v-model="major.bailorContactName" clearable class="filter-item" style=" width: 225px" />
+                      <el-input v-model="major.bailorContactName" clearable class="filter-item" />
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
@@ -459,19 +461,19 @@
                         label-width="120px"
                         class="postInfo-container-item" 
                       >
-                      <el-input v-model="major.bailorContactTel" clearable class="filter-item" style="width: 225px"/>
+                      <el-input v-model="major.bailorContactTel" clearable class="filter-item"/>
                       </el-form-item>
                     </el-col>
                   </el-row>
                   <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
                         label="产权人:"
                         prop="owner"
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                      <el-input v-model="major.owner" clearable class="filter-item" style=" width: 225px"/>
+                      <el-input v-model="major.owner" clearable class="filter-item"/>
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
@@ -481,7 +483,7 @@
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                      <el-input v-model="major.ownerTel" clearable class="filter-item" style=" width: 225px" />
+                      <el-input v-model="major.ownerTel" clearable class="filter-item"/>
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
@@ -492,8 +494,8 @@
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                      <el-radio class="major-radio" v-model="major.urgent" :label="false" border size="medium" >否</el-radio>
-                      <el-radio class="major-radio" v-model="major.urgent" :label="true" border size="medium" >是</el-radio>
+                      <el-radio  v-model="major.urgent" :label="false"  size="medium" >否</el-radio>
+                      <el-radio  v-model="major.urgent" :label="true"  size="medium" >是</el-radio>
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -502,17 +504,17 @@
                       <el-form-item
                         label="终端客户类型:"
                         prop="terminalClienteleType"
-                        :rules="{required: true, message: '终端客户类型不能为空', trigger: 'blur'}"
                         label-width="140px"
                         class="postInfo-container-item"
                       >
-                      <el-select v-model="major.terminalClienteleType" placeholder="请选择" @change="changeCustomerType(1)">
+                      <el-select v-model="major.terminalClienteleType" placeholder="请选择" clearable @change="changeCustomerType(1)" style="width:100%">
                               <el-option label="企业" value="企业"></el-option> 
                               <el-option label="个人" value="个人"></el-option>
                             </el-select>
                       </el-form-item>
                     </el-col>
-                    <el-col :xs="24" :sm="12" :lg="6" :span="6" v-if="major.terminalClienteleType==='企业'">
+                  
+                    <el-col :xs="24" :sm="12" :lg="12" :span="6" v-if="major.terminalClienteleType!=''">
                       <el-form-item
                         label="终端客户名称:"
                         prop="terminalClienteleId"
@@ -521,17 +523,17 @@
                         class="postInfo-container-item"
                       > 
                       <div v-if="couldEdit">
-                          <el-select v-model="major.terminalClienteleId" placeholder="请选择(可搜索)" @change="findSubClientele(1)" clearable filterable style="width:80%">
+                          <el-select v-model="major.terminalClienteleId" placeholder="请选择(可搜索)" @change="findSubClientele(1)" clearable filterable style="width:90%">
                             <el-option v-for="(c,id) in tCustomerCompany" :label="c.name" :value="c.id"></el-option> 
                           </el-select>
                           <el-tooltip class="item" effect="dark" content="没有终端客户?点击新增" placement="top-end">
                             <span style="margin-left:5%;color:RGB(64,158,255);cursor:pointer" @click="createTerminalClient()">新增</span>
                           </el-tooltip>
                       </div>
-                      <el-input :value="major.tterminalClienteleName" class="filter-item"  style=" width: 225px" v-else/>
+                      <el-input :value="major.tterminalClienteleName" readonly disabled class="filter-item" v-else/>
                       </el-form-item>
                     </el-col>
-                    <el-col :xs="24" :sm="12" :lg="6" :span="6" v-if="major.terminalClienteleType==='个人'">
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6" v-if="major.terminalClienteleType=='企业'">
                       <el-form-item
                         label="终端联系人:"
                         prop="terminalClienteleContactId"
@@ -540,36 +542,36 @@
                         class="postInfo-container-item"
                       >
                         <div v-if="couldEdit">
-                          <el-select v-model="major.terminalClienteleContactId" placeholder="请选择(可搜索)"  clearable filterable @change="getTcontactInfo" style="width:80%">
+                          <el-select v-model="major.terminalClienteleContactId" placeholder="请选择(可搜索)"   clearable filterable @change="getTcontactInfo" style="width:80%">
                             <el-option v-for="(c,id) in tCustomerContract" :label="c.name" :value="c.id"></el-option> 
                           </el-select>
                           <el-tooltip class="item" effect="dark" content="没有联系人?点击新增" placement="top-end">
                             <span style="margin-left:5%;color:RGB(64,158,255);cursor:pointer" @click="createTlinkman()">新增</span>
                           </el-tooltip>
                         </div>
-                        <el-input :value="major.tterminalClienteleContactName" class="filter-item"  style=" width: 225px" v-else/>
+                        <el-input :value="major.tterminalClienteleContactName" readonly disabled class="filter-item"  v-else/>
                       </el-form-item>
                     </el-col>
-                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6" v-if="major.terminalClienteleType!=''">
                       <el-form-item
                         label="终端联系电话:"
                         prop="tmobile"
                         label-width="140px"
                         class="postInfo-container-item"
                       >
-                      <el-input :value="major.tmobile" class="filter-item"  style=" width: 225px"  readonly disabled/>
+                      <el-input :value="major.tmobile" class="filter-item"   readonly disabled/>
                       </el-form-item>
                     </el-col>
                   </el-row>
                   <el-row class="row-style">
-                    <el-col :xs="24" :sm="12" :lg="24" :span="12">
+                    <el-col :xs="24" :sm="12" :lg="18" :span="12">
                       <el-form-item
                         label="订单备注:"
                         prop="remark"
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                      <el-input v-model="major.remark" :autosize="{ minRows: 3, maxRows: 3}" clearable class="filter-item" type="textarea"  />
+                      <el-input v-model="major.remark" :autosize="{ minRows: 1, maxRows: 1}" clearable class="filter-item" type="textarea"  />
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -1958,8 +1960,22 @@
       </el-form>
     </el-dialog>
     <el-dialog :visible.sync="createTlinkmanVisible" width="70%" custom-class="createLinkman">
-      <el-divider content-position="left">新增终端客户联系人</el-divider>
+      <el-divider content-position="left">{{major.terminalClienteleType==='企业'?'新增终端客户联系人':'新增终端客户'}}</el-divider>
       <el-form ref="tLinkmanFrom" :model="tLinkmanFrom" :rules="rules" >
+        <el-row v-if="major.terminalClienteleType==='企业'">
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item
+              label="所属企业:"
+              prop="ccId"
+              label-width="120px"
+              class="postInfo-container-item"
+            >
+            <el-select v-model="major.terminalClienteleId" disabled readonly style="width:100%">
+              <el-option v-for="(c,id) in tCustomerCompany" :label="c.name" :value="c.id"></el-option> 
+            </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :xs="24" :sm="12" :lg="6" :span="6">
             <el-form-item
@@ -2115,6 +2131,7 @@
             <el-form-item
               label="联系电话:"
               prop="phone"
+              :rules="{required: true, message: '联系电话不能为空', trigger: 'blur'}"
               label-width="120px"
               class="postInfo-container-item"
             >
@@ -2188,7 +2205,7 @@
           bailorContactTel:[{required: true, message: '委托联系人电话不能为空', trigger: 'blur'},{validator:phoneNumber,trigger:'blur'}],
           ownerTel:[{required: false,validator:phoneNumber,trigger:'blur'}],
           phone:[{required: true, message: '联系电话不能为空', trigger: 'blur'},{validator:phoneNumber,trigger:'blur'}],
-          tmobile:[{required: true, message: '终端联系电话不能为空', trigger: 'blur'},{validator:phoneNumber,trigger:'blur'}],
+          // tmobile:[{required: true, message: '终端联系电话不能为空', trigger: 'blur'},{validator:phoneNumber,trigger:'blur'}],
           idNo:[{required: false,validator:isIdNumber,trigger:'blur'}],
           mobile:[{required: true, message: '联系电话不能为空', trigger: 'blur'},{validator:phoneNumber,trigger:'blur'}],
         },
@@ -2247,7 +2264,7 @@
           ownerTel:null,
           urgent:false,
           terminalClienteleId:null,
-          terminalClienteleType:"企业",
+          terminalClienteleType:'',
           terminalClienteleContactId:null,
           remark:null,
           membersName:null,
@@ -2544,6 +2561,10 @@
                 }
               })
             } else {
+              if (this.major.terminalClienteleType==='个人'){
+                  this.major.terminalClienteleContactId = this.major.terminalClienteleId;
+                  this.major.terminalClienteleId = null;
+              }
               this.$api.major.add(this.major).then(res => {
                 if (res.code === 200) {
                   if (res.data && res.data.instanceNodeId && res.data.state){
@@ -2840,15 +2861,23 @@
             })
           }
         }else {
-          if (this.major.terminalClienteleId){
+          if (this.major.terminalClienteleType==='企业' && this.major.terminalClienteleId){
             let simpleAll = new Object();
               simpleAll.terminal=val;
               simpleAll.ccId = this.major.terminalClienteleId;
-              this.$api.customerCompany.detail(this.major.terminalClienteleId).then(res=>{
+              this.$api.customerLinkman.simpleAll(simpleAll).then(res=>{
               if (res.code === 200){
-                this.major.tmobile = res.data.phone;
+                this.tCustomerContract =res.data;
               }
             })
+          }else{
+            if (this.major.terminalClienteleType==='个人' && this.major.terminalClienteleId){
+                this.$api.customerLinkman.detail(this.major.terminalClienteleId).then(res=>{
+                    if (res.code === 200){
+                      this.major.tmobile = res.data.mobile;
+                    }
+                })
+            }
           }
         }
       },
@@ -2901,13 +2930,15 @@
         }else {
           if (this.major.terminalClienteleType==='个人'){
             let simpleAll = new Object();
-            simpleAll.ccId = 1;
+            simpleAll.ccId = 2;
             simpleAll.terminal = 1;
             this.$api.customerLinkman.simpleAll(simpleAll).then(res=>{
               if (res.code === 200){
-                  this.tCustomerContract = res.data;
+                  this.tCustomerCompany = res.data;
                   if (this.major.terminalClienteleId){
                     this.major.terminalClienteleId = null
+                    this.tCustomerContract =[];
+                    this.major.tmobile = null;
                   }
               }
             })
@@ -2916,9 +2947,18 @@
               this.getCustomerCompany(1)
               if (this.major.terminalClienteleContactId){
                 this.major.terminalClienteleContactId = null
+                this.major.terminalClienteleId = null;
+                this.major.tmobile = null;
                 this.tCustomerContract =[];
               }
           }
+          if (this.major.terminalClienteleType===''){
+            this.major.terminalClienteleContactId = null;
+            this.major.terminalClienteleId = null;
+            this.major.tmobile = null;
+            this.tCustomerCompany= [];
+            this.tCustomerContract =[];
+          }
         }
       },
       getContactInfo(){
@@ -2970,8 +3010,11 @@
       createTlinkman(){
           this.createTlinkmanVisible = true;
           this.tLinkmanFrom.terminal = 1;
-          this.major.clienteleSubId = 1;
-          this.tLinkmanFrom.ccId = this.major.clienteleSubId;
+          if (this.major.terminalClienteleType==='企业'){
+                 this.tLinkmanFrom.ccId = this.major.terminalClienteleId;
+          }else{
+            this.tLinkmanFrom.ccId = 1;
+          }
       },
       saveLinkman(){
           this.$refs.linkmanFrom.validate(valid =>{
@@ -2998,6 +3041,10 @@
       saveTlinkman(){
         this.$refs.tLinkmanFrom.validate(valid =>{
             if (valid){
+                if (!this.tLinkmanFrom.ccId){
+                  this.tLinkmanFrom.ccId = 2;
+                  this.tLinkmanFrom.terminal = 1;
+                }
                 this.$api.customerLinkman.add(this.tLinkmanFrom).then(res=>{
                   if (res.code ===200){
                       this.$notify({
@@ -3007,25 +3054,41 @@
                         duration: 2000
                       });
                   }
-                  let simpleAll = new Object();
-                  simpleAll.ccId = 1;
-                  simpleAll.terminal = 1;
-                  this.$api.customerLinkman.simpleAll(simpleAll).then(res=>{
-                    if (res.code === 200){
-                        this.tCustomerContract = res.data;
-                    }
-                  })
-                  setTimeout(()=>{
-                    this.major.terminalClienteleContactId = this.tCustomerContract[0].id;
-                    this.getTcontactInfo();
-                  },2000)
+                  if (this.major.terminalClienteleType==='企业'){
+                    this.findSubClientele(1);
+                    setTimeout(()=>{
+                      this.major.terminalClienteleContactId = this.tCustomerContract[0].id;
+                      this.getTcontactInfo();
+                    },2000)
+                  }
+                  if (this.major.terminalClienteleType==='个人'){
+                    let simpleAll = new Object();
+                    simpleAll.ccId = 2;
+                    simpleAll.terminal = 1;
+                    this.$api.customerLinkman.simpleAll(simpleAll).then(res=>{
+                      if (res.code === 200){
+                          this.tCustomerCompany = res.data;
+                      }
+                    })
+                    setTimeout(()=>{
+                      this.major.terminalClienteleId = this.tCustomerCompany[0].id;
+                      this.major.terminalClienteleContactId = this.tCustomerCompany[0].id;
+                      this.getTcontactInfo();
+                    },2000)
+                  }
+                  
                   this.createTlinkmanVisible=false;
                 })
             }
           })
       },
       createTerminalClient(){
-        this.createTerminalClientVisible = true;
+        if (this.major.terminalClienteleType==='企业'){
+          this.createTerminalClientVisible = true;
+        }else{
+          this.createTlinkmanVisible = true;
+        }
+        
       },
       saveClient(){
           this.$refs.terminalClientFrom.validate(valid =>{
@@ -3040,6 +3103,9 @@
                       });
                   }
                   this.getCustomerCompany(1);
+                  this.major.terminalClienteleContactId = null;
+                  this.major.tmobile = null;
+                  this.tCustomerContract =[];
                   setTimeout(()=>{
                     this.major.terminalClienteleId  = this.tCustomerCompany[0].id;
                     this.findSubClientele(1);
@@ -3059,9 +3125,6 @@
     margin-right:1%;
   }
 
-  .major-radio{
-    width:92px
-  }
 
   .task-class{
     /deep/ .el-form-item__label {
@@ -3073,7 +3136,6 @@
     margin-top:35px;
   }
   .pane-class{
-    height:800px;
     width:100%;
     overflow-y: scroll;
   }

+ 6 - 6
src/views/major/list.vue

@@ -8,12 +8,12 @@
         <MoreSearchBar business="MAJOR_BUSINESS" @fliterSearch="fliterSearch" @resetParams="resetParams" :listQuery="listQuery" :nodes="majorNodes"></MoreSearchBar>
       </template>
       <parentTable ref="table" v-loading="listLoading" :data="pageData.records" slot="table" style="width: 100%;" @sortTable="sortTable" >
-        <el-table-column label="项目名称" align="center" width="200" >
+        <el-table-column label="项目名称" align="center" width="200">
           <template slot-scope="{row}">
             <span>{{ row.productionName==null?row.name: row.productionName }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="订单号" align="center" width="150">
+        <el-table-column label="订单号" align="center" width="150" >
           <template slot-scope="{row}">
             <span>{{ row.orderId }}</span>
           </template>
@@ -75,7 +75,7 @@
         </el-table-column>
         <el-table-column label="负责人" align="center">
           <template slot-scope="{row}">
-            <span>{{ row.principal }}</span>
+            <span>{{ row.principal==null?'-': row.principal }}</span>
           </template>
         </el-table-column>
         <el-table-column label="接单部门" align="center" width="130">
@@ -108,14 +108,14 @@
             {{ row.cmobile }}
           </template>
         </el-table-column>
-        <el-table-column label="下单时间" align="center" width="100" prop="created" sortable>
+        <el-table-column label="下单时间" align="center" width="110" prop="created" sortable>
           <template slot-scope="{row}">
             {{ row.created }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="80" fixed="right">
+        <el-table-column label="操作" align="center" width="70" fixed="right">
           <template slot-scope="{row}">
-            <el-button round type="primary" @click="orderDetail(row)">详情</el-button>
+            <el-button type="text" @click="orderDetail(row)">详情</el-button>
           </template>
         </el-table-column>
       </parentTable>

+ 4 - 7
src/views/major/myOrder.vue

@@ -5,11 +5,9 @@
     </div>
     <y-page-list-layout :page-list="pageData" :page-para="listQuery" :get-page-list="getList">
       <template slot="left">
-        <el-col :xs="24" :sm="12" :lg="2" :span="6">
-          <PermissionButton menu-code="_views_major_order" class-name="filter-item" type="danger"
-            icon="el-icon-circle-plus-outline" :page-jump="true" round style="float: left"
-            :page-query="{ 'couldEdit': true, 'couldBack': true }" />
-        </el-col>
+        <PermissionButton menu-code="_views_major_order" class-name="filter-item" type="danger"
+            icon="el-icon-circle-plus-outline" :page-jump="true" round style="position: absolute;left:1100px;z-index:9"
+            :page-query="{ 'couldEdit': true, 'couldBack': true}" />
         <MoreSearchBar business="MAJOR_BUSINESS" @fliterSearch="fliterSearch" @resetParams="resetParams"
           :listQuery="listQuery" :nodeCode="false" :financial="false" :clientManager="false" :businessObjectType="false"
           :department="false"></MoreSearchBar>
@@ -84,8 +82,7 @@
           <template slot-scope="{row}">
             <div>
               <PermissionButton menu-code="_views_myOrder_detail" class-name="filter-item" type="text" :page-jump="true"
-                size="mini"
-                :page-query="{ 'couldEdit': false, 'id': row.id, 'back': '/major/my/order', 'recall': true, 'couldBack': true }" />
+                size="mini" :page-query="{ 'couldEdit': false, 'id': row.id, 'back': '/major/my/order', 'recall': true, 'couldBack': true }" />
               <el-button type="text" size="small" @click="openShouldAmountDialog(row)">应收款</el-button>
               <el-button type="text" size="small" @click="openAllotProductionDialog(row)">实收款分配</el-button>
             </div>

+ 1 - 1
src/views/major/oldList.vue

@@ -135,7 +135,7 @@
         
         <el-table-column label="操作" align="center" width="80" fixed="right">
           <template slot-scope="{row}">
-            <el-button round type="primary" @click="jumpToOldSystem(row.flowInstanceId)">跳转</el-button>
+            <el-button type="text" @click="jumpToOldSystem(row.flowInstanceId)">跳转</el-button>
           </template>
         </el-table-column>
       </parentTable>

+ 23 - 0
src/views/major/performanceList.vue

@@ -118,6 +118,12 @@ export default {
     }
   },
   created() {
+    this.reportNo = this.$route.query.reportNo;
+    this.performance.majorProductionId = this.$route.query.id;
+    this.majorId= this.$route.query.majorId;
+    if (this.performance.majorProductionId){
+      this.autoPerformanceAllot();
+    }
     this.getList();
   },
   methods: {
@@ -144,6 +150,23 @@ export default {
         }
       })
     },
+
+    autoPerformanceAllot(){
+      this.allotDialog = true;
+      this.$api.majorPerformanceAllot.list(this.performance.majorProductionId).then(res=>{
+        if (res.code ===200 ){
+          const list = res.data;
+          for (let i in list){
+              if (list[i].ratio==null){
+                list[i].ratio = 0;
+              }else {
+                list[i].ratio = (list[i].ratio)*100;
+              }
+          }
+          this.performance.performanceList = list;
+        }
+      })
+    },
     doPerformanceAllot(row){
       this.allotDialog = true;
       this.reportNo = row.reportNo;

+ 1 - 1
src/views/major/saveFileDoneList.vue

@@ -82,7 +82,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="130">
           <template slot-scope="{row}">
-            <el-button type="danger" round @click="toDetail(row)">产品详情</el-button>
+            <el-button type="text" @click="toDetail(row)">产品详情</el-button>
           </template>
         </el-table-column>
       </parentTable>

+ 158 - 111
src/views/major/todoDetail.vue

@@ -54,15 +54,14 @@
                       <el-form-item label="客户经理:" prop="clientManager"
                         :rules="{ required: true, message: '客户经理不能为空', trigger: 'blur' }" label-width="120px"
                         class="postInfo-container-item">
-                        <el-input :value="major.clientManager" class="filter-item" readonly disabled
-                          style=" width: 225px" />
+                        <el-input :value="major.clientManager" class="filter-item" readonly disabled />
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                       <el-form-item label="订单属性:" prop="financial"
                         :rules="{ required: true, message: '订单属性不能为空', trigger: 'blur' }" label-width="120px"
                         class="postInfo-container-item">
-                        <el-select v-model="major.financial" placeholder="请选择" readonly disabled>
+                        <el-select v-model="major.financial" placeholder="请选择" readonly disabled style=" width: 100%">
                           <el-option label="金融" :value="true">金融</el-option>
                           <el-option label="非金融" :value="false">非金融</el-option>
                         </el-select>
@@ -72,15 +71,15 @@
                       <el-form-item label="派单方式:" prop="allotType"
                         :rules="{ required: true, message: '派单方式不能为空', trigger: 'blur' }" label-width="120px"
                         class="postInfo-container-item">
-                        <el-select v-model="major.allotType" placeholder="请选择" readonly disabled>
+                        <el-select v-model="major.allotType" placeholder="请选择" readonly disabled style=" width: 100%">
                           <el-option label="部门轮单" value="轮单"></el-option>
                           <el-option label="部门指派" value="指派"></el-option>
                         </el-select>
                       </el-form-item>
                     </el-col>
-                    <el-col :xs="24" :sm="12" :lg="4" :span="6">
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
                       <el-form-item label="接单部门:" prop="departmentId" label-width="120px" class="postInfo-container-item">
-                        <el-select v-model="major.departmentId" placeholder="请选择" readonly disabled>
+                        <el-select v-model="major.departmentId" placeholder="请选择" readonly disabled style=" width: 100%">
                           <el-option v-for="(d, id) in allotDepartment" :label="d.name" :value="d.id"></el-option>
                         </el-select>
                       </el-form-item>
@@ -91,7 +90,7 @@
                       <el-form-item label="项目负责人:" prop="principalId" label-width="120px"
                         :class="['postInfo-container-item', currentNode.nodeCode === 'DEPARTMENT_ALLOCATION' ? 'task-class' : '']"
                         :rules="{ required: true, message: '项目负责人不能为空', trigger: 'blur' }">
-                        <el-select v-model="major.principalId" placeholder="请选择"
+                        <el-select v-model="major.principalId" placeholder="请选择" style=" width: 100%"
                           :filterable="currentNode.nodeCode === 'DEPARTMENT_ALLOCATION'"
                           :clearable="currentNode.nodeCode === 'DEPARTMENT_ALLOCATION'"
                           :readonly="currentNode.nodeCode != 'DEPARTMENT_ALLOCATION'"
@@ -108,18 +107,18 @@
                           :filterable="currentNode.nodeCode === 'DEPARTMENT_ALLOCATION'"
                           :clearable="currentNode.nodeCode === 'DEPARTMENT_ALLOCATION'"
                           :readonly="currentNode.nodeCode != 'DEPARTMENT_ALLOCATION'"
-                          :disabled="currentNode.nodeCode != 'DEPARTMENT_ALLOCATION'" style=" width: 686px">
+                          :disabled="currentNode.nodeCode != 'DEPARTMENT_ALLOCATION'" style=" width: 100%">
                           <el-option v-for="(u, id) in allUsers" :label="u.name" :value="u.id"></el-option>
                         </el-select>
                       </el-form-item>
                     </el-col>
                   </el-row>
                   <el-row class="row-style">
-                    <el-col :xs="12" :sm="12" :lg="23" :span="6">
+                    <el-col :xs="12" :sm="12" :lg="18" :span="6">
                       <el-form-item label="订单名称:" prop="name"
                         :rules="{ required: true, message: '订单名称不能为空', trigger: 'blur' }" label-width="120px"
                         class="postInfo-container-item">
-                        <el-input v-model="major.name" class="filter-item" style=" width: 100%" readonly disabled />
+                        <el-input v-model="major.name" class="filter-item"  readonly disabled />
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -128,7 +127,7 @@
                       <el-form-item label="对象类型:" prop="businessObjectType"
                         :rules="{ required: true, message: '评估对象类型不能为空', trigger: 'blur' }" label-width="120px"
                         class="postInfo-container-item">
-                        <el-select v-model="major.businessObjectType" placeholder="请选择" readonly disabled>
+                        <el-select v-model="major.businessObjectType" placeholder="请选择" readonly disabled style=" width: 100%">
                           <el-option label="土地" value="土地"></el-option>
                           <el-option label="房地产" value="房地产"></el-option>
                         </el-select>
@@ -136,7 +135,7 @@
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6" v-if="major.businessObjectType === '房地产'">
                       <el-form-item label="特殊类型:" prop="specialType" label-width="120px" class="postInfo-container-item">
-                        <el-select v-model="major.specialType" placeholder="请选择" readonly disabled>
+                        <el-select v-model="major.specialType" placeholder="请选择" readonly disabled style=" width: 100%">
                           <el-option label="在建工程" value="在建工程"></el-option>
                           <el-option label="加油加气站" value="加油加气站"></el-option>
                           <el-option label="电站" value="电站"></el-option>
@@ -147,7 +146,7 @@
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                       <el-form-item label="业务类型:" prop="businessGener" label-width="120px"
                         class="postInfo-container-item">
-                        <el-select v-model="major.businessGener" placeholder="请选择" readonly disabled>
+                        <el-select v-model="major.businessGener" placeholder="请选择" readonly disabled style=" width: 100%">
                           <el-option label="部门轮单" value="轮单"></el-option>
                           <el-option label="部门指派" value="指派"></el-option>
                         </el-select>
@@ -157,7 +156,7 @@
                       <el-form-item label="评估目的:" prop="evaluateAim"
                         :rules="{ required: true, message: '评估目的不能为空', trigger: 'blur' }" label-width="120px"
                         class="postInfo-container-item">
-                        <el-select v-model="major.evaluateAim" placeholder="请选择" readonly disabled>
+                        <el-select v-model="major.evaluateAim" placeholder="请选择" readonly disabled style=" width: 100%">
                           <el-option label="抵押" value="抵押"></el-option>
                           <el-option label="咨询" value="咨询"></el-option>
                           <el-option label="融资" value="融资"></el-option>
@@ -173,9 +172,9 @@
                       <el-form-item label="再次委托:" prop="entrustAgain"
                         :rules="{ required: true, message: '再次委托不能为空', trigger: 'blur' }" label-width="120px"
                         class="postInfo-container-item">
-                        <el-radio class="major-radio" v-model="major.entrustAgain" :label="false" border size="medium"
+                        <el-radio  v-model="major.entrustAgain" :label="false" size="medium"
                           readonly disabled>否</el-radio>
-                        <el-radio class="major-radio" v-model="major.entrustAgain" :label="true" border size="medium"
+                        <el-radio  v-model="major.entrustAgain" :label="true" size="medium"
                           readonly disabled>是</el-radio>
                       </el-form-item>
                     </el-col>
@@ -183,9 +182,9 @@
                       <el-form-item label="分户搬迁:" prop="multipleRemoval"
                         :rules="{ required: true, message: '分户搬迁不能为空', trigger: 'blur' }" label-width="120px"
                         class="postInfo-container-item">
-                        <el-radio class="major-radio" v-model="major.multipleRemoval" :label="false" border size="medium"
+                        <el-radio  v-model="major.multipleRemoval" :label="false" size="medium"
                           readonly disabled>否</el-radio>
-                        <el-radio class="major-radio" v-model="major.multipleRemoval" :label="true" border size="medium"
+                        <el-radio  v-model="major.multipleRemoval" :label="true" size="medium"
                           readonly disabled>是</el-radio>
                       </el-form-item>
                     </el-col>
@@ -193,9 +192,9 @@
                       <el-form-item label="是否口估:" prop="informalEvaluate"
                         :rules="{ required: true, message: '是否口估不能为空', trigger: 'blur' }" label-width="120px"
                         class="postInfo-container-item">
-                        <el-radio class="major-radio" v-model="major.informalEvaluate" :label="false" border size="medium"
+                        <el-radio  v-model="major.informalEvaluate" :label="false" size="medium"
                           readonly disabled>否</el-radio>
-                        <el-radio class="major-radio" v-model="major.informalEvaluate" :label="true" border size="medium"
+                        <el-radio  v-model="major.informalEvaluate" :label="true" size="medium"
                           readonly disabled>是</el-radio>
                       </el-form-item>
                     </el-col>
@@ -205,7 +204,7 @@
                       <el-form-item label="客户类型:" prop="clienteleType"
                         :rules="{ required: true, message: '客户类型不能为空', trigger: 'blur' }" label-width="120px"
                         class="postInfo-container-item">
-                        <el-select v-model="major.clienteleType" placeholder="请选择" readonly disabled>
+                        <el-select v-model="major.clienteleType" placeholder="请选择" readonly disabled style=" width: 100%">
                           <el-option label="企业" value="企业"></el-option>
                           <el-option label="个人" value="个人"></el-option>
                         </el-select>
@@ -213,13 +212,13 @@
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                       <el-form-item label="客户名称:" prop="clienteleId" label-width="120px" class="postInfo-container-item">
-                        <el-input :value="major.cclienteleName" class="filter-item" style=" width: 225px" readonly
+                        <el-input :value="major.cclienteleName" class="filter-item" readonly
                           disabled />
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                       <el-form-item label="业务来源:" prop="clienteleId" label-width="120px" class="postInfo-container-item">
-                        <el-input :value="major.cclienteleSubName" class="filter-item" style=" width: 225px" readonly
+                        <el-input :value="major.cclienteleSubName" class="filter-item" readonly
                           disabled />
                       </el-form-item>
                     </el-col>
@@ -229,27 +228,27 @@
                       <el-form-item label="客户联系人:" prop="clienteleContactId"
                         :rules="{ required: true, message: '客户联系人不能为空', trigger: 'blur' }" label-width="120px"
                         class="postInfo-container-item">
-                        <el-input :value="major.cclienteleContactName" class="filter-item" style=" width: 225px" readonly
+                        <el-input :value="major.cclienteleContactName" class="filter-item" readonly
                           disabled />
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                       <el-form-item label="联系人电话:" prop="clienteleContactId" label-width="120px"
                         class="postInfo-container-item">
-                        <el-input :value="major.cmobile" class="filter-item" style=" width: 225px" readonly disabled />
+                        <el-input :value="major.cmobile" class="filter-item" readonly disabled />
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                       <el-form-item label="联系人部门:" prop="clienteleContactId" label-width="120px"
                         class="postInfo-container-item">
-                        <el-input :value="major.cdepartment" class="filter-item" style=" width: 225px" readonly
+                        <el-input :value="major.cdepartment" class="filter-item"  readonly
                           disabled />
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                       <el-form-item label="联系人职务:" prop="clienteleContactId" label-width="120px"
                         class="postInfo-container-item">
-                        <el-input :value="major.cduty" class="filter-item" style=" width: 225px" readonly disabled />
+                        <el-input :value="major.cduty" class="filter-item" readonly disabled />
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -258,9 +257,9 @@
                       <el-form-item label="分配产值:" prop="dispenseBenefit"
                         :rules="{ required: true, message: '分配产值不能为空', trigger: 'blur' }" label-width="120px"
                         class="postInfo-container-item">
-                        <el-radio class="major-radio" v-model="major.dispenseBenefit" :label="false" border size="medium"
+                        <el-radio  v-model="major.dispenseBenefit" :label="false" size="medium"
                           readonly disabled>否</el-radio>
-                        <el-radio class="major-radio" v-model="major.dispenseBenefit" :label="true" border size="medium"
+                        <el-radio  v-model="major.dispenseBenefit" :label="true" size="medium"
                           readonly disabled>是</el-radio>
                       </el-form-item>
                     </el-col>
@@ -268,9 +267,9 @@
                       <el-form-item label="是否异地:" prop="nonnative"
                         :rules="{ required: true, message: '是否异地不能为空', trigger: 'blur' }" label-width="120px"
                         class="postInfo-container-item">
-                        <el-radio class="major-radio" v-model="major.nonnative" :label="false" border size="medium"
+                        <el-radio  v-model="major.nonnative" :label="false" size="medium"
                           readonly disabled>否</el-radio>
-                        <el-radio class="major-radio" v-model="major.nonnative" :label="true" border size="medium"
+                        <el-radio  v-model="major.nonnative" :label="true" size="medium"
                           readonly disabled>是</el-radio>
                       </el-form-item>
                     </el-col>
@@ -278,17 +277,17 @@
                       <el-form-item label="是否续贷:" prop="refinance"
                         :rules="{ required: true, message: '是否续贷不能为空', trigger: 'blur' }" label-width="120px"
                         class="postInfo-container-item">
-                        <el-radio class="major-radio" v-model="major.refinance" :label="false" border size="medium"
+                        <el-radio  v-model="major.refinance" :label="false" size="medium"
                           readonly disabled>否</el-radio>
-                        <el-radio class="major-radio" v-model="major.refinance" :label="true" border size="medium"
+                        <el-radio  v-model="major.refinance" :label="true" size="medium"
                           readonly disabled>是</el-radio>
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                       <el-form-item label="贷款到期:" prop="loanExpire" label-width="120px" class="postInfo-container-item">
-                        <el-radio class="major-radio" v-model="major.loanExpire" :label="false" border size="medium"
+                        <el-radio  v-model="major.loanExpire" :label="false" size="medium"
                           readonly disabled>否</el-radio>
-                        <el-radio class="major-radio" v-model="major.loanExpire" :label="true" border size="medium"
+                        <el-radio  v-model="major.loanExpire" :label="true" size="medium"
                           readonly disabled>是</el-radio>
                       </el-form-item>
                     </el-col>
@@ -296,50 +295,52 @@
                   <el-row class="row-style">
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                       <el-form-item label="贷款额度:" prop="loanLimit" label-width="120px" class="postInfo-container-item">
-                        <el-input v-model="major.loanLimit" class="filter-item" style=" width: 225px" readonly disabled>
+                        <el-input v-model="major.loanLimit" class="filter-item" readonly disabled>
                           <template slot="append">万元</template>
                         </el-input>
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                       <el-form-item label="贷款期限:" prop="loanPeriod" label-width="120px" class="postInfo-container-item">
-                        <el-input v-model="major.loanPeriod" class="filter-item" style=" width: 225px" readonly disabled>
+                        <el-input v-model="major.loanPeriod" class="filter-item" readonly disabled>
                           <template slot="append">年</template>
                         </el-input>
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                       <el-form-item label="贷款性质:" prop="loanNature" label-width="120px" class="postInfo-container-item">
-                        <el-input v-model="major.loanNature" class="filter-item" style=" width: 225px" readonly
+                        <el-input v-model="major.loanNature" class="filter-item" readonly
                           disabled />
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                       <el-form-item label="贷款用途:" prop="loanAim" label-width="120px" class="postInfo-container-item">
-                        <el-input v-model="major.loanAim" class="filter-item" style=" width: 225px" readonly disabled />
+                        <el-input v-model="major.loanAim" class="filter-item" readonly disabled />
                       </el-form-item>
                     </el-col>
                   </el-row>
                   <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 label="委托人:" prop="bailor"
                         :rules="{ required: true, message: '委托人不能为空', trigger: 'blur' }" label-width="120px"
                         class="postInfo-container-item">
-                        <el-input v-model="major.bailor" class="filter-item" style=" width: 225px" readonly disabled />
+                        <el-input v-model="major.bailor" class="filter-item"  readonly disabled />
                       </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 label="委托人地址:" prop="bailorAddress" label-width="120px"
                         class="postInfo-container-item">
-                        <el-input v-model="major.bailorAddress" class="filter-item" style=" width: 225px" readonly
+                        <el-input v-model="major.bailorAddress" class="filter-item"  readonly
                           disabled />
                       </el-form-item>
                     </el-col>
+                    </el-row>
+                    <el-row class="row-style">
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                       <el-form-item label="委托联系人:" prop="bailorContactName"
                         :rules="{ required: true, message: '委托联系人不能为空', trigger: 'blur' }" label-width="120px"
                         class="postInfo-container-item">
-                        <el-input v-model="major.bailorContactName" class="filter-item" style=" width: 225px" readonly
+                        <el-input v-model="major.bailorContactName" class="filter-item"  readonly
                           disabled />
                       </el-form-item>
                     </el-col>
@@ -347,29 +348,29 @@
                       <el-form-item label="委托电话:" prop="bailorContactTel"
                         :rules="{ required: true, message: '委托联系人电话不能为空', trigger: 'blur' }" label-width="120px"
                         class="postInfo-container-item">
-                        <el-input v-model="major.bailorContactTel" class="filter-item" style=" width: 225px" readonly
+                        <el-input v-model="major.bailorContactTel" class="filter-item" readonly
                           disabled />
                       </el-form-item>
                     </el-col>
                   </el-row>
                   <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 label="产权人:" prop="owner" label-width="120px" class="postInfo-container-item">
-                        <el-input v-model="major.owner" class="filter-item" style=" width: 225px" readonly disabled />
+                        <el-input v-model="major.owner" class="filter-item" readonly disabled />
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                       <el-form-item label="产权人电话:" prop="ownerTel" label-width="120px" class="postInfo-container-item">
-                        <el-input v-model="major.ownerTel" class="filter-item" style=" width: 225px" readonly disabled />
+                        <el-input v-model="major.ownerTel" class="filter-item"  readonly disabled />
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                       <el-form-item label="是否加急:" prop="urgent"
                         :rules="{ required: true, message: '是否加急不能为空', trigger: 'blur' }" label-width="120px"
                         class="postInfo-container-item">
-                        <el-radio class="major-radio" v-model="major.urgent" :label="false" border size="medium" readonly
+                        <el-radio  v-model="major.urgent" :label="false" size="medium" readonly
                           disabled>否</el-radio>
-                        <el-radio class="major-radio" v-model="major.urgent" :label="true" border size="medium" readonly
+                        <el-radio  v-model="major.urgent" :label="true" size="medium" readonly
                           disabled>是</el-radio>
                       </el-form-item>
                     </el-col>
@@ -379,37 +380,37 @@
                       <el-form-item label="终端客户类型:" prop="terminalClienteleType"
                         :rules="{ required: true, message: '终端客户类型不能为空', trigger: 'blur' }" label-width="140px"
                         class="postInfo-container-item">
-                        <el-select v-model="major.terminalClienteleType" placeholder="请选择" readonly disabled>
+                        <el-select v-model="major.terminalClienteleType" placeholder="请选择" readonly disabled style=" width: 100%">
                           <el-option label="企业" value="企业"></el-option>
                           <el-option label="个人" value="个人"></el-option>
                         </el-select>
                       </el-form-item>
                     </el-col>
-                    <el-col :xs="24" :sm="12" :lg="6" :span="6" v-if="major.terminalClienteleType === '企业'">
+                    <el-col :xs="24" :sm="12" :lg="12" :span="6" v-if="major.terminalClienteleType!=''">
                       <el-form-item label="终端客户名称:" prop="terminalClienteleId" label-width="140px"
                         :rules="{ required: true, message: '终端客户名称不能为空', trigger: 'blur' }" class="postInfo-container-item">
-                        <el-input :value="major.tterminalClienteleName" class="filter-item" style=" width: 225px" readonly
+                        <el-input :value="major.tterminalClienteleName" class="filter-item"  readonly
                           disabled />
                       </el-form-item>
                     </el-col>
-                    <el-col :xs="24" :sm="12" :lg="6" :span="6" v-if="major.terminalClienteleType === '个人'">
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6" v-if="major.terminalClienteleType=='企业'">
                       <el-form-item label="终端联系人:" prop="terminalClienteleContactId" label-width="120px"
                         :rules="{ required: true, message: '终端联系人不能为空', trigger: 'blur' }" class="postInfo-container-item">
-                        <el-input :value="major.tterminalClienteleContactName" class="filter-item" style=" width: 225px"
+                        <el-input :value="major.tterminalClienteleContactName" class="filter-item"
                           readonly disabled />
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                       <el-form-item label="终端联系电话:" prop="clienteleType" label-width="130px"
                         class="postInfo-container-item">
-                        <el-input :value="major.tmobile" class="filter-item" style=" width: 225px" readonly disabled />
+                        <el-input :value="major.tmobile" class="filter-item" readonly disabled />
                       </el-form-item>
                     </el-col>
                   </el-row>
                   <el-row class="row-style">
-                    <el-col :xs="24" :sm="12" :lg="24" :span="12">
+                    <el-col :xs="24" :sm="12" :lg="18" :span="12">
                       <el-form-item label="订单备注:" prop="remark" label-width="120px" class="postInfo-container-item">
-                        <el-input v-model="major.remark" :autosize="{ minRows: 4, maxRows: 4 }" class="filter-item"
+                        <el-input v-model="major.remark" :autosize="{ minRows: 1, maxRows: 1 }" class="filter-item"
                           type="textarea" readonly disabled />
                       </el-form-item>
                     </el-col>
@@ -1952,7 +1953,10 @@ export default {
     getAllUser() {
       this.$api.user.simpleAll().then(res => {
         if (res.code === 200) {
-          this.allUsers = res.data;
+          this.allUsers = this.principals;
+          for (let i in res.data) {
+            this.allUsers.push(res.data[i]);
+          }
         }
       })
     },
@@ -1968,7 +1972,8 @@ export default {
                   title: '成功',
                   message: '保存成功,请提交节点继续流程。',
                   type: 'success',
-                  duration: 2000
+                  duration: 1000,
+                  offset: 100
                 });
               }
             })
@@ -2068,7 +2073,8 @@ export default {
                   title: '成功',
                   message: '若还有估价对象请继续添加,没有则请提交节点继续流程。',
                   type: 'success',
-                  duration: 4000
+                  duration: 2000,
+                  offset: 100
                 });
                 this.getLandTargetList();
                 this.landDialogVisible = false;
@@ -2080,7 +2086,8 @@ export default {
                   title: '失败',
                   message: '估价对象添加失败。',
                   type: 'error',
-                  duration: 2000
+                  duration: 1000,
+                  offset: 100
                 });
               }
             })
@@ -2093,7 +2100,8 @@ export default {
             title: '提示',
             message: '项目id不存在,请联系技术管理员。',
             type: 'info',
-            duration: 2000
+            duration: 1000,
+            offset: 100
           });
         }
       }
@@ -2130,7 +2138,8 @@ export default {
                   title: '提示',
                   message: '估价对象删除成功',
                   type: 'success',
-                  duration: 2000
+                  duration: 1000,
+                  offset: 100
                 });
                 this.getLandTargetList();
               } else {
@@ -2138,7 +2147,8 @@ export default {
                   title: '失败',
                   message: '估价对象删除失败。',
                   type: 'error',
-                  duration: 2000
+                  duration: 1000,
+                  offset: 100
                 });
               }
             })
@@ -2153,7 +2163,8 @@ export default {
             title: '失败',
             message: '评估方法不能为空',
             type: 'info',
-            duration: 2000
+            duration: 1000,
+            offset: 100
           });
           return;
         }
@@ -2162,7 +2173,8 @@ export default {
             title: '失败',
             message: '房屋用途不能为空',
             type: 'info',
-            duration: 2000
+            duration: 1000,
+            offset: 100
           });
           return;
         }
@@ -2183,7 +2195,8 @@ export default {
             title: '失败',
             message: '评估方法不能为空',
             type: 'info',
-            duration: 2000
+            duration: 1000,
+            offset: 100
           });
           return;
         }
@@ -2210,7 +2223,8 @@ export default {
             title: '成功',
             message: '估价对象修改编辑成功。',
             type: 'success',
-            duration: 2000
+            duration: 1000,
+            offset: 100
           });
           this.getLandTargetList();
           this.landDialogVisible = false;
@@ -2222,7 +2236,8 @@ export default {
             title: '失败',
             message: '估价对象编辑失败。',
             type: 'error',
-            duration: 2000
+            duration: 1000,
+            offset: 100
           });
         }
       })
@@ -2251,7 +2266,8 @@ export default {
             title: '成功',
             message: '估价对象操作成功,请提交节点继续流程。',
             type: 'success',
-            duration: 4000
+            duration: 2000,
+            offset: 100
           });
           this.getLandTargetList();
           this.landDialogVisible = false;
@@ -2263,7 +2279,8 @@ export default {
             title: '失败',
             message: '估价对象操作失败。',
             type: 'error',
-            duration: 2000
+            duration: 1000,
+            offset: 100
           });
         }
       })
@@ -2331,7 +2348,8 @@ export default {
             title: '成功',
             message: '保存客户反馈信息成功,请提交节点继续流程',
             type: 'success',
-            duration: 2000
+            duration: 1000,
+            offset: 100
           });
           this.checkFundDialog = false;
           this.nodeBusinessInfo.production = this.feedback.production;
@@ -2343,7 +2361,8 @@ export default {
             title: '失败',
             message: '保存客户反馈信息失败,请联系系统管理员',
             type: 'error',
-            duration: 2000
+            duration: 1000,
+            offset: 100
           });
         }
       })
@@ -2367,7 +2386,8 @@ export default {
           title: '警告',
           message: '取号年份未选择,请选择再取号。',
           type: 'warning',
-          duration: 1000
+          duration: 1000,
+          offset: 100
         });
         return;
       }
@@ -2385,7 +2405,8 @@ export default {
             title: '成功',
             message: '取号成功。',
             type: 'success',
-            duration: 2000
+            duration: 1000,
+            offset: 100
           });
           this.getLandTargetList();
           this.createProduction(res.data);
@@ -2396,7 +2417,8 @@ export default {
             title: '失败',
             message: '取号失败。',
             type: 'error',
-            duration: 2000
+            duration: 1000,
+            offset: 100
           });
         }
       })
@@ -2442,7 +2464,8 @@ export default {
               title: '成功',
               message: '产品创建成功,请完善产品信息。',
               type: 'success',
-              duration: 2000
+              duration: 2000,
+              offset: 100
             });
             this.takeNumberItems = []
             this.getProductions(this.majorId, null);
@@ -2452,7 +2475,8 @@ export default {
               title: '失败',
               message: '产品创建失败,请联系系统管理员。',
               type: 'error',
-              duration: 2000
+              duration: 2000,
+              offset: 100
             });
           }
         })
@@ -2582,7 +2606,8 @@ export default {
           title: '错误',
           message: '产品上传失败',
           type: 'error',
-          duration: 2000
+          duration: 2000,
+          offset: 100
         });
         fileList.pop();
       }
@@ -2608,7 +2633,8 @@ export default {
           title: '错误',
           message: '产品上传失败',
           type: 'error',
-          duration: 2000
+          duration: 2000,
+          offset: 100
         });
         fileList.pop();
       }
@@ -2653,7 +2679,8 @@ export default {
                     title: '成功',
                     message: '产品信息更新成功',
                     type: 'success',
-                    duration: 4000
+                    duration: 1000,
+                    offset: 100
                   });
                   this.taskRecordDTO = {};
                   this.getProductions(this.majorId, (this.reportNo == null ? this.statementNo : this.reportNo));
@@ -2662,7 +2689,8 @@ export default {
                     title: '失败',
                     message: '产品信息完善失败',
                     type: 'error',
-                    duration: 2000
+                    duration: 1000,
+                    offset: 100
                   });
                 }
               })
@@ -2686,7 +2714,8 @@ export default {
               title: '成功',
               message: '初审状态已更新,请点击提交按钮继续流程。',
               type: 'success',
-              duration: 2000
+              duration: 2000,
+              offset: 100
             });
           }
         })
@@ -2705,7 +2734,8 @@ export default {
               title: '成功',
               message: '复审状态已更新,请点击提交按钮继续流程。',
               type: 'success',
-              duration: 2000
+              duration: 2000,
+              offset: 100
             });
           }
         })
@@ -2724,7 +2754,8 @@ export default {
               title: '成功',
               message: '三审状态已更新,请点击提交按钮继续流程。',
               type: 'success',
-              duration: 2000
+              duration: 2000,
+              offset: 100
             });
           }
         })
@@ -2743,7 +2774,8 @@ export default {
               title: '成功',
               message: '归档状态已更新,请点击提交按钮继续流程。',
               type: 'success',
-              duration: 2000
+              duration: 2000,
+              offset: 100
             });
           }
         })
@@ -2762,7 +2794,8 @@ export default {
               title: '成功',
               message: '复审部归档状态已更新,请点击提交按钮继续流程。',
               type: 'success',
-              duration: 2000
+              duration: 2000,
+              offset: 100
             });
           }
         })
@@ -2828,7 +2861,8 @@ export default {
                 title: '提示',
                 message: '还有价值意见书号未取的估价对象,请先完成取号操作。',
                 type: 'error',
-                duration: 3000
+                duration: 3000,
+                offset: 100
               });
               verify.state = false;
               callback(verify);
@@ -2839,7 +2873,8 @@ export default {
                 title: '提示',
                 message: '请选择一个产品后,再进行流程提交。',
                 type: 'error',
-                duration: 3000
+                duration: 3000,
+                offset: 100
               });
               verify.state = false;
               callback(verify);
@@ -2854,7 +2889,8 @@ export default {
                 title: '提示',
                 message: '请完成所选产品的基本信息后,再进行流程提交。',
                 type: 'error',
-                duration: 3000
+                duration: 3000,
+                offset: 100
               });
               verify.state = false;
               callback(verify);
@@ -2881,7 +2917,8 @@ export default {
                 title: '提示',
                 message: '请选择一个产品后,再进行流程提交。',
                 type: 'error',
-                duration: 3000
+                duration: 3000,
+                offset: 100
               });
               verify.state = false;
               callback(verify);
@@ -2896,7 +2933,8 @@ export default {
                 title: '提示',
                 message: '请完成所选产品的基本信息后,再进行流程提交。',
                 type: 'error',
-                duration: 3000
+                duration: 3000,
+                offset: 100
               });
               verify.state = false;
               callback(verify);
@@ -2913,7 +2951,8 @@ export default {
                 title: '提示',
                 message: '还有复评函号未取的估价对象,请先完成取号操作。',
                 type: 'error',
-                duration: 3000
+                duration: 3000,
+                offset: 100
               });
               verify.state = false;
               callback(verify);
@@ -2924,7 +2963,8 @@ export default {
                 title: '提示',
                 message: '请选择一个产品后,再进行流程提交。',
                 type: 'error',
-                duration: 3000
+                duration: 3000,
+                offset: 100
               });
               verify.state = false;
               callback(verify);
@@ -2939,7 +2979,8 @@ export default {
                 title: '提示',
                 message: '请完成所选产品的基本信息后,再进行流程提交。',
                 type: 'error',
-                duration: 3000
+                duration: 3000,
+                offset: 100
               });
               verify.state = false;
               callback(verify);
@@ -2972,7 +3013,8 @@ export default {
                 title: '提示',
                 message: '还有有估价对象价格未确定。',
                 type: 'error',
-                duration: 2000
+                duration: 2000,
+                offset: 100
               });
               verify.state = false;
               callback(verify);
@@ -2988,7 +3030,8 @@ export default {
                 title: '提示',
                 message: '还有有估价对象价格未审核。',
                 type: 'error',
-                duration: 2000
+                duration: 2000,
+                offset: 100
               });
               verify.state = false;
               callback(verify);
@@ -3007,7 +3050,8 @@ export default {
             title: '提示',
             message: '该订单已取了其他子号,不能退回节点。',
             type: 'info',
-            duration: 3000
+            duration: 2000,
+            offset: 100
           });
           verify.state = false;
           verify.cleanReport = false;
@@ -3031,7 +3075,8 @@ export default {
           title: '提示',
           message: '人员绩效比例之和需等于100%',
           type: 'info',
-          duration: 3000
+          duration: 1000,
+          offset: 100
         });
         return;
       }
@@ -3043,7 +3088,8 @@ export default {
               title: '成功',
               message: '人员绩效比信息更新成功',
               type: 'success',
-              duration: 3000
+              duration: 1000,
+              offset: 100
             });
             this.getPerformance(this.majorId, (this.reportNo == null ? this.statementNo : this.reportNo));
           }
@@ -3057,7 +3103,8 @@ export default {
               title: '成功',
               message: '人员绩效比信息保存成功',
               type: 'success',
-              duration: 3000
+              duration: 3000,
+              offset: 100
             });
             this.getPerformance(this.majorId, (this.reportNo == null ? this.statementNo : this.reportNo));
           }
@@ -3101,7 +3148,8 @@ export default {
             title: '成功',
             message: '库存操作成功',
             type: 'success',
-            duration: 2000
+            duration: 1000,
+            offset: 100
           });
           this.warehouseDialog = false;
           this.getProductions(this.majorId, wareHoaseDto.reportNo);
@@ -3163,7 +3211,8 @@ export default {
               title: '成功',
               message: '取号成功。',
               type: 'success',
-              duration: 2000
+              duration: 1000,
+              offset: 100
             });
             this.getLandTargetList();
             this.createProduction(res.data);
@@ -3173,7 +3222,7 @@ export default {
               title: '失败',
               message: '取号失败。',
               type: 'error',
-              duration: 2000
+              duration: 1000
             });
           }
         })
@@ -3192,7 +3241,8 @@ export default {
               title: '成功',
               message: '质检信息更新成功',
               type: 'success',
-              duration: 3000
+              duration: 1000,
+              offset: 100
             });
             this.getPerformance(this.majorId, (this.reportNo == null ? this.statementNo : this.reportNo));
           }
@@ -3204,7 +3254,8 @@ export default {
               title: '成功',
               message: '质检信息保存成功',
               type: 'success',
-              duration: 3000
+              duration: 1000,
+              offset: 100
             });
             this.getPerformance(this.majorId, (this.reportNo == null ? this.statementNo : this.reportNo));
           }
@@ -3254,9 +3305,6 @@ export default {
   margin-right: 1%;
 }
 
-.major-radio {
-  width: 92px
-}
 
 .task-class {
   /deep/ .el-form-item__label {
@@ -3270,7 +3318,6 @@ export default {
 }
 
 .pane-class {
-  height: 800px;
   width: 100%;
   overflow-y: scroll;
 }

+ 47 - 5
src/views/major/todoList.vue

@@ -33,7 +33,7 @@
         <el-button class="filter-item" style="float: left;" round type="success" @click="resetSearch()">重置
         </el-button>
       </template>
-      <parentTable  :data="pageData.records" slot="table" style="width: 100%;">
+      <parentTable  :data="pageData.records" slot="table" style="width: 100%;" @sortTable="sortTable">
         <el-table-column label="项目名称" align="center" width="200" >
           <template slot-scope="{row}">
             <span>{{ row.productionName==null?row.orderName: row.productionName }}</span>
@@ -76,7 +76,32 @@
         </el-table-column>
         <el-table-column label="负责人" align="center">
           <template slot-scope="{row}">
-            <span>{{ row.principal }}</span>
+            <span>{{ row.principal==null?'-': row.principal }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="评估对象类型" align="center" width="130">
+          <template slot-scope="{row}">
+            <span>{{ row.businessObjectType }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="客户名称" align="center" width="130">
+          <template slot-scope="{row}">
+            <span>{{ row.cclienteleName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="业务来源" align="center" width="130">
+          <template slot-scope="{row}">
+            <span>{{ row.cclienteleSubName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="客户联系人" align="center" width="130">
+          <template slot-scope="{row}">
+            <span>{{ row.cclienteleContactName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="客户联系人电话" align="center" width="130">
+          <template slot-scope="{row}">
+            {{ row.cmobile }}
           </template>
         </el-table-column>
         <el-table-column label="下单时间" align="center" width="160">
@@ -84,7 +109,12 @@
             <span>{{ row.created }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="140" fixed="right">
+        <el-table-column label="任务创建时间" align="center" width="160" prop="taskCreated" sortable>
+          <template slot-scope="{row}">
+            <span>{{ row.taskCreated }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="100" fixed="right">
           <template slot-scope="{row}">
             <el-button type="text"  @click="toDetail(row)">办理</el-button>
             <el-button  type="text" @click="transfer(row.taskId)">转交</el-button>
@@ -114,7 +144,9 @@ export default {
       listQuery: {
         page: 1,
         size: 10,
-        keyword:null
+        keyword:null,
+        descs: null,
+        ascs:null
       },
       majorNodes:[],
       orderDate:'',
@@ -161,7 +193,7 @@ export default {
       this.listQuery = {
         current: 1,
         size: 10,
-        descs: 'id',
+        descs: 'taskCreated',
       }
       this.getPage()
     },
@@ -270,6 +302,16 @@ export default {
       }else{
         this.$router.push(`/major/todo/detail?id=${row.businessId}&doWorkflow=${true}&currentNodeId=${row.currentNodeId}&currentNodeCode=${row.nodeCode}&back=${'/major/todo'}`)
       }
+    },
+
+    sortTable(sortParams){
+       this.listQuery.ascs = sortParams.ascs;
+       this.listQuery.descs = sortParams.descs;
+       this.$api.workNodeTaskRecord.majorTaskTodoList(this.listQuery).then(res=>{
+        if (res.code ===200){
+            this.pageData = res.data;
+        }
+      })
     }
   },