Merge branch 'master' of http://114.215.101.231:8099/liujiancheng/wuliu into nijingnan

# Conflicts:
#	src/components/home.vue
#	src/components/yunshu/fa.vue

@@ -12,3 +12,4 @@ yarn-error.log*
 *.ntvs*
 *.njsproj
 *.sln
+/dist.zip

@@ -121,14 +121,20 @@
       </div>
     </div>
     <!-- 途中检查记录 -->
-    <el-dialog title="技术资料" :visible.sync="dialogVisible" width="80%" style="margin-top: 20px" :append-to-body="true">
-      <div class="jishus" style='height: 800px'>
+    <el-dialog
+      title="技术资料"
+      :visible.sync="dialogVisible"
+      width="80%"
+      style="margin-top: 20px"
+      :append-to-body="true"
+    >
+      <div class="jishus" style="height: 800px">
         <div class="jichuss">
           <div class="ges"></div>
           <div class="jichusa">基础信息</div>
         </div>
-        <div class="fahuo-li" style="margin-top:20px">
-          <div class="a" style="width:33.3%;">
+        <div class="fahuo-li" style="margin-top: 20px">
+          <div class="a" style="width: 33.3%">
             <div class="sd">
               <div class="fa-ji">当前状况</div>
               <div class="conrt">车辆绕路、产品偏移、司机未按路线形式.5</div>
@@ -164,7 +170,7 @@
             </div>
           </div>
 
-          <div class="a" style="width:33.3%;">
+          <div class="a" style="width: 33.3%">
             <div class="sd">
               <div class="fa-ji">当前状况</div>
               <div class="conrt">车辆绕路、产品偏移、司机未按路线形式.5</div>
@@ -243,7 +249,12 @@
         </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="date" label="铲平货运单编号" width="292">
+            <el-table-column
+              fixed
+              prop="date"
+              label="铲平货运单编号"
+              width="292"
+            >
             </el-table-column>
             <el-table-column prop="name" label="收货单位" width="292">
             </el-table-column>
@@ -269,7 +280,12 @@
         </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="date" label="铲平货运单编号" width="292">
+            <el-table-column
+              fixed
+              prop="date"
+              label="铲平货运单编号"
+              width="292"
+            >
             </el-table-column>
             <el-table-column prop="name" label="收货单位" width="292">
             </el-table-column>
@@ -290,13 +306,18 @@
           </el-table>
         </div>
         <div class="chaknas">查看更多....</div>
-        <div class="jichuss" style="margin-top: 23px;">
+        <div class="jichuss" style="margin-top: 23px">
           <div class="ges"></div>
           <div class="jichusa">途中检查记录</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="date" label="途中检查记录id" width="292">
+            <el-table-column
+              fixed
+              prop="date"
+              label="途中检查记录id"
+              width="292"
+            >
             </el-table-column>
             <el-table-column prop="name" label="检查转态" width="292">
             </el-table-column>
@@ -316,7 +337,7 @@
             </el-table-column>
           </el-table>
         </div>
-        <div class="chaknas" style="margin-bottom: 20px;">查看更多....</div>
+        <div class="chaknas" style="margin-bottom: 20px">查看更多....</div>
       </div>
     </el-dialog>
     <Tabbar :actives="1"></Tabbar>

@@ -64,13 +64,8 @@
               >
               </el-date-picker>
             </div>
-            <div class="chaxun">
-              <img
-                src="../../assets/chaxun.png"
-                class="cha-imgs"
-                alt=""
-                @click="chaxun"
-              />
+            <div class="chaxun" @click="chaxun">
+              <img src="../../assets/chaxun.png" class="cha-imgs" alt="" />
             </div>
           </div>
         </div>
@@ -207,7 +202,7 @@
       title="新增发货计划"
       :visible.sync="dialogVisible"
       width="80%"
-      style="margin-top: 90px;"
+      style="margin-top: 90px"
       :append-to-body="true"
     >
       <div class="liebiao">
