From 9ed599516f100d0f3e949b9517cfbfbb6459c4d8 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期五, 08 十二月 2023 15:01:49 +0800
Subject: [PATCH] qxtj

---
 src/views/hosp/order/index.vue |  492 ++++++++++--------------------------------------------
 1 files changed, 95 insertions(+), 397 deletions(-)

diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index 9f9542a..6746f97 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -1,47 +1,18 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="濮撳悕" prop="name">
-        <el-input
-          ref="inputName"
-          v-model="queryParams.name"
-          placeholder="璇疯緭鍏ュ鍚�"
-          style="width: 120px"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input ref="inputName" v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" style="width: 120px" clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="浣撴鍙�" prop="tjNum">
-        <el-input
-          ref="inputName"
-          v-model="queryParams.tjNum"
-          placeholder="璇疯緭鍏ヤ綋妫�鍙�"
-          style="width: 170px"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input ref="inputName" v-model="queryParams.tjNum" placeholder="璇疯緭鍏ヤ綋妫�鍙�" style="width: 170px" clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="鐧昏鏃堕棿" prop="createTimeList">
-        <el-date-picker
-          v-model="createTimeList"
-          type="datetimerange"
-          align="right"
-          :picker-options="pickerOptions"
-          style="width: 300px"
-          start-placeholder="寮�濮嬫棩鏈�"
-          end-placeholder="缁撴潫鏃ユ湡"
-          :default-time="['00:00:00', '23:00:00']"
-          format="yyyy-MM-dd HH:mm"
-          value-format="yyyy-MM-dd HH:mm"
-          @change="dateChangebirthday1"
-        >
+        <el-date-picker v-model="createTimeList" type="datetimerange" align="right" :picker-options="pickerOptions"
+          style="width: 300px" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" :default-time="['00:00:00', '23:00:00']"
+          format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" @change="dateChangebirthday1">
         </el-date-picker>
       </el-form-item>
       <!-- <el-form-item label="鐧昏鏃堕棿" prop="createTime">
@@ -55,182 +26,68 @@
         </el-date-picker>
       </el-form-item> -->
       <el-form-item label="鎶ュ憡鏃堕棿" prop="reportTimeList">
-        <el-date-picker
-          clearable
-          v-model="reportTimeList"
-          @change="dateChangebirthday2"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="寮�濮嬫棩鏈�"
-          end-placeholder="缁撴潫鏃ユ湡"
-          :picker-options="pickerOptions"
-          value-format="yyyy-MM-dd"
-          placeholder="璇烽�夋嫨鍑烘姤鍛婃椂闂�"
-          style="width: 240px"
-        >
+        <el-date-picker clearable v-model="reportTimeList" @change="dateChangebirthday2" type="daterange"
+          range-separator="-" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" :picker-options="pickerOptions"
+          value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鍑烘姤鍛婃椂闂�" style="width: 240px">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >鎼滅储</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >閲嶇疆</el-button
-        >
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['hosp:order:export']"
-          >瀵煎嚭</el-button
-        >
+        <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['hosp:order:export']">瀵煎嚭</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          size="mini"
-          @click="handleProject1"
-          :disabled="single"
-          v-hasPermi="['hosp:order:export']"
-          >琛ュ綍椤圭洰</el-button
-        >
+        <el-button type="primary" size="mini" @click="handleProject1" :disabled="single"
+          v-hasPermi="['hosp:order:export']">琛ュ綍椤圭洰</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          size="mini"
-          @click="handleReport1"
-          :disabled="single"
-          v-hasPermi="['hosp:order:export']"
-          >鎵撳嵃瀵艰瘖鍗�</el-button
-        >
+        <el-button type="primary" size="mini" @click="handleReport1" :disabled="single"
+          v-hasPermi="['hosp:order:export']">鎵撳嵃瀵艰瘖鍗�</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          size="mini"
-          @click="handleUpdate1"
-          :disabled="single"
-          v-hasPermi="['hosp:order:export']"
-          >璁㈠崟鏄庣粏</el-button
-        >
+        <el-button type="primary" size="mini" @click="handleUpdate1" :disabled="single"
+          v-hasPermi="['hosp:order:export']">璁㈠崟鏄庣粏</el-button>
       </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <template>
