qymljy 3 years ago
parent
commit
a9f9b53d25

+ 48 - 48
src/Form/QuotedPrice/edit.vue

@@ -27,11 +27,21 @@
               <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-table :data="project.projectData">
+                  <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" height="396px" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
                     <el-table-column
                         label="项目编号"
                         width="180">
@@ -48,19 +58,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)" @focus="projectShow = true">选择</el-button>
-                      </template>
-                    </el-table-column>
                   </el-table>
                   <div class="container normal-panel" style="text-align:right">
                     <el-pagination
@@ -68,11 +70,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>
             </el-col>
@@ -85,11 +89,21 @@
               <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-table :data="customer.customerData">
+                  <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" height="396px" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
                     <el-table-column
                         label="客户编号"
                         width="180">
@@ -104,28 +118,13 @@
                         <span style="margin-left: 10px">{{ scope.row.enterprisename?scope.row.enterprisename:'--'}}</span>
                       </template>
                     </el-table-column>
-<!--                    <el-table-column
-                        label="省市县"
-                        width="230">
-                      <template slot-scope="scope">
-                        <span style="margin-left: 10px">{{ scope.row.province?scope.row.province + '-' + scope.row.city + '-' + scope.row.county:'&#45;&#45;' }}</span>
-                      </template>
-                    </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="customerData(scope.row)" @focus="customerShow = true">选择</el-button>
-                      </template>
-                    </el-table-column>
                   </el-table>
                   <div class="container normal-panel" style="text-align:right">
                     <el-pagination
@@ -133,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>
@@ -171,11 +172,21 @@
               <el-form-item label="联系人:" label-width="90px" prop="contactsname">
                 <el-popover
                     placement="bottom"
-                    width="580"
+                    width="700"
                     trigger="click"
                     v-model="contactsShow"
                     @show="contactsList">
-                  <el-table :data="contacts.contactsData">
+                  <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" height="396px" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
                     <el-table-column
                         label="姓名"
                         width="180">
@@ -199,19 +210,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="contactsData(scope.row)" @focus="contactsShow = true">选择</el-button>
-                      </template>
-                    </el-table-column>
                   </el-table>
                   <div class="container normal-panel" style="text-align:right">
                     <el-pagination
@@ -219,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.contactsname" autocomplete="off" placeholder="请选择联系人"  @input="selectContacts"></el-input>
+                  <el-input slot="reference" disabled readonly="true" v-model="form.contactsname" autocomplete="off" placeholder="请选择联系人"  @input="selectContacts"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
@@ -232,11 +237,6 @@
                 <el-input  v-model="form.contactsphonenumber" 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>

+ 32 - 29
src/SDrpManagement/QuotedPrice/modules/ProjectQuotationAdd.vue

@@ -88,11 +88,21 @@
               <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-table :data="customer.customerData" @row-click="customerData">
+                  <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" height="396px" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
                     <el-table-column
                         label="客户编号"
                         width="180">
@@ -109,19 +119,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="customerData(scope.row)" @focus="customerShow = true">选择</el-button>
-                      </template>
-                    </el-table-column>-->
                   </el-table>
                   <div class="container normal-panel" style="text-align:right">
                     <el-pagination
@@ -129,11 +131,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" :readonly="true" v-model="form.enterprisename" autocomplete="off" placeholder="请选择客户"  @input="selectCustomer"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
@@ -167,11 +171,21 @@
               <el-form-item label="联系人:" label-width="90px" prop="name">
                 <el-popover
                     placement="bottom"
-                    width="580"
+                    width="700"
                     trigger="click"
                     v-model="contactsShow"
                     @show="contactsList">
-                  <el-table :data="contacts.contactsData" @row-click="contactsData">
+                  <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" height="396px" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
                     <el-table-column
                         label="姓名"
                         width="180">
@@ -195,19 +209,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="contactsData(scope.row)" @focus="contactsShow = true">选择</el-button>
-                      </template>
-                    </el-table-column>-->
                   </el-table>
                   <div class="container normal-panel" style="text-align:right">
                     <el-pagination
@@ -215,11 +221,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" :readonly="true" v-model="form.name" autocomplete="off" placeholder="请选择联系人"  @input="selectContacts"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
@@ -228,11 +236,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>