页面修改

src/pages/sale/courseoffer.vue

@@ -119,10 +119,18 @@
           <q-input @input="resetSearch" clearable standout="bg-primary text-white" v-model="msg.Name" label="报价单名称"
             @clear="resetSearch" maxlength="20" />
         </div>
+        <div class="col-3">
+          <q-input @input="resetSearch" clearable standout="bg-primary text-white" v-model="msg.SerialNum" label="流水号"
+            @clear="resetSearch" maxlength="20" />
+        </div>
+        <div class="col-3">
+          <q-input @input="resetSearch" clearable standout="bg-primary text-white" v-model="msg.CustomerName"
+            label="客户名称" @clear="resetSearch" maxlength="20" />
+        </div>
         <div class="col-3">
           <q-select filled stack-label use-input option-value="Id" clearable @input="resetSearch"
-            option-label="EmployeeName" v-model="msg.CreateBy" :options="EmployeeList"
-            label="直属上级" :dense="false" emit-value map-options @filter="filterFn">
+            option-label="EmployeeName" v-model="msg.CreateBy" :options="EmployeeList" label="员工" :dense="false"
+            emit-value map-options @filter="filterFn">
             <template v-slot:no-option>
               <q-item>
                 <q-item-section class="text-grey">
@@ -150,8 +158,8 @@
         <template v-slot:body-cell-optioned="props">
           <q-td :props="props">
             <div>
-              <q-btn flat size="xs" icon="edit" color="accent" v-if="isHavePriceAction" style="font-weight:400" label="改价"
-                @click="editOrderPrice(props.row)" />
+              <q-btn flat size="xs" icon="edit" color="accent" v-if="isHavePriceAction && props.row.CustomerStatus==5 "
+                style="font-weight:400" label="改价" @click="editOrderPrice(props.row)" />
               <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="详情"
                 @click="gotoDetails(props.row)" />
             </div>
@@ -163,27 +171,15 @@
         </template>
       </q-table>
     </div>
-
-    <q-dialog v-model="showForm" persistent>
-      <quotation-form :obj="offerObj" @save="refreshPage()"></quotation-form>
-    </q-dialog>
-
-    <q-dialog v-model="showOrderForm" persistent>
-      <offertransorder-form :obj="offerObj" @save="refreshPage()"></offertransorder-form>
-    </q-dialog>
-
     <q-dialog v-model="showEditPrice" persistent>
       <edittransorder-form :obj="offerObj" @save="refreshPage()"></edittransorder-form>
     </q-dialog>
     <!-- 查看报价单 -->
     <viewquotation-form v-if="isShowviewQuo" :rId="rId" :isShowCancle="1" @close="closeQuota">
     </viewquotation-form>
-
   </div>
 </template>
 <script>
-  import quotationForm from '../../components/sale/quotation-form'
-  import offertransorderForm from '../../components/sale/offertransorder-form'
   import edittransorderForm from '../../components/sale/edittransorder-form'
   import viewquotationForm from '../../components/sale/viewquotation-form'
 
@@ -203,8 +199,6 @@
       title: "报价单"
     },
     components: {
-      quotationForm,
-      offertransorderForm,
       edittransorderForm,
       viewquotationForm
     },
@@ -217,13 +211,13 @@
           pageIndex: 1,
           pageSize: 10,
           rowsPerPage: 10,
-          Name: "",
-          CreateBy:0,
+          Name: "", //报价单名称
           IsGetDetails: 1,
-          CreateBy: 0
+          CreateBy: "", //所属员工
+          SerialNum: "", //流水号
+          CustomerName: "", //客户名称
         },
         pageCount: 0,
-        showForm: false, //是否显示报价单弹窗
         offerObj: {}, //报价单信息
         columns: [{
             name: "SerialNum",
@@ -309,13 +303,12 @@
             field: 'Id'
           }
         ],
-        showOrderForm: false, //是否显示转订单表单
         commonId: 0,
         showEditPrice: false, //是否显示改价表单
-        EmployeeList:[], //员工列表
+        EmployeeList: [], //员工列表
         AllemployeeList: [], //所有员工列表
-        isShowviewQuo:false,
-        rId:0
+        isShowviewQuo: false,
+        rId: 0
       }
     },
     computed: mapState({
@@ -337,8 +330,8 @@
       this.getcourseofferpage();
     },
     methods: {
-      closeQuota(){
-        this.isShowviewQuo=false;
+      closeQuota() {
+        this.isShowviewQuo = false;
       },
       //筛选员工
       filterFn(val, update) {
@@ -359,10 +352,10 @@
           if (res.Code == 1) {
             var jsonData = res.Data;
             if (jsonData && jsonData.length > 0) {
-              jsonData.unshift({
-                Id: 0,
-                EmployeeName: "请选择"
-              });
+            //   jsonData.unshift({
+            //     Id: 0,
+            //     EmployeeName: "请选择"
+            //   });
               this.AllemployeeList = JSON.parse(JSON.stringify(jsonData));
               this.EmployeeList = JSON.parse(JSON.stringify(jsonData));;
             }
@@ -380,11 +373,6 @@
           }
         });
       },
-      //报价单转订单
-      offerTransOrder(item) {
-        this.offerObj = item;
-        this.showOrderForm = true;
-      },
       //改价
       editOrderPrice(item) {
         this.offerObj = item;
@@ -392,14 +380,14 @@
       },
       //刷新页面
       refreshPage() {
-        this.showForm = false;
         this.showOrderForm = false;
         this.showEditPrice = false;
         this.getcourseofferpage();
       },
+      //报价单详情
       gotoDetails(item) {
-        this.rId=item.Id;
-        this.isShowviewQuo=true;
+        this.rId = item.Id;
+        this.isShowviewQuo = true;
       },
       //重新查询
       resetSearch() {
@@ -409,17 +397,23 @@
       //翻页
       changePage(val) {
         this.msg.pageIndex = val;
-        this.getcourseofferpage()
+        this.getcourseofferpage();
       },
       //获取报价单分页列表
       getcourseofferpage() {
         this.loading = true;
+        if (this.msg.CreateBy == "") {
+          this.msg.CreateBy == 0;
+        }
         queryCourseOfferPage(this.msg).then(res => {
-          this.loading = false
+          this.loading = false;
           this.data = res.Data.PageData;
           this.pageCount = res.Data.PageCount;
+          if (this.msg.CreateBy == 0) {
+            this.msg.CreateBy == "";
+          }
         }).catch(() => {
-          this.loading = false
+          this.loading = false;
         })
       },
     }