-      <el-table
-        border
-        v-loading="loading"
-        :data="orderList"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column
-          type="selection"
-          width="40px"
-          align="center"
-          fixed="left"
-        />
+      <el-table border v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="40px" align="center" fixed="left" />
         <!-- <el-table-column label="涓婚敭id" align="center" prop="orderId" /> -->
         <!-- <el-table-column label="鐢ㄦ埛id" align="center" prop="userId" /> -->
-        <el-table-column
-          label="搴忓彿"
-          align="center"
-          prop="newID"
-          width="50px"
-          fixed="left"
-        />
-        <el-table-column
-          label="濮撳悕"
-          align="center"
-          prop="tjCustomerName"
-          fixed="left"
-          width="100px"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          label="鎬у埆"
-          align="center"
-          prop="tjCustomerSex"
-          width="50px"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column label="搴忓彿" align="center" prop="newID" width="50px" fixed="left" />
+        <el-table-column label="濮撳悕" align="center" prop="tjCustomerName" fixed="left" width="100px"
+          :show-overflow-tooltip="true" />
+        <el-table-column label="鎬у埆" align="center" prop="tjCustomerSex" width="50px" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span v-if="scope.row.tjCustomerSex == '0'">鐢�</span>
             <span v-if="scope.row.tjCustomerSex == '1'">濂�</span>
           </template>
         </el-table-column>
-        <el-table-column
-          label="骞撮緞"
-          align="center"
-          prop="tjCustomerAge"
-          width="55px"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          label="鐢佃瘽"
-          align="center"
-          prop="tjCustomerPhone"
-          :show-overflow-tooltip="true"
-          width="110px"
-        />
-        <el-table-column
-          label="浣撴绫诲瀷"
-          align="center"
-          prop="tjType"
-          width="80px"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column label="骞撮緞" align="center" prop="tjCustomerAge" width="55px" :show-overflow-tooltip="true" />
+        <el-table-column label="鐢佃瘽" align="center" prop="tjCustomerPhone" :show-overflow-tooltip="true" width="110px" />
+        <el-table-column label="浣撴绫诲瀷" align="center" prop="tjType" width="80px" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span v-if="scope.row.tjType == '2'">涓汉</span>
             <span v-if="scope.row.tjType == '1'">鍥㈤槦</span>
           </template>
         </el-table-column>
-        <el-table-column
-          label="浣撴鍙�"
-          align="center"
-          prop="tjNumber"
-          :show-overflow-tooltip="true"
-          width="160px"
-        />
+        <el-table-column label="浣撴鍙�" align="center" prop="tjNumber" :show-overflow-tooltip="true" width="160px" />
         <!-- <el-table-column label="娴佹按鍙�" align="center" prop="tjSerialNumber" /> -->
-        <el-table-column
-          label="鎵�閫夊椁�"
-          align="center"
-          prop="pacName"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          label="鐧昏鏃堕棿"
-          align="center"
-          prop="createTime"
-          width="155px"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column label="鎵�閫夊椁�" align="center" prop="pacName" :show-overflow-tooltip="true" />
+        <el-table-column label="鐧昏鏃堕棿" align="center" prop="createTime" width="155px" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
-        <el-table-column
-          label="瀹屾垚鏃堕棿"
-          align="center"
-          prop="finishTime"
-          width="155px"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column label="瀹屾垚鏃堕棿" align="center" prop="finishTime" width="155px" :show-overflow-tooltip="true">
           <!-- <template slot-scope="scope">
             <span>{{ parseTime(scope.row.finishTime) }}</span>
           </template> -->
