代码更新

src/Form/QuotedPrice/editCopy.vue

@@ -453,6 +453,7 @@ export default {
       })
       console.log(res)
       this.$emit('onSuccess')
+      this.$store.dispatch('changeDetailDrawer',false)
     },
     /*刷新总金额*/
     queryTotalPrice(val){

src/HDrpManagement/competitor/index.vue

@@ -32,7 +32,7 @@
       </template>
       <template v-slot:tbList="scope">
         <div>
-          {{scope.data.column.data[[scope.data.column.columnname]]}}
+          {{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}
         </div>
       </template>
       <template v-slot:tbOpreation="scope">

src/HDrpManagement/projectChange/modules/modules/quotation/modules/add.vue

@@ -26,10 +26,20 @@
               <el-form-item label="项目名称:" label-width="90px" prop="projectname">
                 <el-popover
                     placement="bottom"
-                    width="580"
+                    width="700"
                     trigger="click"
                     v-model="projectShow"
                     @show="projectList">
+                  <el-input
+                      style="width:300px;margin-bottom: 10px"
+                      placeholder="请输入内容"
+                      v-model="projectParam.content.where.condition"
+                      clearable
+                      @clear="projectList(projectParam.content.pageNumber = 1)"
+                      size="mini"
+                      @keyup.enter.native="projectList(projectParam.content.pageNumber = 1)">
+                    <i slot="prefix" class="el-icon-search" @click="projectList(projectParam.content.pageNumber = 1)"></i>
+                  </el-input>
                   <el-table :data="project.projectData" @row-click="projectData">
                     <el-table-column
                         label="项目编号"
@@ -47,19 +57,11 @@
                     </el-table-column>
                     <el-table-column
                         label="地址"
-                        width="300">
+                        >
                       <template slot-scope="scope">
                         <span style="margin-left: 10px">{{ scope.row.address?scope.row.address:'--' }}</span>
                       </template>
                     </el-table-column>
-                    <!--                    <el-table-column
-                                            fixed="right"
-                                            label="操作"
-                                            width="60">
-                                          <template slot-scope="scope">
-                                            <el-button type="text" @click="projectData(scope.row)">选择</el-button>
-                                          </template>
-                                        </el-table-column>-->
                   </el-table>
                   <div class="container normal-panel" style="text-align:right">
                     <el-pagination
@@ -67,11 +69,13 @@
                         small
                         @size-change="handleSizeChangeProject"
                         @current-change="handleCurrentChangeProject"
+                        :page-sizes="[10,20,50,100,]"
+                        layout="total,sizes, prev, pager, next, jumper"
                         :current-page="project.currentPage"
                         :total="project.total">
                     </el-pagination>
                   </div>
-                  <el-input slot="reference"  v-model="form.projectname" autocomplete="off" placeholder="请选择项目"   @input="selectProject"></el-input>
+                  <el-input slot="reference" disabled :readonly="true" v-model="form.projectname" autocomplete="off" placeholder="请选择项目"   @input="selectProject"></el-input>
                 </el-popover>
 
               </el-form-item>
@@ -85,10 +89,20 @@
               <el-form-item label="客户名称:" label-width="90px" prop="enterprisename">
                 <el-popover
                     placement="bottom"
-                    width="580"
+                    width="700"
                     trigger="click"
                     v-model="customerShow"
                     @show="customerList">
+                  <el-input
+                      style="width:300px;margin-bottom: 10px"
+                      placeholder="请输入内容"
+                      v-model="customerParam.content.where.condition"
+                      clearable
+                      @clear="customerList(customerParam.content.pageNumber = 1)"
+                      size="mini"
+                      @keyup.enter.native="customerList(customerParam.content.pageNumber = 1)">
+                    <i slot="prefix" class="el-icon-search" @click="customerList(customerParam.content.pageNumber = 1)"></i>
+                  </el-input>
                   <el-table :data="customer.customerData" @row-click="customerData">
                     <el-table-column
                         label="客户编号"
@@ -106,7 +120,7 @@
                     </el-table-column>
                     <el-table-column
                         label="地址"
-                        width="300">
+                        >
                       <template slot-scope="scope">
                         <span style="margin-left: 10px">{{ scope.row.address?scope.row.address:'--' }}</span>
                       </template>
@@ -118,11 +132,13 @@
                         small
                         @size-change="handleSizeChangeCustomer"
                         @current-change="handleCurrentChangeCustomer"
+                        :page-sizes="[10,20,50,100,]"
+                        layout="total,sizes, prev, pager, next, jumper"
                         :current-page="customer.currentPage"
                         :total="customer.total">
                     </el-pagination>
                   </div>
-                  <el-input slot="reference"  v-model="form.enterprisename" autocomplete="off" placeholder="请选择客户"  @input="selectCustomer"></el-input>
+                  <el-input slot="reference" disabled :readonly="true" v-model="form.enterprisename" autocomplete="off" placeholder="请选择客户"  @input="selectCustomer"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
@@ -156,10 +172,20 @@
               <el-form-item label="联系人:" label-width="90px" >
                 <el-popover
                     placement="bottom"
-                    width="580"
+                    width="700"
                     trigger="click"
                     v-model="contactsShow"
                     @show="contactsList">
+                  <el-input
+                      style="width:300px;margin-bottom: 10px"
+                      placeholder="请输入内容"
+                      v-model="contactsParam.content.where.condition"
+                      clearable
+                      @clear="contactsList(contactsParam.content.pageNumber = 1)"
+                      size="mini"
+                      @keyup.enter.native="contactsList(contactsParam.content.pageNumber = 1)">
+                    <i slot="prefix" class="el-icon-search" @click="contactsList(contactsParam.content.pageNumber = 1)"></i>
+                  </el-input>
                   <el-table :data="contacts.contactsData" @row-click="contactsData">
                     <el-table-column
                         label="姓名"
@@ -184,7 +210,7 @@
                     </el-table-column>
                     <el-table-column
                         label="地址"
-                        width="300">
+                        >
                       <template slot-scope="scope">
                         <span style="margin-left: 10px">{{ scope.row.address?scope.row.address:'--' }}</span>
                       </template>
@@ -196,11 +222,13 @@
                         small
                         @size-change="handleSizeChangeContacts"
                         @current-change="handleCurrentChangeContacts"
+                        :page-sizes="[10,20,50,100,]"
+                        layout="total,sizes, prev, pager, next, jumper"
                         :current-page="contacts.currentPage"
                         :total="contacts.total">
                     </el-pagination>
                   </div>
-                  <el-input slot="reference"  v-model="form.name" autocomplete="off" placeholder="请选择联系人"  @input="selectContacts"></el-input>
+                  <el-input slot="reference" disabled :readonly="true" v-model="form.name" autocomplete="off" placeholder="请选择联系人"  @input="selectContacts"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
@@ -209,11 +237,6 @@
                 <el-input  v-model="form.phonenumber" autocomplete="off" placeholder="手机号" disabled></el-input>
               </el-form-item>
             </el-col>
-            <!--            <el-col :span="6">
-                          <el-form-item label="总金额:" label-width="90px" >
-                            <el-input  v-model="form.totalPrice" autocomplete="off" placeholder="总金额" disabled></el-input>
-                          </el-form-item>
-                        </el-col>-->
           </el-form>
         </el-row>
       </div>

src/HDrpManagement/projectTask/index.vue

@@ -18,45 +18,56 @@
           {{scope.data.column.data.important === 1?'是':'否'}}
         </div>
         <div v-else-if="scope.data.column.columnname === 'partiestype'">
-          <span v-for="item in scope.data.column.data.partiestype" :key="item.index">
-            {{item}},
+          <div v-if="scope.data.column.data.onparties === 0 && scope.data.column.data.onstage === 0">
+            {{'--'}}
+          </div>
+          <div v-else>
+            <span v-for="item in scope.data.column.data.partiestype" :key="item.index">
+            {{item?item:'--'}},
           </span>
+          </div>
         </div>
         <div v-else-if="scope.data.column.columnname === 'stage'">
-          <span v-for="item in scope.data.column.data.stage" :key="item.index">
-            {{item}},
+          <div v-if="scope.data.column.data.onparties === 0 && scope.data.column.data.onstage === 0">
+            {{'--'}}
+          </div>
+          <div v-else>
+            <span v-for="item in scope.data.column.data.stage" :key="item.index">
+            {{item?item:'--'}},
           </span>
+          </div>
+
         </div>
         <div v-else-if="scope.data.column.columnname === 'projtaskmag_options'" >
           <div v-for="(item,index) in scope.data.column.data.projtaskmag_options" :key="index" >
             <div v-if="index === 0 && scope.data.column.data.projtaskmag_options.length -1  === index" style="height: 40px;line-height: 40px;vertical-align: center;margin-top:-5px;margin-bottom: -5px">
-              {{item.optionname}}
+              {{item.optionname?item.optionname:'--'}}
             </div>
             <div v-else-if="index === 0" style="height: 40px;line-height: 40px;vertical-align: center;margin-top: -5px">
-              {{item.optionname}}
+              {{item.optionname?item.optionname:'--'}}
               <p style="border-bottom: 1px solid #ebeef5;transform: scale(1.09,1)"></p>
             </div>
             <div v-else-if="scope.data.column.data.projtaskmag_options.length -1  !== index" style="height: 40px;line-height: 40px;vertical-align: center;">
-              {{item.optionname}}
+              {{item.optionname?item.optionname:'--'}}
               <p style="border-bottom: 1px solid #ebeef5;transform: scale(1.09,1)"></p>
             </div>
-            <div v-else style="height: 40px;line-height: 40px;vertical-align: center;margin-bottom: -5px">{{item.optionname}}</div>
+            <div v-else style="height: 40px;line-height: 40px;vertical-align: center;margin-bottom: -5px">{{item.optionname?item.optionname:'--'}}</div>
           </div>
         </div>
         <div v-else-if="scope.data.column.columnname === 'remarks'" >
           <div v-for="(item,index) in scope.data.column.data.projtaskmag_options" :key="index" >
             <div v-if="index === 0 && scope.data.column.data.projtaskmag_options.length -1  === index" style="height: 40px;line-height: 40px;vertical-align: center;margin-top:-5px;margin-bottom: -5px">
-              {{item.remarks}}
+              {{item.remarks?item.remarks:'--'}}
             </div>
             <div v-else-if="index === 0" style="height: 40px;line-height: 40px;vertical-align: center;margin-top: -5px">
-              {{item.remarks}}
+              {{item.remarks?item.remarks:'--'}}
               <p style="border-bottom: 1px solid #ebeef5;transform: scale(1.09,1)"></p>
             </div>
             <div v-else-if="scope.data.column.data.projtaskmag_options.length -1  !== index" style="height: 40px;line-height: 40px;vertical-align: center;">
-              {{item.remarks}}
+              {{item.remarks?item.remarks:'--'}}
               <p style="border-bottom: 1px solid #ebeef5;transform: scale(1.09,1)"></p>
             </div>
-            <div v-else style="height: 40px;line-height: 40px;vertical-align: center;margin-bottom: -5px">{{item.remarks}}</div>
+            <div v-else style="height: 40px;line-height: 40px;vertical-align: center;margin-bottom: -5px">{{item.remarks?item.remarks:'--'}}</div>
           </div>
         </div>
         <div v-else-if="scope.data.column.columnname === 'score'" >
@@ -76,7 +87,7 @@
           </div>
         </div>
         <div v-else>
-          {{scope.data.column.data[[scope.data.column.columnname]]}}
+          {{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}
         </div>
       </template>
       <template v-slot:tbOpreation="scope">

src/HManagement/saleForecastCount/index.vue

@@ -46,7 +46,7 @@
         </div>
         <template v-slot:tbList="scope">
           <div>
-            {{scope.data.column.data[[scope.data.column.columnname]]}}
+            {{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}
           </div>
         </template>
         <template v-slot:tbOpreation="scope">

src/HManagement/salesForecastTemplate/modules/modelDetail.vue

@@ -16,7 +16,7 @@
       <div slot="tags">
       </div>
       <div slot="customOperation" >
-        <release v-if="tool.checkAuth($route.name,'release')" :data="mainData" @onSuccess="onSuccess"></release>
+        <release v-if="tool.checkAuth($route.name,'release')" :data="mainData" @onSuccess="onSuccess" :disabledFlag="disabledFlag"></release>
         <finish v-if="tool.checkAuth($route.name,'cancel')" :data="mainData" @onSuccess="onSuccess"></finish>
       </div>
       <div slot="slot0" >
@@ -24,6 +24,9 @@
           <el-col :span="24">
             <forecastList ref="forecast" @tableRowClick="onTableClick"></forecastList>
           </el-col>
+          <el-col :span="24">
+            <div style="border-bottom:1px solid #f1f2f3;margin-bottom:16px;margin-top:16px"></div>
+          </el-col>
           <el-col :span="24">
             <submitDetail ref="project"></submitDetail>
           </el-col>
@@ -46,7 +49,8 @@ export default {
   data() {
     return {
       mainData:{},
-      mainAreaData:{}
+      mainAreaData:{},
+      disabledFlag:false
     }
   },
   components:{
@@ -110,7 +114,9 @@ export default {
       this.$emit('onSuccess')
     },
     onTableClick (row) {
+      this.disabledFlag = true
       this.$refs['project'].listData(row.sa_salesforecastbillid)
+
     }
   },
   mounted () {

src/HManagement/salesForecastTemplate/modules/release.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="inline-16">
-    <el-button :type="data.status === '结束'?'':'primary'" :disabled="data.status === '结束' " size="mini" @click="releaseNotice">{{data.status === '新建'?'发 布':'取消发布'}}</el-button>
+    <el-button :type="data.status === '结束' || disabledFlag ?'':'primary'" :disabled="data.status === '结束' || disabledFlag " size="mini" @click="releaseNotice">{{data.status === '新建'?'发 布':'取消发布'}}</el-button>
   </div>
 </template>
 
 <script>
 export default {
-  props:['data'],
+  props:['data','disabledFlag'],
   data () {
     return {}
   },

src/SDrpManagement/salerPrivatecustomer/components/duplicateCheck.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button size="small" type="primary" @click="listData" class="inline-16 normal-btn-width">查 重</el-button>
-    <el-dialog title="重复的项目" :visible.sync="dialogTableVisible" append-to-body>
+    <el-dialog title="重复的客户" :visible.sync="dialogTableVisible" append-to-body>
       <el-table :data="duplicateData" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
         <el-table-column property="enterprisename" label="客户名称" width="150"></el-table-column>
         <el-table-column property="address" label="客户地址" ></el-table-column>

src/SManagement/sales_forecast/modules/modelDetail.vue

@@ -28,6 +28,9 @@
           <el-col :span="24">
             <project :mainData="mainData" @queryProduct="queryProduct" ref="project"></project>
           </el-col>
+          <el-col :span="24">
+            <div style="border-bottom:1px solid #f1f2f3;margin-bottom:16px"></div>
+          </el-col>
           <el-col :span="24">
             <product  :mainData="mainData" ref="prod" @onSuccess='queryMainData'></product>
           </el-col>

src/SManagement/sales_forecast/modules/product.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-input class="mt-10" style="width:200px" suffix-icon="el-icon-search" size="small" placeholder="搜索" v-model="param.content.where.condition" @keyup.native.enter="search()" @clear="search()" clearable></el-input>
+    <el-input class="mt-10" style="width:200px" prefix-icon="el-icon-search" size="small" placeholder="搜索产品名称" v-model="param.content.where.condition" @keyup.native.enter="search()" @clear="search()" clearable></el-input>
     <el-table
       ref="multipleTable"
       :data="list"

src/SManagement/sales_forecast/modules/project.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="flex-align-center flex-between mt-10">
-      <el-input style="width:200px" suffix-icon="el-icon-search" size="small" placeholder="搜索" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" clearable></el-input>
+      <el-input style="width:200px" prefix-icon="el-icon-search" size="small" placeholder="搜索项目名称" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" clearable></el-input>
       <addProject v-if="checkDateOut && tool.checkAuth($route.name,'add_project')" :mainData="mainData" @onSuccess="listData(param.content.pageNumber = 1)"></addProject>
     </div>
     <el-table