@@ -244,20 +239,22 @@
             <div class="sd">
               <div class="fa-ji">附带资料</div>
               <div class="ziliao-list">
-                <div class="liulan" @click="handleFileChange">浏览</div>
-                <input
-                  type="file"
-                  ref="sa"
-                  @change="handleFileChange"
-                  style="display: none"
-                />
-                <div class="ziliaotu">
-                  <div class="ziliao-left">
-                    <img src="../../assets/21.png" class="ziliao-img" alt="" />
-                    <span class="text-sp">food.jpg</span>
+                <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
                   </div>
-                  <img src="../../assets/chen.png" class="chen-img" alt="" />
-                </div>
+                </el-upload>
               </div>
             </div>
           </div>
@@ -396,7 +393,13 @@
                   v-model="scope.row.productId"
                   placeholder="请输入产品型号"
                   filterable
-                  @change="getCategoryOptions(scope.row.productId,scope.$index, tablelist)"
+                  @change="
+                    getCategoryOptions(
+                      scope.row.productId,
+                      scope.$index,
+                      tablelist
+                    )
+                  "
                 >
                   <el-option
                     v-for="item in optionsas"
@@ -479,9 +482,8 @@
           </el-table>
         </div>
         <div class="queren">
-          <el-button type="primary" round  @click="btn">确认</el-button>
+          <el-button type="primary" round @click="btn">确认</el-button>
           <el-button round @click="dialogVisible = false">取消</el-button>
-
         </div>
       </div>
     </el-dialog>
@@ -490,7 +492,7 @@
       title="发货计划审核"
       :visible.sync="dialogVisibleg"
       width="70%"
-      style="margin-top: 90px;"
+      style="margin-top: 90px"
       :append-to-body="true"
     >
       <div class="liebiao">
@@ -601,7 +603,9 @@
           </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>
@@ -612,7 +616,7 @@
       title="完成发货计划"
       :visible.sync="dialogVisibleq"
       width="70%"
-      style="margin-top: 90px;"
+      style="margin-top: 90px"
       :append-to-body="true"
     >
       <div class="liebiao">
@@ -732,7 +736,9 @@
           </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>
@@ -743,7 +749,7 @@
       title="查看详情"
       :visible.sync="dialogVisibleh"
       width="70%"
-       style="margin-top: 110px;"
+      style="margin-top: 110px"
       :append-to-body="true"
     >
       <div class="liebiao">
@@ -854,7 +860,9 @@
           </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> -->