@@ -240,33 +97,16 @@
           <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column> -->
-        <el-table-column
-          label="鎶ュ憡鏃堕棿"
-          align="center"
-          prop="reportTime"
-          width="155px"
-          height="10px"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column label="鎶ュ憡鏃堕棿" align="center" prop="reportTime" width="155px" height="10px"
+          :show-overflow-tooltip="true">
           <!-- <template slot-scope="scope">
             <span>{{ parseTime(scope.row.reportTime) }}</span>
           </template> -->
         </el-table-column>
         <!-- <el-table-column label="鍒涘缓浜�" align="center" prop="createBy" /> -->
         <!-- <el-table-column label="鏇存柊浜�" align="center" prop="updateBy" /> -->
-        <el-table-column
-          label="鍗曚綅宸ュ彿"
-          align="center"
-          prop="firmWorkId"
-          width="100px"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          label="鍗曚綅鍚嶇О"
-          align="center"
-          prop="dictCompName"
-          :show-overflow-tooltip="true"
-        />
+        <el-table-column label="鍗曚綅宸ュ彿" align="center" prop="firmWorkId" width="100px" :show-overflow-tooltip="true" />
+        <el-table-column label="鍗曚綅鍚嶇О" align="center" prop="dictCompName" :show-overflow-tooltip="true" />
         <!-- <el-table-column label="閮ㄩ棬鍚�" align="center" prop="firmDeptName" /> -->
 
         <!-- <el-table-column label="瀹㈡埛鐓х墖" align="center" prop="photo" /> -->
@@ -277,31 +117,13 @@
             }}</span>
           </template>
         </el-table-column> -->
-        <el-table-column
-          fixed="right"
-          label="鎿嶄綔"
-          align="center"
-          class-name="small-padding fixed-width"
-          height="10px"
-          width="114px"
-        >
+        <el-table-column fixed="right" label="鎿嶄綔" align="center" class-name="small-padding fixed-width" height="10px"
+          width="114px">
           <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-document"
-              @click="handleUpdate(scope.row)"
-              v-hasPermi="['hosp:order:edit']"
-              title="璁㈠崟娴佹按"
-            ></el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleProject(scope.row)"
-              v-hasPermi="['hosp:order:edit']"
-              title="琛ュ綍椤圭洰"
-            ></el-button>
+            <el-button size="mini" type="text" icon="el-icon-document" @click="handleUpdate(scope.row)"
+              v-hasPermi="['hosp:order:edit']" title="璁㈠崟娴佹按"></el-button>
+            <el-button size="mini" type="text" icon="el-icon-edit" @click="handleProject(scope.row)"
+              v-hasPermi="['hosp:order:edit']" title="琛ュ綍椤圭洰"></el-button>
             <!-- <el-button type="text" size="mini" class="btn" icon="el-icon-download" title="涓嬭浇瀵艰瘖鍗�" @click="
               daoZhenDan,
               LoadFileImg(scope.row);
@@ -318,7 +140,7 @@
               title="浣撴鎶ュ憡"
               @click="viewReport(scope.row)"
             ></el-button> -->
-               <!-- <el-button
+            <!-- <el-button
               type="text"
               size="mini"
               class="btn"
@@ -327,15 +149,9 @@
               v-if="scope.row.tjCategory == '02'"
               @click="viewReport(scope.row)"
             ></el-button> -->
-            
-            <el-button
-              type="text"
-              size="mini"
-              class="btn"
-              icon="el-icon-download"
-              title="瀵艰瘖鍗�"
-              @click="handleReport(scope.row)"
-            ></el-button>
+
+            <el-button type="text" size="mini" class="btn" icon="el-icon-download" title="瀵艰瘖鍗�"
+              @click="handleReport(scope.row)"></el-button>
 
             <!-- <button @click="downLoadFileImg(scope.row)">鏌ョ湅鎶ュ憡</button> -->
           </template>
