合并分支 'nijingnan' 到 'master'

121212



查看合并请求 !4

@@ -12,14 +12,14 @@
            <div class="liumima">新密码</div>
            <div class="shuru">
              <img src="../assets/Icon_1.png" class="mimas" alt="">
-             <input type="text" placeholder="请输入旧密码" class="jiumima">
+             <input type="text" placeholder="请输入新密码" class="jiumima">
            </div>
         </div>
         <div class="tanchuans">
            <div class="liumima">重复密码</div>
            <div class="shuru">
              <img src="../assets/Icon_1.png" class="mimas" alt="">
-             <input type="text" placeholder="请输入旧密码" class="jiumima">
+             <input type="text" placeholder="请输入重复密码" class="jiumima">
            </div>
         </div>
         <div class="denlu">

@@ -29,11 +29,11 @@
           <img src="../assets/youixna.png" class="you-img" alt="" />
           <div class="dian"></div>
         </div>
-        <div class="tuichus">退出登录</div>
+        <div class="tuichus" @click="backuser">退出登录</div>
       </div>
     </div>
     <popup v-show="isPopupVisible" @close="closePopup">
-      
+
     </popup>
 
     <router-view />
@@ -41,76 +41,99 @@
 </template>
 
 <script>
-import popup from "./popup";
-export default {
-  name: "App",
-  props: ["actives"],
-  components: {
-    popup,
-  },
-  data() {
-    return {
-      active: "1",
-      dialogVisibleyu: false,
-      isPopupVisible: false,
-    };
-  },
-  mounted() {
-    this.active = this.actives;
-    console.log(this.actives);
-  },
-  methods: {
-    //tab切换
-    yuns(index) {
-      console.log(index)
-      this.active = index;
-      if (this.active == 1) {
-        this.$router.push("./home");
-      } else if (this.active == 2) {
-        this.$router.push("./transport");
-      }else if(this.active == 3){
-        this.$router.push("./zhushu");
-      }else if(this.active == 4){
-        this.$router.push("./xitons");
-      }
+  import popup from "./popup";
+  export default {
+    name: "App",
+    props: ["actives"],
+    components: {
+      popup,
     },
-    //消息
-    news() {
-      this.$router.push("./xiaoxi?ac=" + this.active);
+    data() {
+      return {
+        active: "1",
+        dialogVisibleyu: false,
+        isPopupVisible: false,
+      };
     },
-    showPopup() {
-      this.isPopupVisible = true;
+    mounted() {
+      this.active = this.actives;
+      console.log(this.actives);
     },
-    closePopup() {
-      this.isPopupVisible = false;
+    methods: {
+      //tab切换
+      yuns(index) {
+        console.log(index)
+        this.active = index;
+        if (this.active == 1) {
+          this.$router.push("./home");
+        } else if (this.active == 2) {
+          this.$router.push("./transport");
+        } else if (this.active == 3) {
+          this.$router.push("./zhushu");
+        } else if (this.active == 4) {
+          this.$router.push("./xitons");
+        }
+      },
+      //消息
+      news() {
+        this.$router.push("./xiaoxi?ac=" + this.active);
+      },
+      showPopup() {
+        this.isPopupVisible = true;
+      },
+      closePopup() {
+        this.isPopupVisible = false;
+      },
+      // 退出登录
+      backuser() {
+        let that = this;
+        var url = "/api/auth/logout";
+        let params = {};
+        that.$axios
+          .delete(url, params)
+          .then(function(res) {
+            console.log(res);
+            that.$message({
+              message: "成功",
+              type: "success",
+            });
+            that.$router.replace({
+              path: '/'
+            })
+          })
+          .catch(function(err) {
+            console.log(err);
+          })
+      }
     },
-  },
-};
+  };
 </script>
 <style>
-* {
-  margin: 0;
-  padding: 0;
-}
-.box-a .el-dialog {
-  width: 100px !important;
-  height: 100px !important;
-}
+  * {
+    margin: 0;
+    padding: 0;
+  }
+
+  .box-a .el-dialog {
+    width: 100px !important;
+    height: 100px !important;
+  }
 
-.el-dialog__body {
-  overflow: auto;
-  color: #666666;
-}
-.el-dialog{
-  margin-top: 0 !important;
-  border-radius: 10px; 
-}
-.el-button.is-round{
-       border-radius: 20px;
+  .el-dialog__body {
+    overflow: auto;
+    color: #666666;
+  }
+
+  .el-dialog {
+    margin-top: 0 !important;
+    border-radius: 10px;
+  }
+
+  .el-button.is-round {
+    border-radius: 20px;
     padding: 12px 51px;
-}
+  }
 </style>
 <style scoped>
-@import "../css/app.css";
+  @import "../css/app.css";
 </style>
-

@@ -14,39 +14,19 @@
           <div class="fhuo">
             <div class="fahuos">
               <div class="fas-text">发货计划</div>
-              <input
-                type="text"
-                placeholder="请输入发货计划"
-                class="fa-input"
-                v-model="shipId"
-              />
+              <input type="text" placeholder="请输入发货计划" class="fa-input" v-model="shipId" />
             </div>
             <div class="fahuos">
               <div class="fas-text">合同编码</div>
-              <input
-                type="text"
-                placeholder="请输入合同编码"
-                class="fa-input"
-                v-model="contractCode"
-              />
+              <input type="text" placeholder="请输入合同编码" class="fa-input" v-model="contractCode" />
             </div>
             <div class="fahuos">
               <div class="fas-text">电站</div>
-              <input
-                type="text"
-                placeholder="请输入电站"
-                class="fa-input"
-                v-model="telegramListName"
-              />
+              <input type="text" placeholder="请输入电站" class="fa-input" v-model="telegramListName" />
             </div>
             <div class="fahuos">
               <div class="fas-text">申请人</div>
-              <input
-                type="text"
-                placeholder="请输入申请人"
-                class="fa-input"
-                v-model="createBy"
-              />
+              <input type="text" placeholder="请输入申请人" class="fa-input" v-model="createBy" />
             </div>
             <div class="fahuos">
               <div class="fas-text">申请时间</div>
@@ -56,12 +36,7 @@
                 class="fa-input"
                 v-model="createTime"
               /> -->
-              <el-date-picker
-                v-model="createTime"
-                type="date"
-                placeholder="请输入申请时间"
-                @click.native.prevent="datass"
-              >
+              <el-date-picker v-model="createTime" type="date" placeholder="请输入申请时间" @click.native.prevent="datass">
               </el-date-picker>
             </div>
             <div class="chaxun" @click="chaxun">
@@ -70,53 +45,26 @@
           </div>
         </div>
         <div class="zhonlist">
-          <el-table
-            :data="tableData"
-            border
-            style="width: 100%"
-            height="100%"
-            :header-cell-style="{ background: '#F4F4F5', color: '#303133' }"
-          >
-            <el-table-column
-              fixed
-              prop="shipId"
-              label="发货计划编码"
-              width="180"
-            >
+          <el-table :data="tableData" border style="width: 100%" height="100%" :header-cell-style="{ background: '#F4F4F5', color: '#303133' }">
+            <el-table-column fixed prop="shipId" label="发货计划编码" width="180">
             </el-table-column>
             <el-table-column prop="contractCode" label="合同编码" width="270">
             </el-table-column>
             <el-table-column prop="telegramList" label="电站" width="128">
             </el-table-column>
-            <el-table-column
-              prop="moneyContactPerson"
-              label="到货联系人"
-              width="128"
-            >
+            <el-table-column prop="moneyContactPerson" label="到货联系人" width="128">
             </el-table-column>
-            <el-table-column
-              prop="moneyContactPhone"
-              label="到货联系电话"
-              width="160"
-            >
+            <el-table-column prop="moneyContactPhone" label="到货联系电话" width="160">
             </el-table-column>
             <el-table-column prop="moneyAddress" label="到货地点" width="280">
             </el-table-column>
-            <el-table-column
-              prop="vehicleRequirements"
-              label="车辆要求"
-              width="180"
-            >
+            <el-table-column prop="vehicleRequirements" label="车辆要求" width="180">
             </el-table-column>
             <el-table-column prop="moneyTime" label="到货时间要求" width="180">
             </el-table-column>
             <el-table-column prop="deliveryMethod" label="交货方式" width="180">
             </el-table-column>
-            <el-table-column
-              prop="productionStatus"
-              label="生产情况"
-              width="180"
-            >
+            <el-table-column prop="productionStatus" label="生产情况" width="180">
             </el-table-column>
             <!-- <el-table-column prop="fileIds" label="附带资料" width="180">
             </el-table-column> -->
@@ -134,50 +82,17 @@
             </el-table-column>
             <el-table-column prop="status" label="状态" width="180">
               <template slot-scope="scope">
-                <el-button type="text" size="small" v-if="scope.row.status == 0"
-                  >待审核</el-button
-                >
-                <el-button type="text" v-if="scope.row.status == 1" size="small"
-                  >已审核</el-button
-                >
-                <el-button
-                  type="text"
-                  size="small"
-                  @click="cha"
-                  v-if="scope.row.status == 2"
-                  >已完成</el-button
-                >
-                <el-button
-                  type="text"
-                  size="small"
-                  @click="que"
-                  v-if="scope.row.status == 3"
-                  >已关闭</el-button
-                >
+                <el-button type="text" size="small" v-if="scope.row.status == 0">待审核</el-button>
+                <el-button type="text" v-if="scope.row.status == 1" size="small">已审核</el-button>
+                <el-button type="text" size="small" @click="cha" v-if="scope.row.status == 2">已完成</el-button>
+                <el-button type="text" size="small" @click="que" v-if="scope.row.status == 3">已关闭</el-button>
               </template>
             </el-table-column>
             <el-table-column fixed="right" label="操作" width="186">
               <template slot-scope="scope">
-                <el-button
-                  type="text"
-                  size="small"
-                  @click="chasa(scope.row.shipId)"
-                  >查看</el-button
-                >
-                <el-button
-                  type="text"
-                  size="small"
-                  @click="chaas(scope.row.shipId)"
-                  v-if="scope.row.status == 0"
-                  >审核</el-button
-                >
-                <el-button
-                  type="text"
-                  size="small"
-                  @click="que(scope.row.shipId)"
-                  v-if="scope.row.status != 2"
-                  >确认完成</el-button
-                >
+                <el-button type="text" size="small" @click="chasa(scope.row.shipId)">查看</el-button>
+                <el-button type="text" size="small" @click="chaas(scope.row.shipId)" v-if="scope.row.status == 0">审核</el-button>
+                <el-button type="text" size="small" @click="que(scope.row.shipId)" v-if="scope.row.status != 2">确认完成</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -187,69 +102,34 @@
         <div class="left-io"></div>
         <div class="gon">共{{ total }}条</div>
         <div class="kls">
-          <el-pagination
-            :page-size="20"
-            :pager-count="11"
-            layout="prev, pager, next"
-            :total="total"
-          >
+          <el-pagination :page-size="20" :pager-count="11" layout="prev, pager, next" :total="total">
           </el-pagination>
         </div>
       </div>
     </div>
     <!-- 编辑发货申请 -->
-    <el-dialog
-      title="新增发货计划"
-      :visible.sync="dialogVisible"
-      width="80%"
-      style="margin-top: 90px"
-      :append-to-body="true"
-    >
+    <el-dialog title="新增发货计划" :visible.sync="dialogVisible" width="80%" style="margin-top: 90px" :append-to-body="true">
       <div class="liebiao">
         <div class="fahuo-li">
           <div class="a">
             <div class="sd">
               <div class="fa-ji">发货计划</div>
-              <input
-                type="text"
-                placeholder="请输入发货计划"
-                v-model="shipPlan"
-                class="input"
-              />
+              <input type="text" placeholder="请输入发货计划" v-model="shipPlan" class="input" />
             </div>
             <div class="sd">
               <div class="fa-ji">到货联系电话</div>
-              <input
-                type="text"
-                placeholder="请输入到货联系电话"
-                class="input"
-                v-model="moneyContactPhone"
-
-              />
+              <input type="text" placeholder="请输入到货联系电话" class="input" v-model="moneyContactPhone" />
             </div>
             <div class="sd">
               <div class="fa-ji">生产情况</div>
-              <input
-                type="text"
-                placeholder="请输入生产情况"
-                class="input"
-                v-model="productionStatus"
-              />
+              <input type="text" placeholder="请输入生产情况" class="input" v-model="productionStatus" />
             </div>
             <div class="sd">
               <div class="fa-ji">附带资料</div>
               <div class="ziliao-list">
-                <el-upload
-                  class="upload-demo"
-                  action="https://jsonplaceholder.typicode.com/posts/"
-                  :on-preview="handlePreview"
-                  :on-remove="handleRemove"
-                  :before-remove="beforeRemove"
-                  multiple
-                  :limit="3"
-                  :on-exceed="handleExceed"
-                  :file-list="fileList"
-                >
+                <el-upload class="upload-demo" action="https://jsonplaceholder.typicode.com/posts/" :on-preview="handlePreview"
+                  :on-remove="handleRemove" :before-remove="beforeRemove" multiple :limit="3" :on-exceed="handleExceed"
+                  :file-list="fileList">
                   <el-button size="small" type="primary">点击上传</el-button>
                   <div slot="tip" class="el-upload__tip">
                     只能上传jpg/png文件，且不超过500kb
@@ -262,31 +142,15 @@
           <div class="a">
             <div class="sd">
               <div class="fa-ji">合同编码</div>
-              <input
-                type="text"
-                placeholder="请输入合同编码"
-                class="input"
-                v-model="contractCode"
-              />
+              <input type="text" placeholder="请输入合同编码" class="input" v-model="contractCode" />
             </div>
             <div class="sd">
               <div class="fa-ji">到货地点</div>
-              <input
-                type="text"
-                placeholder="请输入到货地点"
-                class="input"
-                v-model="moneyAddress"
-
-              />
+              <input type="text" placeholder="请输入到货地点" class="input" v-model="moneyAddress" />
             </div>
             <div class="sd">
               <div class="fa-ji">车辆要求</div>
-              <input
-                type="text"
-                placeholder="请输入车辆要求"
-                class="input"
-                v-model="vehicleRequirements"
-              />
+              <input type="text" placeholder="请输入车辆要求" class="input" v-model="vehicleRequirements" />
             </div>
           </div>
 
@@ -294,73 +158,37 @@
             <div class="sd">
               <div class="fa-ji">电站</div>
               <div class="inputt">
-                <el-select
-                  v-model="value"
-                  :filter-method="onSubmit"
-                  @change="currentSel"
-                  filterable
-                  placeholder="请选择"
-                  style="width: 283px"
-                >
-                  <el-option
-                    v-for="(item, index) in options"
-                    :key="index"
-                    :label="item.telegramName"
-                    :value="item.telegramId"
-                  >
+                <el-select v-model="value" :filter-method="onSubmit" @change="currentSel" filterable placeholder="请选择"
+                  style="width: 283px">
+                  <el-option v-for="(item, index) in options" :key="index" :label="item.telegramName" :value="item.telegramId">
                   </el-option>
                 </el-select>
               </div>
             </div>
             <div class="sd">
               <div class="fa-ji">详细地点</div>
-              <input
-                type="text"
-                placeholder="请输入详细地点"
-                class="input"
-                v-model="fullAddress"
-
-              />
+              <input type="text" placeholder="请输入详细地点" class="input" v-model="fullAddress" />
             </div>
             <div class="sd">
               <div class="fa-ji">备注</div>
-              <textarea
-                placeholder="请输入备注"
-                class="inputs"
-                v-model="remarks"
-              ></textarea>
+              <textarea placeholder="请输入备注" class="inputs" v-model="remarks"></textarea>
               <!-- <input type="text"   /> -->
             </div>
           </div>
           <div class="a">
             <div class="sd">
               <div class="fa-ji">到货联系人</div>
-              <input
-                type="text"
-                placeholder="请输入到货联系人"
-                class="input"
-                v-model="moneyContactPerson"
-
-              />
+              <input type="text" placeholder="请输入到货联系人" class="input" v-model="moneyContactPerson" />
             </div>
             <div class="sd">
               <div class="fa-ji">交货方式</div>
-              <input
-                type="text"
-                placeholder="请输入交货方式"
-                class="input"
-                v-model="deliveryMethod"
-              />
+              <input type="text" placeholder="请输入交货方式" class="input" v-model="deliveryMethod" />
             </div>
             <div class="sd">
               <div class="fa-ji">传真照片</div>
               <div class="chuanzheng">
-                <el-upload
-                  action="https://jsonplaceholder.typicode.com/posts/"
-                  list-type="picture-card"
-                  :on-preview="handlePictureCardPreview"
-                  :on-remove="handleRemove"
-                >
+                <el-upload action="https://jsonplaceholder.typicode.com/posts/" list-type="picture-card" :on-preview="handlePictureCardPreview"
+                  :on-remove="handleRemove">
                   <i class="el-icon-plus"></i>
                 </el-upload>
                 <el-dialog :visible.sync="dialogVisiblex">
@@ -375,38 +203,17 @@
           </div>
         </div>
         <div class="lista">
-          <el-table
-            :data="tablelist"
-            border
-            style="width: 100%"
-            height="100%"
-            :header-cell-style="{ background: '#F4F4F5', color: '#303133' }"
-          >
-            <el-table-column
-              fixed
-              prop="productId"
-              label="产品型号"
-              width="222"
-            >
+          <el-table :data="tablelist" border style="width: 100%" height="100%" :header-cell-style="{ background: '#F4F4F5', color: '#303133' }">
+            <el-table-column fixed prop="productId" label="产品型号" width="222">
               <template slot-scope="scope">
-                <el-select
-                  v-model="scope.row.productId"
-                  placeholder="请输入产品型号"
-                  filterable
-                  @change="
+                <el-select v-model="scope.row.productId" placeholder="请输入产品型号" filterable @change="
                     getCategoryOptions(
                       scope.row.productId,
                       scope.$index,
                       tablelist
                     )
-                  "
-                >
-                  <el-option
-                    v-for="item in optionsas"
-                    :key="item.value"
-                    :label="item.productCoding"
-                    :value="item.productId"
-                  >
+                  ">
+                  <el-option v-for="item in optionsas" :key="item.value" :label="item.productCoding" :value="item.productId">
                   </el-option>
                 </el-select>
                 <!-- <input
@@ -419,33 +226,17 @@
             </el-table-column>
             <el-table-column prop="detailId" label="产品编号" width="222">
               <template slot-scope="scope">
-                <input
-                  type="text"
-                  v-model="scope.row.detailId"
-                  placeholder="请输入产品编号"
-                  class="inputsvs"
-
-                />
+                <input type="text" v-model="scope.row.detailId" placeholder="请输入产品编号" class="inputsvs" />
               </template>
             </el-table-column>
             <el-table-column prop="zhon" label="配件种类" width="222">
               <template slot-scope="scope">
-                <input
-                  type="text"
-                  v-model="scope.row.zhon"
-                  placeholder="请输入配件种类"
-                  class="inputsvs"
-                />
+                <input type="text" v-model="scope.row.zhon" placeholder="请输入配件种类" class="inputsvs" />
               </template>
             </el-table-column>
             <el-table-column prop="num" label="产品数量" width="222">
               <template slot-scope="scope">
-                <input
-                  type="text"
-                  v-model="scope.row.num"
-                  class="inputsvs"
-                  placeholder="请输入产品数量"
-                />
+                <input type="text" v-model="scope.row.num" class="inputsvs" placeholder="请输入产品数量" />
               </template>
             </el-table-column>
             <el-table-column prop="moneyTime" label="要求到货时间" width="222">
@@ -458,12 +249,7 @@
                 >
                   请选择到货时间
                 </el-tag> -->
-                <el-date-picker
-                  v-model="scope.row.moneyTime"
-                  type="date"
-                  placeholder="请选择到货时间"
-                  @click.native.prevent="datas(scope.$index, tablelist)"
-                >
+                <el-date-picker v-model="scope.row.moneyTime" type="date" placeholder="请选择到货时间" @click.native.prevent="datas(scope.$index, tablelist)">
                 </el-date-picker>
                 <!-- <input type="text" v-model="scope.row.moneyTime" @click.native.prevent="shi(scope.$index,tablelist)" disabled  placeholder="请输入到货时间" class="inputsvs" /> -->
               </template>
@@ -471,12 +257,7 @@
 
             <el-table-column fixed="right" label="操作" width="200">
               <template slot-scope="scope">
-                <el-button
-                  @click.native.prevent="deleteRow(scope.$index, tablelist)"
-                  type="text"
-                  size="small"
-                  >删除</el-button
-                >
+                <el-button @click.native.prevent="deleteRow(scope.$index, tablelist)" type="text" size="small">删除</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -488,13 +269,7 @@
       </div>
     </el-dialog>
     <!-- 发货计划审核 -->
-    <el-dialog
-      title="发货计划审核"
-      :visible.sync="dialogVisibleg"
-      width="70%"
-      style="margin-top: 90px"
-      :append-to-body="true"
-    >
+    <el-dialog title="发货计划审核" :visible.sync="dialogVisibleg" width="70%" style="margin-top: 90px" :append-to-body="true">
       <div class="liebiao">
         <div class="jichus">
           <div class="gesk"></div>
@@ -583,13 +358,7 @@
           </div>
         </div>
         <div class="lista">
-          <el-table
-            :data="details.mainShipDetail"
-            border
-            style="width: 100%"
-            height="100%"
-            :header-cell-style="{ background: '#F4F4F5', color: '#303133' }"
-          >
+          <el-table :data="details.mainShipDetail" border style="width: 100%" height="100%" :header-cell-style="{ background: '#F4F4F5', color: '#303133' }">
             <el-table-column fixed prop="date" label="产品型号" width="260">
             </el-table-column>
             <el-table-column prop="productId" label="产品编号" width="260">
@@ -603,22 +372,14 @@
           </el-table>
         </div>
         <div class="queren">
-          <el-button type="primary" round @click="tonguo(1)"
-            >审核通过</el-button
-          >
+          <el-button type="primary" round @click="tonguo(1)">审核通过</el-button>
           <el-button round @click="butong(2)">审核不通过</el-button>
 
         </div>
       </div>
     </el-dialog>
     <!-- 确认发货 -->
-    <el-dialog
-      title="完成发货计划"
-      :visible.sync="dialogVisibleq"
-      width="70%"
-      style="margin-top: 90px"
-      :append-to-body="true"
-    >
+    <el-dialog title="完成发货计划" :visible.sync="dialogVisibleq" width="70%" style="margin-top: 90px" :append-to-body="true">
       <div class="liebiao">
         <div class="jichus">
           <div class="gesk"></div>
@@ -707,13 +468,7 @@
           </div>
         </div>
         <div class="lista" style="height: 200px">
-          <el-table
-            :data="details.mainShipDetail"
-            border
-            style="width: 100%"
-            height="100%"
-            :header-cell-style="{ background: '#F4F4F5', color: '#303133' }"
-          >
+          <el-table :data="details.mainShipDetail" border style="width: 100%" height="100%" :header-cell-style="{ background: '#F4F4F5', color: '#303133' }">
             <el-table-column fixed prop="date" label="产品型号" width="252">
             </el-table-column>
             <el-table-column prop="productId" label="产品编号" width="252">
@@ -725,33 +480,20 @@
 
             <el-table-column fixed="right" label="操作" width="272">
               <template slot-scope="scope">
-                <el-button
-                  @click="handleClick(scope.row.shipId, 3)"
-                  type="text"
-                  size="small"
-                  >确认完成</el-button
-                >
+                <el-button @click="handleClick(scope.row.shipId, 3)" type="text" size="small">确认完成</el-button>
               </template>
             </el-table-column>
           </el-table>
         </div>
         <div class="queren">
-          <el-button type="primary" round @click="dialogVisibleq = false"
-            >确认</el-button
-          >
+          <el-button type="primary" round @click="dialogVisibleq = false">确认</el-button>
           <el-button round @click="dialogVisibleq = false">取消</el-button>
 
         </div>
       </div>
     </el-dialog>
     <!-- 查看详情 -->
-    <el-dialog
-      title="查看详情"
-      :visible.sync="dialogVisibleh"
-      width="70%"
-      style="margin-top: 110px"
-      :append-to-body="true"
-    >
+    <el-dialog title="查看详情" :visible.sync="dialogVisibleh" width="70%" style="margin-top: 110px" :append-to-body="true">
       <div class="liebiao">
         <div class="jichus">
           <div class="gesk"></div>
@@ -840,13 +582,7 @@
           </div>
         </div>
         <div class="lista">
-          <el-table
-            :data="details.mainShipDetail"
-            border
-            style="width: 100%"
-            height="100%"
-            :header-cell-style="{ background: '#F4F4F5', color: '#303133' }"
-          >
+          <el-table :data="details.mainShipDetail" border style="width: 100%" height="100%" :header-cell-style="{ background: '#F4F4F5', color: '#303133' }">
             <el-table-column fixed prop="date" label="产品型号" width="232">
             </el-table-column>
             <el-table-column prop="productId" label="产品编号" width="242">
@@ -860,9 +596,7 @@
           </el-table>
         </div>
         <div class="queren">
-          <el-button type="primary" round @click="dialogVisibleh = false"
-            >确认</el-button
-          >
+          <el-button type="primary" round @click="dialogVisibleh = false">确认</el-button>
           <el-button round @click="dialogVisibleh = false">取消</el-button>
           <!-- <div class="querens" @click="dialogVisibleh = false">确认</div>
           <div class="quxiaos" @click="dialogVisibleh = false">取消</div> -->
@@ -870,11 +604,7 @@
       </div>
     </el-dialog>
     <!-- 预览图片 -->
-    <el-dialog
-      :visible.sync="dialogVisibleyu"
-      width="80%"
-      :append-to-body="true"
-    >
+    <el-dialog :visible.sync="dialogVisibleyu" width="80%" :append-to-body="true">
       <div class="fanhui" @click="fanhuis">
         <img src="../../assets/zuojian.png" class="zuojian" alt="" />
         <div class="sski">返回上一层</div>
@@ -889,12 +619,11 @@
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-      tableData: [],
-      tablelist: [
-        {
+  export default {
+    data() {
+      return {
+        tableData: [],
+        tablelist: [{
           productId: "",
           num: "",
           moneyTime: "",
@@ -902,456 +631,476 @@ export default {
           lastNum: "",
           shipId: "",
           status: "",
-        },
-      ],
-      fileList: [{ name: 'food.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100' }, { name: 'food2.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100' }],
+        }, ],
+        fileList: [{
+          name: 'food.jpeg',
+          url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'
+        }, {
+          name: 'food2.jpeg',
+          url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'
+        }],
 
-      tablelists: [],
-      options: [],
-      dialogVisible: false,
-      dialogVisibleg: false,
-      dialogVisibleq: false,
-      dialogVisibleh: false,
-      dialogVisibleyu: false,
-      dialogImageUrl: "",
-      dialogVisiblex: false,
-      shipPlan: "", //发货计划
-      moneyContactPhone: "", //到货联系电话
-      productionStatus: "", //生产情况
-      contractCode: "", //合同编码
-      moneyAddress: "", //到货地点
-      vehicleRequirements: "", //车辆要求
-      fullAddress: "", //详细地点
-      remarks: "", //备注
-      moneyContactPerson: "", //到货联系人
-      deliveryMethod: "", //交货方式
-      telegramList: "", //电站
-      value: "",
-      contractCode: "", //合同编码
-      createBy: "", //申请人
-      createTime: "", //申请时间
-      shipId: "", //申请计划
-      telegramListName: "", //电站名称
-      pageNum: 1,
-      pageSize: 10,
-      details: [],
-      total: null, //总条数
-      optionsas: [],
-      name: "",
-    };
-  },
-  mounted() {
-    this.dian();
-    this.fahuo();
-    this.chan();
-  },
-  methods: {
-    //上传附件
-    handleRemove(file, fileList) {
-      console.log(file, fileList);
-    },
-    handlePreview(file) {
-      console.log(file);
-    },
-    handleExceed(files, fileList) {
-      this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
-    },
-    beforeRemove(file, fileList) {
-      return this.$confirm(`确定移除 ${file.name}？`);
+        tablelists: [],
+        options: [],
+        dialogVisible: false,
+        dialogVisibleg: false,
+        dialogVisibleq: false,
+        dialogVisibleh: false,
+        dialogVisibleyu: false,
+        dialogImageUrl: "",
+        dialogVisiblex: false,
+        shipPlan: "", //发货计划
+        moneyContactPhone: "", //到货联系电话
+        productionStatus: "", //生产情况
+        contractCode: "", //合同编码
+        moneyAddress: "", //到货地点
+        vehicleRequirements: "", //车辆要求
+        fullAddress: "", //详细地点
+        remarks: "", //备注
+        moneyContactPerson: "", //到货联系人
+        deliveryMethod: "", //交货方式
+        telegramList: "", //电站
+        value: "",
+        contractCode: "", //合同编码
+        createBy: "", //申请人
+        createTime: "", //申请时间
+        shipId: "", //申请计划
+        telegramListName: "", //电站名称
+        pageNum: 1,
+        pageSize: 10,
+        details: [],
+        total: null, //总条数
+        optionsas: [],
+        name: "",
+      };
     },
-
-    onSubmit(val) {
-      this.value = val;
+    mounted() {
       this.dian();
-    },
-    //查询
-    chaxun() {
       this.fahuo();
+      this.chan();
     },
-    //select发生改变市
-    currentSel(selVal) {
-      console.log(selVal);
-      this.value = selVal;
-      this.telegramId();
-    },
-    //根据电站id查询数据
-    telegramId() {
-      let that = this;
-      var url = "/api/system/telegram/" + that.value;
-      let params = {};
-      that.$axios
-        .get(url)
-        .then(function (res) {
-          console.log(res);
-          that.moneyContactPerson = res.data.contactPerson;
-          that.moneyContactPhone = res.data.phoneNumber;
-          that.moneyAddress = res.data.address;
-          that.fullAddress = res.data.detailAddress;
-        })
-        .catch(function (err) {
-          console.log(err);
-        });
-    },
-    //确认完成
-    handleClick(id, index) {
-      let that = this;
-      var url = "/api/ship/ship/" + id + "/" + index;
-      let params = {};
-      that.$axios
-        .put(url)
-        .then(function (res) {
-          that.$message({
-            message: "确认完成",
-            type: "success",
+    methods: {
+      //上传附件
+      handleRemove(file, fileList) {
+        console.log(file, fileList);
+      },
+      handlePreview(file) {
+        console.log(file);
+      },
+      handleExceed(files, fileList) {
+        this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+      },
+      beforeRemove(file, fileList) {
+        return this.$confirm(`确定移除 ${file.name}？`);
+      },
+
+      onSubmit(val) {
+        this.value = val;
+        this.dian();
+      },
+      //查询
+      chaxun() {
+        this.fahuo();
+      },
+      //select发生改变市
+      currentSel(selVal) {
+        console.log(selVal);
+        this.value = selVal;
+        this.telegramId();
+      },
+      //根据电站id查询数据
+      telegramId() {
+        let that = this;
+        var url = "/api/system/telegram/" + that.value;
+        let params = {};
+        that.$axios
+          .get(url)
+          .then(function(res) {
+            console.log(res);
+            that.moneyContactPerson = res.data.contactPerson;
+            that.moneyContactPhone = res.data.phoneNumber;
+            that.moneyAddress = res.data.address;
+            that.fullAddress = res.data.detailAddress;
+          })
+          .catch(function(err) {
+            console.log(err);
           });
-          // that.dialogVisibleg = false;
-          // that.fahuo();
-          // console.log(res);
-        })
-        .catch(function (err) {
-          console.log(err);
-        });
-    },
-    //审核通过
-    tonguo(id) {
-      console.log(id);
-      let that = this;
-      var url = "/api/ship/ship/" + that.details.shipId + "/" + id;
-      let params = {};
-      that.$axios
-        .put(url)
-        .then(function (res) {
-          that.$message({
-            message: "审核成功",
-            type: "success",
+      },
+      //确认完成
+      handleClick(id, index) {
+        let that = this;
+        var url = "/api/ship/ship/" + id + "/" + index;
+        let params = {};
+        that.$axios
+          .put(url)
+          .then(function(res) {
+            that.$message({
+              message: "确认完成",
+              type: "success",
+            });
+            // that.dialogVisibleg = false;
+            // that.fahuo();
+            // console.log(res);
+          })
+          .catch(function(err) {
+            console.log(err);
           });
-          that.dialogVisibleg = false;
-          that.fahuo();
-          console.log(res);
-        })
-        .catch(function (err) {
-          console.log(err);
-        });
-    },
-    //搜索
-    getCategoryOptions(val, index, rows) {
-      console.log(val);
-      console.log()
-      this.chanping(val, index, rows)
-      //  this.chan()
-    },
-    //根据产品id搜索
-    chanping(id, index, rows) {
-      let that = this;
-      var url = "/api/system/product/" + id;
-      let params = {};
-      that.$axios
-        .get(url)
-        .then(function (res) {
-          console.log(index, rows);
-          rows[index].detailId = res.data.productCoding
-        })
-        .catch(function (err) {
-          console.log(err);
-        });
-    },
-    //获取产品信息列表
-    chan() {
-      let that = this;
-      var url = "/api/system/product/selectList?name=" + "";
-      let params = {};
-      that.$axios
-        .get(url)
-        .then(function (res) {
-          that.optionsas = res.data;
-          console.log(res);
-        })
-        .catch(function (err) {
-          console.log(err);
-        });
-    },
-    //审核不通过
-    butong(id) {
-      console.log(id);
-      let that = this;
-      var url = "/api/ship/ship/" + that.details.shipId + "/" + id;
-      let params = {};
-      that.$axios
-        .put(url)
-        .then(function (res) {
-          that.$message({
-            message: "审核成功",
-            type: "success",
+      },
+      //审核通过
+      tonguo(id) {
+        console.log(id);
+        let that = this;
+        var url = "/api/ship/ship/" + that.details.shipId + "/" + id;
+        let params = {};
+        that.$axios
+          .put(url)
+          .then(function(res) {
+            that.$message({
+              message: "审核成功",
+              type: "success",
+            });
+            that.dialogVisibleg = false;
+            that.fahuo();
+            console.log(res);
+          })
+          .catch(function(err) {
+            console.log(err);
           });
-          that.dialogVisibleg = false;
-          that.fahuo();
-          console.log(res);
-        })
-        .catch(function (err) {
-          console.log(err);
-        });
-    },
-    //获取电站列表
-    dian() {
-      let that = this;
-      var url = "/api/system/telegram/selectList?name=" + that.value;
-      let params = {};
-      that.$axios
-        .get(url)
-        .then(function (res) {
-          console.log(res);
-          that.options = res.data;
-        })
-        .catch(function (err) {
-          console.log(err);
-        });
-    },
-    //获取发货计划列表
-    fahuo() {
-      console.log("11")
-      let that = this;
-      var url = "/api/ship/ship/list";
-      let params = {
-        pageSize: that.pageSize,
-        createBy: that.createBy,
-        createTime: that.createTime,
-        pageNum: that.pageNum,
-        pageSize: that.pageSize,
-        shipId: that.shipId,
-        telegramListName: that.telegramListName,
-      } || '';
-      that.$axios.post(url, params).then(res => {
-        console.log(res);
-        that.tableData = res.rows;
-        that.total = res.total;
-      })
-        .catch(function (err) {
-          console.log(err);
-        });
-    },
-    //查看发货计划详情
-    chasa(id) {
-      this.dialogVisibleh = true;
-      let that = this;
-      var url = "/api/ship/ship/" + id;
-      let params = {};
-      that.$axios
-        .get(url)
-        .then(function (res) {
-          console.log(res);
-          that.details = res.data;
-        })
-        .catch(function (err) {
-          console.log(err);
-        });
-    },
-    //新增发货计划确认
-    btn() {
-      let that = this;
-      var url = "/api/ship/ship/add";
-      let params = {
-        shipPlan: that.shipPlan, //发货计划
-        fileIds:
-          "https://zqvcil8xjx.feishu.cn/docs/doccnzYUyK8v7fK3MQrPNodwPMQ", //附带资料
-        moneyContactPerson: that.moneyContactPerson, //到货联系人
-        telegramList: that.value, //发电站编码集合
-        latitude: "31.25658", //经度
-        longitude: "131.26589", //纬度
-        moneyAddress: that.moneyAddress, //到货地点
-        contractCode: that.contractCode, //合同编码
-        moneyContactPhone: that.moneyContactPhone, //到货联系电话
-        fullAddress: that.fullAddress, //详细地点
-        deliveryMethod: that.deliveryMethod, //交货方式
-        productionStatus: that.productionStatus, //生产情况
-        vehicleRequirements: that.vehicleRequirements, //车辆要求
-        remarks: that.remarks, //备注
-        photoIds:
-          "https://images.cnblogs.com/cnblogs_com/s313139232/1258426/o_o_headers.jpg", //传真照片
-        mainShipDetail: that.tablelist,
-      };
-      that.$axios
-        .post(url, params)
-        .then(function (res) {
-          console.log(res);
-          that.$message({
-            message: "添加成功",
-            type: "success",
+      },
+      //搜索
+      getCategoryOptions(val, index, rows) {
+        console.log(val);
+        console.log()
+        this.chanping(val, index, rows)
+        //  this.chan()
+      },
+      //根据产品id搜索
+      chanping(id, index, rows) {
+        let that = this;
+        var url = "/api/system/product/" + id;
+        let params = {};
+        that.$axios
+          .get(url)
+          .then(function(res) {
+            console.log(index, rows);
+            rows[index].detailId = res.data.productCoding
+          })
+          .catch(function(err) {
+            console.log(err);
           });
-          that.dialogVisible = false;
-          that.fahuo()
-        })
-        .catch(function (err) {
-          that.$message.error(err.msg)
-          console.log(err);
-        });
-    },
-    //时间选择
-    dayClick: function (date, dateStr) {
-      console.log(date);
-      console.log(dateStr);
-      console.log(this.value);
-    },
-    //添加产品
-    tianbtn() {
-      if (this.tablelist == undefined) {
-        this.bcglXiangXiList = new Array();
-      }
+      },
+      //获取产品信息列表
+      chan() {
+        let that = this;
+        var url = "/api/system/product/selectList?name=" + "";
+        let params = {};
+        that.$axios
+          .get(url)
+          .then(function(res) {
+            that.optionsas = res.data;
+            console.log(res);
+          })
+          .catch(function(err) {
+            console.log(err);
+          });
+      },
+      //审核不通过
+      butong(id) {
+        console.log(id);
+        let that = this;
+        var url = "/api/ship/ship/" + that.details.shipId + "/" + id;
+        let params = {};
+        that.$axios
+          .put(url)
+          .then(function(res) {
+            that.$message({
+              message: "审核成功",
+              type: "success",
+            });
+            that.dialogVisibleg = false;
+            that.fahuo();
+            console.log(res);
+          })
+          .catch(function(err) {
+            console.log(err);
+          });
+      },
+      //获取电站列表
+      dian() {
+        let that = this;
+        var url = "/api/system/telegram/selectList?name=" + that.value;
+        let params = {};
+        that.$axios
+          .get(url)
+          .then(function(res) {
+            console.log(res);
+            that.options = res.data;
+          })
+          .catch(function(err) {
+            console.log(err);
+          });
+      },
+      //获取发货计划列表
+      fahuo() {
+        console.log("11")
+        let that = this;
+        var url = "/api/ship/ship/list";
+        let params = {
+          pageSize: that.pageSize,
+          createBy: that.createBy,
+          createTime: that.createTime,
+          pageNum: that.pageNum,
+          pageSize: that.pageSize,
+          shipId: that.shipId,
+          telegramListName: that.telegramListName,
+        } || '';
+        that.$axios.post(url, params).then(res => {
+            console.log(res);
+            that.tableData = res.rows;
+            that.total = res.total;
+          })
+          .catch(function(err) {
+            console.log(err);
+          });
+      },
+      //查看发货计划详情
+      chasa(id) {
+        this.dialogVisibleh = true;
+        let that = this;
+        var url = "/api/ship/ship/" + id;
+        let params = {};
+        that.$axios
+          .get(url)
+          .then(function(res) {
+            console.log(res);
+            that.details = res.data;
+          })
+          .catch(function(err) {
+            console.log(err);
+          });
+      },
+      //新增发货计划确认
+      btn() {
+        let that = this;
+        var url = "/api/ship/ship/add";
+        let params = {
+          shipPlan: that.shipPlan, //发货计划
+          fileIds: "https://zqvcil8xjx.feishu.cn/docs/doccnzYUyK8v7fK3MQrPNodwPMQ", //附带资料
+          moneyContactPerson: that.moneyContactPerson, //到货联系人
+          telegramList: that.value, //发电站编码集合
+          latitude: "31.25658", //经度
+          longitude: "131.26589", //纬度
+          moneyAddress: that.moneyAddress, //到货地点
+          contractCode: that.contractCode, //合同编码
+          moneyContactPhone: that.moneyContactPhone, //到货联系电话
+          fullAddress: that.fullAddress, //详细地点
+          deliveryMethod: that.deliveryMethod, //交货方式
+          productionStatus: that.productionStatus, //生产情况
+          vehicleRequirements: that.vehicleRequirements, //车辆要求
+          remarks: that.remarks, //备注
+          photoIds: "https://images.cnblogs.com/cnblogs_com/s313139232/1258426/o_o_headers.jpg", //传真照片
+          mainShipDetail: that.tablelist,
+        };
+        that.$axios
+          .post(url, params)
+          .then(function(res) {
+            console.log(res);
+            that.$message({
+              message: "添加成功",
+              type: "success",
+            });
+            that.dialogVisible = false;
+            that.fahuo()
+          })
+          .catch(function(err) {
+            that.$message.error(err.msg)
+            console.log(err);
+          });
+      },
+      //时间选择
+      dayClick: function(date, dateStr) {
+        console.log(date);
+        console.log(dateStr);
+        console.log(this.value);
+      },
+      //添加产品
+      tianbtn() {
+        if (this.tablelist == undefined) {
+          this.bcglXiangXiList = new Array();
+        }
 
-      let obj = {};
-      obj.productId = "";
-      obj.num = "";
-      obj.moneyTime = "";
-      obj.detailId = "";
-      obj.lastNum = "";
-      obj.shipId = "";
-      obj.status = "";
-      this.tablelist.push(obj);
-    },
-    handleFileChange(e) {
-      console.log(e);
-      this.$refs.sa.click();
-    },
-    //添加产品删除
-    deleteRow(index, rows) {
-      rows.splice(index, 1);
-    },
-    //时间选择
-    datas(index, rows) {
-      console.log(rows[index].moneyTime);
-    },
-    //申请时间选择
-    datass() {
-      console.log(this.createTime);
-    },
-    //上传图片
-    handleRemove(file, fileList) {
-      console.log(file, fileList);
-    },
-    handlePictureCardPreview(file) {
-      this.dialogImageUrl = file.url;
-      this.dialogVisible = true;
-    },
-    //查看订单
-    chaas(id) {
-      this.dialogVisibleg = true;
-      let that = this;
-      var url = "/api/ship/ship/" + id;
-      let params = {};
-      that.$axios
-        .get(url)
-        .then(function (res) {
-          console.log(res);
-          that.details = res.data;
-        })
-        .catch(function (err) {
-          console.log(err);
-        });
-    },
-    //确认发货
-    que(id) {
-      this.dialogVisibleq = true;
-      let that = this;
-      var url = "/api/ship/ship/" + id;
-      let params = {};
-      that.$axios
-        .get(url)
-        .then(function (res) {
-          console.log(res);
-          that.details = res.data;
-        })
-        .catch(function (err) {
-          console.log(err);
-        });
-    },
-    //预览图片
-    chuans() {
-      this.dialogVisibleh = false;
-      this.dialogVisibleyu = true;
-    },
-    //返回上一层
-    fanhuis() {
-      this.dialogVisibleh = false;
-      this.dialogVisibleyu = true;
+        let obj = {};
+        obj.productId = "";
+        obj.num = "";
+        obj.moneyTime = "";
+        obj.detailId = "";
+        obj.lastNum = "";
+        obj.shipId = "";
+        obj.status = "";
+        this.tablelist.push(obj);
+      },
+      handleFileChange(e) {
+        console.log(e);
+        this.$refs.sa.click();
+      },
+      //添加产品删除
+      deleteRow(index, rows) {
+        rows.splice(index, 1);
+      },
+      //时间选择
+      datas(index, rows) {
+        console.log(rows[index].moneyTime);
+      },
+      //申请时间选择
+      datass() {
+        console.log(this.createTime);
+      },
+      //上传图片
+      handleRemove(file, fileList) {
+        console.log(file, fileList);
+      },
+      handlePictureCardPreview(file) {
+        this.dialogImageUrl = file.url;
+        this.dialogVisible = true;
+      },
+      //查看订单
+      chaas(id) {
+        this.dialogVisibleg = true;
+        let that = this;
+        var url = "/api/ship/ship/" + id;
+        let params = {};
+        that.$axios
+          .get(url)
+          .then(function(res) {
+            console.log(res);
+            that.details = res.data;
+          })
+          .catch(function(err) {
+            console.log(err);
+          });
+      },
+      //确认发货
+      que(id) {
+        this.dialogVisibleq = true;
+        let that = this;
+        var url = "/api/ship/ship/" + id;
+        let params = {};
+        that.$axios
+          .get(url)
+          .then(function(res) {
+            console.log(res);
+            that.details = res.data;
+            that.fahuo()
+          })
+          .catch(function(err) {
+            console.log(err);
+          });
+      },
+      //预览图片
+      chuans() {
+        this.dialogVisibleh = false;
+        this.dialogVisibleyu = true;
+      },
+      //返回上一层
+      fanhuis() {
+        this.dialogVisibleh = false;
+        this.dialogVisibleyu = true;
+      },
     },
-  },
-};
+  };
 </script>
 <style>
-.el-calendar {
-  position: fixed;
-  width: 100%;
-  height: 100%;
-  top: 10px;
-  left: 0;
-  z-index: 99999;
-}
+  .el-calendar {
+    position: fixed;
+    width: 100%;
+    height: 100%;
+    top: 10px;
+    left: 0;
+    z-index: 99999;
+  }
+
+  .el-dialog__body {
+    padding: 5px 20px;
+    padding-bottom: 0;
+  }
+
+  .el-dialog__title {
+    font-size: 22px !important;
+    color: #000000 !important;
+    font-weight: 500;
+  }
+
+  .el-upload--picture-card {
+    width: 80px !important;
+    height: 80px !important;
+    line-height: 80px !important;
+  }
+
+  .el-upload-list--picture-card .el-upload-list__item {
+    width: 80px !important;
+    height: 80px !important;
+    line-height: 80px !important;
+  }
+
+  .el-carousel__container {
+    margin-top: 52px;
+    height: 629px;
+  }
+
+  .el-icon-date:before {
+    content: "";
+  }
+
+  .el-input--prefix .el-input__inner {
+    padding-left: 10px;
+  }
+
+  .el-date-editor.el-input,
+  .el-date-editor.el-input__inner {
+    width: 195px;
+    border: none;
+  }
+
+  .el-input__inner {
+    border: 1px solid #fff;
+  }
+
+  .el-select {
+    width: 100%;
+  }
+
+  .el-input__inner {
+    height: 38px;
+    padding: 0 15px;
+    border-radius: 11px;
+  }
+
+  .fahuos .el-date-editor.el-input,
+  .el-date-editor.el-input__inner {
+    width: 250px;
+    /* border: 1px solid #e4e9ed; */
+    margin-top: 16px;
+    border-radius: 11px;
+    box-shadow: 0px 3px 16px 0px rgba(0, 0, 0, 0.10000000149011612);
+  }
+
+  input {
+    outline: none;
+    border: 0px;
+    border-radius: 11px;
+  }
+
+  .fahuos,
+  .el-select .el-input.is-focus .el-input__inner {
+    border: none;
+    border-radius: none;
+  }
+
+  .el-input__inner:hover {
+    border: none;
+  }
 
-.el-dialog__body {
-  padding: 5px 20px;
-  padding-bottom: 0;
-}
-.el-dialog__title {
-  font-size: 22px !important;
-  color: #000000 !important;
-  font-weight: 500;
-}
-.el-upload--picture-card {
-  width: 80px !important;
-  height: 80px !important;
-  line-height: 80px !important;
-}
-.el-upload-list--picture-card .el-upload-list__item {
-  width: 80px !important;
-  height: 80px !important;
-  line-height: 80px !important;
-}
-.el-carousel__container {
-  margin-top: 52px;
-  height: 629px;
-}
-.el-icon-date:before {
-  content: "";
-}
-.el-input--prefix .el-input__inner {
-  padding-left: 10px;
-}
-.el-date-editor.el-input,
-.el-date-editor.el-input__inner {
-  width: 195px;
-  border: none;
-}
-.el-input__inner {
-  border: 1px solid #fff;
-}
-.el-select {
-  width: 100%;
-}
-.el-input__inner {
-  height: 38px;
-  padding: 0 15px;
-  border-radius: 11px;
-}
-.fahuos .el-date-editor.el-input,
-.el-date-editor.el-input__inner {
-  width: 250px;
-  /* border: 1px solid #e4e9ed; */
-  margin-top: 16px;
-  border-radius: 11px;
-  box-shadow: 0px 3px 16px 0px rgba(0, 0, 0, 0.10000000149011612);
-}
-input{
-  outline: none;
-  border:0px;
-   border-radius: 11px;
-}
-.fahuos,.el-select .el-input.is-focus .el-input__inner{
-  border:none;
-  border-radius: none;
-}
-.el-input__inner:hover{
-  border:none;
-}
 </style>
 <style scoped>
-@import "../../css/fa.css";
+  @import "../../css/fa.css";
 </style>

@@ -82,13 +82,14 @@
           共{{ tableData.length }}页
         </div>
         <div class="kls">
+			<!-- @prev-click="prevPage" -->
           <el-pagination
             :page-size="10"
             :pager-count="11"
             layout="prev, pager, next"
             :total="tableData.length"
             hide-on-single-page
-            @prev-click="prevPage"
+            
           >
           </el-pagination>
         </div>

@@ -53,7 +53,7 @@
     margin-top: 21px;
     background: #ffffff;
     border-radius: 16px;
-    box-shadow: 0px 3px 16px 0px rgba(0,0,0,0.10000000149011612); 
+    box-shadow: 0px 3px 16px 0px rgba(0,0,0,0.10000000149011612);
     padding: 23px 22px;
     box-sizing: border-box;
 }
@@ -92,7 +92,7 @@
     background: #ffffff;
     border: 1px solid #e4e9ed;
     border-radius: 11px;
-    box-shadow: 0px 3px 16px 0px rgba(0,0,0,0.10000000149011612); 
+    box-shadow: 0px 3px 16px 0px rgba(0,0,0,0.10000000149011612);
 }
 .fa-inputslo{
     width: 230px;
@@ -106,7 +106,7 @@
     background: #ffffff;
     border: 1px solid #e4e9ed;
     border-radius: 11px;
-    box-shadow: 0px 3px 16px 0px rgba(0,0,0,0.10000000149011612); 
+    box-shadow: 0px 3px 16px 0px rgba(0,0,0,0.10000000149011612);
 }
 .chaxun{
     width: 93px;
@@ -119,7 +119,7 @@
     line-height: 43px;
 }
 .left-io{
-    width: 400px;
+    /* width: 152px; */
 }
 .tiaoshu{
     width: 100%;
@@ -133,7 +133,7 @@
     box-sizing: border-box;
 }
 .kls{
-   
+
     text-align: right;
 }
 .gon{
@@ -144,7 +144,7 @@
     width: 100%;
     height: 75%;
     margin-top: 32px;
-    
+
 }
 
 .xinzeng{
@@ -162,7 +162,7 @@
 .fahuo-li{
     width: 100%;
     display: flex;
-    
+
 }
 .fahuo-lisdf{
     width: 100%;
@@ -198,7 +198,7 @@
     font-size: 15px;
     color: #000000;
     outline: none;
-    
+
 }
 .inputsv{
     width: 283px;
@@ -321,7 +321,7 @@
 .lisg{
    width: 107px;
    height: 107px;
-   position: relative; 
+   position: relative;
    margin-right: 11px;
 }
 .fan{
@@ -476,13 +476,13 @@
     height: 21px;
     background: #2f54eb;
     border-radius: 20px;
-    
+
 }
 .jichu{
     font-size: 24px;
     color: #303133;
     margin-left: 16px;
-    
+
 }
 .fanhui{
     width: 100%;
@@ -506,11 +506,11 @@
     line-height: 300px;
     margin: 0;
   }
-  
+
   .el-carousel__item:nth-child(2n) {
     background-color: #99a9bf;
   }
-  
+
   .el-carousel__item:nth-child(2n+1) {
     background-color: #d3dce6;
   }
@@ -523,4 +523,4 @@
       width: 70px;
       height: 41px;
       cursor: pointer;
-  }
\ No newline at end of file
+  }