@@ -896,6 +904,8 @@ export default {
           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' }],
+
       tablelists: [],
       options: [],
       dialogVisible: false,
@@ -936,6 +946,20 @@ export default {
     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}？`);
+    },
+
     onSubmit(val) {
       this.value = val;
       this.dian();
@@ -1010,14 +1034,14 @@ export default {
         });
     },
     //搜索
-    getCategoryOptions(val,index, rows) {
+    getCategoryOptions(val, index, rows) {
       console.log(val);
       console.log()
-      this.chanping(val,index, rows)
+      this.chanping(val, index, rows)
       //  this.chan()
     },
     //根据产品id搜索
-    chanping(id,index, rows) {
+    chanping(id, index, rows) {
       let that = this;
       var url = "/api/system/product/" + id;
       let params = {};
@@ -1084,6 +1108,7 @@ export default {
     },
     //获取发货计划列表
     fahuo() {
+      console.log("11")
       let that = this;
       var url = "/api/ship/ship/list";
       let params = {
@@ -1094,14 +1119,12 @@ export default {
         pageSize: that.pageSize,
         shipId: that.shipId,
         telegramListName: that.telegramListName,
-      };
-      that.$axios
-        .post(url, params)
-        .then(function (res) {
-          console.log(res);
-          that.tableData = res.rows;
-          that.total = res.total;
-        })
+      } || '';
+      that.$axios.post(url, params).then(res => {
+        console.log(res);
+        that.tableData = res.rows;
+        that.total = res.total;
+      })
         .catch(function (err) {
           console.log(err);
         });

@@ -87,15 +87,15 @@
       </div>
       <div class="tiaoshu">
         <div class="left-io"></div>
-        <div class="gon">共400条</div>
+        <div class="gon"></div>
         <div class="kls">
-          <el-pagination
+          <!-- <el-pagination
             :page-size="20"
             :pager-count="11"
             layout="prev, pager, next"
             :total="1000"
           >
-          </el-pagination>
+          </el-pagination> -->
         </div>
       </div>
     </div>

@@ -6,19 +6,16 @@
           <div class="ge"></div>
           <div class="fa-text">部门管理</div>
         </div>
-         <el-button type="primary" @click="dialogVisible = true">添加部门</el-button>
-
+        <el-button type="primary" @click="dialogVisible = true"
+          >添加部门</el-button
+        >
       </div>
       <div class="biaoge">
         <div class="biao-box">
           <div class="fhuo">
             <div class="fahuos">
               <div class="fas-text">部门ID</div>
-              <input
-                type="text"
-                placeholder="请输入部门ID"
-                class="fa-input"
-              />
+              <input type="text" placeholder="请输入部门ID" class="fa-input" />
             </div>
             <div class="fahuos">
               <div class="fas-text">部门名称</div>
@@ -29,8 +26,12 @@
               />
             </div>
             <div class="fahuos">
-              <div class="fas-text">所属单位 </div>
-              <input type="text" placeholder="请输入所属单位 " class="fa-input" />
+              <div class="fas-text">所属单位</div>
+              <input
+                type="text"
+                placeholder="请输入所属单位 "
+                class="fa-input"
+              />
             </div>
             <div class="fahuos">
               <div class="fas-text">状态</div>
@@ -76,13 +77,18 @@
       </div>
       <div class="tiaoshu">
         <div class="left-io"></div>
-        <div class="gon">共400条</div>
+        <div class="gon" v-if="tableData.length == 0">共1页</div>
+        <div class="gon" v-if="tableData.length != 0">
+          共{{ tableData.length }}页
+        </div>
         <div class="kls">
           <el-pagination
-            :page-size="20"
+            :page-size="10"
             :pager-count="11"
             layout="prev, pager, next"
-            :total="1000"
+            :total="tableData.length"
+            hide-on-single-page
+            @prev-click="prevPage"
           >
           </el-pagination>
         </div>
@@ -93,7 +99,7 @@
       title="添加部门"
       :visible.sync="dialogVisible"
       width="50%"
-      style='margin-top: 10%'
+      style="margin-top: 10%"
       :append-to-body="true"
     >
       <div class="liebiao">
@@ -108,26 +114,34 @@
           <div class="a">
             <div class="sd">
               <div class="fa-ji">部门名称</div>
-              <input type="text" placeholder="请输入部门名称" class="inputsad" />
+              <input
+                type="text"
+                placeholder="请输入部门名称"
+                class="inputsad"
+              />
             </div>
-           
           </div>
 
           <div class="a">
             <div class="sd">
               <div class="fa-ji">部门类型</div>
-             <input type="text" placeholder="请输入部门类型" class="inputsad" />
+              <input
+                type="text"
+                placeholder="请输入部门类型"
+                class="inputsad"
+              />
             </div>
-          </div>  
+          </div>
         </div>
-        
+
         <div class="queren">
-         <el-button type="primary" round @click='dialogVisible = false'>确认</el-button>
-      <el-button round @click='dialogVisible = false'>取消</el-button>
+          <el-button type="primary" round @click="dialogVisible = false"
+            >确认</el-button
+          >
+          <el-button round @click="dialogVisible = false">取消</el-button>
         </div>
       </div>
     </el-dialog>
-  
   </div>
 </template>
 
@@ -136,92 +150,14 @@ export default {
   data() {
     return {
       tableData: [
-        {
-          date: "P2112020092300",
-          name: "P2112020092300",
-          province: "北京电站",
-          city: "赵吾光",
-          address: "178 2038 0191",
-          zip: "重庆市南岸区长生桥镇长生路46号附1号",
-        },
-        {
-          date: "P2112020092300",
-          name: "P2112020092300",
-          province: "北京电站",
-          city: "赵吾光",
-          address: "178 2038 0191",
-          zip: "重庆市南岸区长生桥镇长生路46号附1号",
-        },
-        {
-          date: "P2112020092300",
-          name: "P2112020092300",
-          province: "北京电站",
-          city: "赵吾光",
-          address: "178 2038 0191",
-          zip: "重庆市南岸区长生桥镇长生路46号附1号",
-        },
-        {
-          date: "P2112020092300",
-          name: "P2112020092300",
-          province: "北京电站",
-          city: "赵吾光",
-          address: "178 2038 0191",
-          zip: "重庆市南岸区长生桥镇长生路46号附1号",
-        },
-        {
-          date: "P2112020092300",
-          name: "P2112020092300",
-          province: "北京电站",
-          city: "赵吾光",
-          address: "178 2038 0191",
-          zip: "重庆市南岸区长生桥镇长生路46号附1号",
-        },
-        {
-          date: "P2112020092300",
-          name: "P2112020092300",
-          province: "北京电站",
-          city: "赵吾光",
-          address: "178 2038 0191",
-          zip: "重庆市南岸区长生桥镇长生路46号附1号",
-        },
-        {
-          date: "P2112020092300",
-          name: "P2112020092300",
-          province: "北京电站",
-          city: "赵吾光",
-          address: "178 2038 0191",
-          zip: "重庆市南岸区长生桥镇长生路46号附1号",
-        },
-        {
-          date: "P2112020092300",
-          name: "P2112020092300",
-          province: "北京电站",
-          city: "赵吾光",
-          address: "178 2038 0191",
-          zip: "重庆市南岸区长生桥镇长生路46号附1号",
-        },
-        {
-          date: "P2112020092300",
-          name: "P2112020092300",
-          province: "北京电站",
-          city: "赵吾光",
-          address: "178 2038 0191",
-          zip: "重庆市南岸区长生桥镇长生路46号附1号",
-        },
-        {
-          date: "P2112020092300",
-          name: "P2112020092300",
-          province: "北京电站",
-          city: "赵吾光",
-          address: "178 2038 0191",
-          zip: "重庆市南岸区长生桥镇长生路46号附1号",
-        },
+        'qqqq'
       ],
       dialogVisible: false,
       dialogImageUrl: "",
+      pages: ''
     };
   },
-  mounted(){
+  mounted() {
     console.log('111')
   },
   methods: {
@@ -237,7 +173,7 @@ export default {
       this.dialogImageUrl = file.url;
       this.dialogVisible = true;
     },
-      //查看订单
+    //查看订单
     cha() {
       this.dialogVisibleg = true;
     },
@@ -269,7 +205,6 @@ export default {
 };
 </script>
 <style>
-
 .el-dialog__body {
   padding: 5px 20px;
   padding-bottom: 68px;
@@ -289,10 +224,10 @@ export default {
   height: 107px !important;
   line-height: 107px !important;
 }
-.el-carousel__container{
-      margin-top: 52px;
-      height: 629px;
-  }
+.el-carousel__container {
+  margin-top: 52px;
+  height: 629px;
+}
 </style>
 <style scoped>
 @import "../../css/fa.css";

@@ -10,7 +10,7 @@ Vue.config.productionTip = false
 import axios from "./common.js";
 Vue.prototype.$axios = axios;
 Vue.config.productionTip = false
-// sessionStorage.setItem('token','8de51490-befe-4966-babd-6127a4303176')
+
 if (sessionStorage.getItem("token")) {
     axios.defaults.headers.common["Authorization"] = sessionStorage.getItem("token");
 }