@@ -345,16 +161,9 @@
 
     <div class="pag">
       <div class="pag1">
-        <el-pagination
-          background
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="queryParams.pageNum"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="queryParams.pageSize"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total"
-        >
+        <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
+          :current-page="queryParams.pageNum" :page-sizes="[10, 20, 30, 40]" :page-size="queryParams.pageSize"
+          layout="total, sizes, prev, pager, next, jumper" :total="total">
         </el-pagination>
         <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
           @pagination="getList" /> -->
@@ -376,56 +185,27 @@
         </span>
      </el-dialog> -->
 
-    <el-dialog
-      title="PDF 棰勮"
-      :visible.sync="dialogVisible"
-      :close-on-click-modal="false"
-    >
+    <el-dialog title="PDF 棰勮" :visible.sync="dialogVisible" :close-on-click-modal="false">
       <div class="main">
-        <iframe
-          id="printIframe"
-          :src="url"
-          frameborder="0"
-          style="width: 100%; height: 100%"
-        ></iframe>
+        <iframe id="printIframe" :src="url" frameborder="0" style="width: 100%; height: 100%"></iframe>
       </div>
     </el-dialog>
 
-    <el-dialog
-      title="瀵艰瘖鍗�"
-      :visible.sync="daoZhenDan"
-      :close-on-click-modal="false"
-    >
+    <el-dialog title="瀵艰瘖鍗�" :visible.sync="daoZhenDan" :close-on-click-modal="false">
       <div class="main">
-        <iframe
-          id="printIframe"
-          :src="url"
-          frameborder="0"
-          style="width: 100%; height: 100%"
-        ></iframe>
+        <iframe id="printIframe" :src="url" frameborder="0" style="width: 100%; height: 100%"></iframe>
       </div>
     </el-dialog>
 
     <!-- 娣诲姞琛ュ綍椤圭洰 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="Projectopen"
-      width="980px"
-      style="height: 860px"
-      append-to-body
-    >
+    <el-dialog :title="title" :visible.sync="Projectopen" width="980px" style="height: 860px" append-to-body>
       <el-row type="flex" class="row-bg" justify="space-around">
         <el-col :span="6">
           <div style="text-align: center; margin-bottom: 10px;margin-top:10px">椤圭洰鍒楄〃</div>
           <div class="tab3">
             <div class="outside1">
-              <el-tree
-                :data="Treedata"
-                show-checkbox
-                node-key="proId"
-                :props="defaultProps"
-                @check-change="handleCurrentChecked"
-              >
+              <el-tree :data="Treedata" show-checkbox node-key="proId" :props="defaultProps"
+                @check-change="handleCurrentChecked">
               </el-tree>
             </div>
           </div>
@@ -447,81 +227,43 @@
               <div class="outside">
                 <el-form :inline="true" class="outside1">
                   <el-form-item label="鍘熶环">
-                    <el-input
-                      placeholder="鍘熶环"
-                      :value="TotalPrice1"
-                      disabled
-                      style="width: 90px"
-                    ></el-input>
+                    <el-input placeholder="鍘熶环" :value="TotalPrice1" disabled style="width: 90px"></el-input>
                   </el-form-item>
                   <el-form-item label="鎶樻墸璁惧畾">
-                    <el-input
-                      style="width: 90px"
-                      type="number"
-                      v-model="discount"
-                      :value="discount"
-                    ></el-input>
+                    <el-input style="width: 90px" type="number" v-model="discount" :value="discount"></el-input>
                   </el-form-item>
                   <el-form-item label="搴斾粯閲戦">
-                    <el-input
-                      placeholder="搴斾粯閲戦"
-                      :value="TotalPrice1 * (discount / 10)"
-                      style="width: 90px"
-                    ></el-input>
+                    <el-input placeholder="搴斾粯閲戦" :value="TotalPrice1 * (discount / 10)" style="width: 90px"></el-input>
                   </el-form-item>
                   <el-form-item label="浠樻绫诲瀷" prop="payType">
-                    <el-select
-                      style="width: 120px"
-                      v-model="payType"
-                      placeholder="璇烽�夋嫨浠樻绫诲瀷"
-                    >
-                      <el-option
-                        v-for="dict in dict.type.dict_pay_type"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                      ></el-option>
+                    <el-select style="width: 120px" v-model="payType" placeholder="璇烽�夋嫨浠樻绫诲瀷">
+                      <el-option v-for="dict in dict.type.dict_pay_type" :key="dict.value" :label="dict.label"
+                        :value="dict.value"></el-option>
                     </el-select>
                   </el-form-item>
                   <el-form-item>
-                    <el-button
-                      type="primary"
-                      @click="submitPrice"
-                      :disabled="confirm"
-                      style="margin-top: 34px"
-                      >鏀惰垂</el-button
-                    >
+                    <el-button type="primary" @click="submitPrice" :disabled="confirm"
+                      style="margin-top: 34px">鏀惰垂</el-button>
                   </el-form-item>
                 </el-form>
               </div>
               <div style="text-align: center; margin-bottom: 10px">
                 宸查�夐」鐩垪琛�
               </div>
-              <div
-                style="
+              <div style="
                   padding: 0px 6px;
                   border: 1px solid #e6ebf5;
                   max-height: 420px;
                   overflow: auto;
-                "
-              >
+                ">
                 <el-collapse v-model="activeName" accordion>
                   <div v-for="(item, index) in DataList" :key="index">
                     <el-collapse-item>
                       <template slot="title">
                         {{ item.proName + "(" + "鍘熶环" + item.proPrice + ")" }}
                       </template>
-                      <el-table
-                        :data="item.tjProjectList"
-                        border
-                        style="width: 100%"
-                        height="250"
-                      >
-                        <el-table-column
-                          prop="proName"
-                          label="椤圭洰"
-                          width="180"
-                        >
+                      <el-table :data="item.tjProjectList" border style="width: 100%" height="250">
+                        <el-table-column prop="proName" label="椤圭洰" width="180">
                         </el-table-column>
                         <el-table-column prop="proPrice" label="鍘熶环">
                         </el-table-column>
@@ -533,11 +275,7 @@
                   <div>
                     <el-collapse-item title="璇烽�夋嫨椤圭洰">
                       <el-table :data="DataList" border style="width: 100%">
-                        <el-table-column
-                          prop="proName"
-                          label="椤圭洰"
-                          width="180"
-                        >
+                        <el-table-column prop="proName" label="椤圭洰" width="180">
                         </el-table-column>
                         <el-table-column prop="ordPrice" label="鍘熶环">
                         </el-table-column>
@@ -553,25 +291,14 @@
     </el-dialog>
 
     <!-- 娣诲姞琛ュ綍椤圭洰 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="Projectopen1"
-      width="980px"
-      style="height: 860px"
-      append-to-body
-    >
+    <el-dialog :title="title" :visible.sync="Projectopen1" width="980px" style="height: 860px" append-to-body>
       <el-row type="flex" class="row-bg" justify="space-around">
         <el-col :span="6">
           <div style="text-align: center; margin-bottom: 10px;margin-top:10px">椤圭洰鍒楄〃</div>
           <div class="tab3">
             <div class="outside1">
-              <el-tree
-                :data="Treedata"
-                show-checkbox
-                node-key="proId"
-                :props="defaultProps"
-                @check-change="handleCurrentChecked"
-              >
+              <el-tree :data="Treedata" show-checkbox node-key="proId" :props="defaultProps"
+                @check-change="handleCurrentChecked">
               </el-tree>
             </div>
           </div>
@@ -593,76 +320,42 @@
             <div class="outside">
               <el-form :inline="true" class="outside1">
                 <el-form-item label="鍘熶环">
-                  <el-input
-                    placeholder="鍘熶环"
-                    :value="TotalPrice1"
-                    disabled
-                    style="width: 90px"
-                  ></el-input>
+                  <el-input placeholder="鍘熶环" :value="TotalPrice1" disabled style="width: 90px"></el-input>
                 </el-form-item>
                 <el-form-item label="鎶樻墸璁惧畾">
-                  <el-input
-                    style="width: 90px"
-                    type="number"
-                    v-model="discount"
-                    :value="discount"
-                  ></el-input>
+                  <el-input style="width: 90px" type="number" v-model="discount" :value="discount"></el-input>
                 </el-form-item>
                 <el-form-item label="搴斾粯閲戦">
-                  <el-input
-                    placeholder="搴斾粯閲戦"
-                    :value="TotalPrice1 * (discount / 10)"
-                    style="width: 90px"
-                  ></el-input>
+                  <el-input placeholder="搴斾粯閲戦" :value="TotalPrice1 * (discount / 10)" style="width: 90px"></el-input>
                 </el-form-item>
                 <el-form-item label="浠樻绫诲瀷" prop="payType">
-                  <el-select
-                    style="width: 120px"
-                    v-model="payType"
-                    placeholder="璇烽�夋嫨浠樻绫诲瀷"
-                  >
-                    <el-option
-                      v-for="dict in dict.type.dict_pay_type"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    ></el-option>
+                  <el-select style="width: 120px" v-model="payType" placeholder="璇烽�夋嫨浠樻绫诲瀷">
+                    <el-option v-for="dict in dict.type.dict_pay_type" :key="dict.value" :label="dict.label"
+                      :value="dict.value"></el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item>
-                  <el-button
-                    type="primary"
-                    @click="submitPrice1"
-                    :disabled="confirm"
-                    style="margin-top: 34px"
-                    >鏀惰垂</el-button
-                  >
+                  <el-button type="primary" @click="submitPrice1" :disabled="confirm"
+                    style="margin-top: 34px">鏀惰垂</el-button>
                 </el-form-item>
               </el-form>
             </div>
             <div style="text-align: center; margin-bottom: 10px">
               宸查�夐」鐩垪琛�
             </div>
-            <div
-              style="
+            <div style="
                 padding: 0px 6px;
                 border: 1px solid #e6ebf5;
                 max-height: 420px;
                 overflow: auto;
-              "
-            >
+              ">
               <el-collapse v-model="activeName" accordion>
                 <div v-for="(item, index) in DataList" :key="index">
                   <el-collapse-item>
                     <template slot="title">
                       {{ item.proName + "(" + "鍘熶环" + item.proPrice + ")" }}
                     </template>
-                    <el-table
-                      :data="item.tjProjectList"
-                      border
-                      style="width: 100%"
-                      height="250"
-                    >
+                    <el-table :data="item.tjProjectList" border style="width: 100%" height="250">
                       <el-table-column prop="proName" label="椤圭洰" width="180">
                       </el-table-column>
                       <el-table-column prop="proPrice" label="鍘熶环">
@@ -909,10 +602,15 @@
     },
     /** 鏌ヨ浣撴璁板綍鍒楄〃 */
     getList() {
-      this.queryParams.djbeginTime = this.startTime[0];
-      this.queryParams.djendTime = this.startTime[1];
-      this.queryParams.bgbeginTime = this.startTime1[0];
-      this.queryParams.bgendTime = this.startTime1[1];
+      if (this.startTime) {
+        this.queryParams.djbeginTime = this.startTime[0];
+        this.queryParams.djendTime = this.startTime[1];
+      }
+      if (this.startTime1) {
+        this.queryParams.bgbeginTime = this.startTime1[0];
+        this.queryParams.bgendTime = this.startTime1[1];
+      }
+
       this.loading = true;
       getOrderList(this.queryParams).then((response) => {
         this.orderList = response.data.list;

--
Gitblit v1.8.0