all done

src/views/Login.vue

@@ -159,7 +159,7 @@ export default {
                       localStorage.setItem('utype',res.data.data.utype);
                       localStorage.setItem('token',res.data.data.token);
                   }else{
-                      this.$message.error("账号或者密码有误");
+                      this.$message.error(res.data.message);
                   } 
             })
             .catch(err=>{

src/views/company/Grid.vue

@@ -73,8 +73,9 @@
   }
 }
 .w-e-text-container {
-  height: 600px;
+  height: 300px;
 }
+
 .bg-color-blue {
   color: #fff;
   background-color: #388cff;
@@ -247,7 +248,7 @@ h4{
         :close-on-click-modal="false"
         :close-on-press-escape="false"
       >
-        <el-form size="small" label-width="120px">
+        <el-form size="small" label-width="120px" class="editForm">
           <el-row :gutter="10">
             <el-col :span="8">
               <el-form-item label="负责人姓名">
@@ -298,7 +299,7 @@ h4{
                 </div>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="12">
               <el-form-item label="证件类型">
                 <div class="upload_div">
                   <i
@@ -323,6 +324,99 @@ h4{
                 </div>
               </el-form-item>
             </el-col>
+            <el-col :span="4">
+              <el-button v-if="!yayun" type="primary" size="mini" @click="yayun=!yayun">添加押运员</el-button>
+              <el-button v-else type="danger" size="mini" @click="yayun=!yayun">删除押运员</el-button>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="12">
+              <el-form-item label="销售许可证">
+                <el-upload
+                  class="upload-demo"
+                  action="/api/admin/uploadfile"
+                  :on-preview="handlePreview"
+                  :on-remove="handleRemove"
+                  :before-remove="beforeRemove"
+                  multiple
+                  :limit="10"
+                  :on-exceed="handleExceed"
+                  :on-success="handleSuccess"
+                  :file-list="fileList">
+                  <el-button size="small" type="primary">点击上传</el-button>
+                  <!-- <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div> -->
+                </el-upload>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <!-- 押运员 -->
+          <el-row :gutter="10" v-if="yayun">
+            <el-col :span="12">
+              <el-form-item label="押运员姓名">
+                <el-input
+                  v-model="form1.yayun_person_name"
+                  placeholder="请输入押运员姓名"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="押运员电话">
+                <el-input
+                  v-model="form1.yayun_person_phone"
+                  placeholder="请输入押运员手机号"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="押运员照片">
+                <div class="upload_div">
+                  <i
+                    v-if="form1.yayun_person_photo"
+                    @click="form1.yayun_person_photo = ''"
+                    class="el-icon-delete"
+                  ></i>
+                  <i class="el-icon-upload"></i>
+                  <img
+                    v-if="form1.yayun_person_photo"
+                    width="100%"
+                    height="100%"
+                    :src="form1.yayun_person_photo"
+                    alt=""
+                  />
+                  <input
+                    accept="image/png,image/jpg"
+                    @change="upload('yayun_person_photo')"
+                    id="yayun_person_photo"
+                    type="file"
+                  />
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="押运员证件类型">
+                <div class="upload_div">
+                  <i
+                    v-if="form1.yayun_certificate"
+                    @click="form1.yayun_certificate = ''"
+                    class="el-icon-delete"
+                  ></i>
+                  <i class="el-icon-upload"></i>
+                  <img
+                    v-if="form1.yayun_certificate"
+                    width="100%"
+                    height="100%"
+                    :src="form1.yayun_certificate"
+                    alt=""
+                  />
+                  <input
+                    accept="image/png,image/jpg"
+                    @change="upload('yayun_certificate')"
+                    id="yayun_certificate"
+                    type="file"
+                  />
+                </div>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-form-item label="责任清单">
             <!-- <el-input
@@ -420,7 +514,36 @@ h4{
             <tr>
               <td style="text-align: left; padding-left: 10px">
                 <p>手机：</p>
-                <p>{{ form1.charge_person_phone }}</p>
+                <p>{{ form1.yayun_person_phone }}</p>
+              </td>
+            </tr>
+            <!-- 押运员 -->
+            <tr v-if="form1.yayun_person_name">
+              <td style="text-align: left; padding-left: 10px">
+                <p>押运员姓名：</p>
+                <p>{{ form1.yayun_person_name }}</p>
+              </td>
+              <td rowspan="2">
+                <img :src="form1.yayun_person_photo" width="80" alt="" />
+              </td>
+              <td rowspan="2">
+                <img :src="form1.yayun_certificate" width="180" alt="" />
+              </td>
+            </tr>
+            <tr v-if="form1.yayun_person_name">
+              <td style="text-align: left; padding-left: 10px">
+                <p>押运员手机：</p>
+                <p>{{ form1.yayun_person_phone }}</p>
+              </td>
+            </tr>
+            <tr v-if="form1.detail_filelist.length">
+              <td colspan="3">
+                <h4 align="left" style="">销售许可明细</h4>
+                <div style="height: 100px;overflow-y:scroll;text-align:left;">
+                  <p v-for="item in form1.detail_filelist" :key="item" >
+                    <a :href="item.url" style="color:white;text-decration:none;display:block;">{{item.name}}</a>
+                  </p>
+                </div>
               </td>
             </tr>
             <tr v-if="form1.duty_list">
@@ -471,6 +594,8 @@ export default {
   },
   data() {
     return {
+      fileList:[],
+      yayun:false,
       isClear: false,
       dialogFormVisible: false,
       dialogFormVisible1: false,
@@ -556,9 +681,33 @@ export default {
       curItem: {},
       treeData: {},
       gridDetail: {},
+      detail_filelist:[]
     };
   },
   methods: {
+    handleSuccess(response, file, fileList){
+      this.detail_filelist.push(response.data)
+    },
+    handleRemove(file, fileList) {
+      // let index = this.detail_filelist.indexOf(file.response.data.url)
+      // if(index!=-1){
+      //   this.detail_filelist.splice(index,1)
+      // }
+      this.detail_filelist.forEach(function(item,index){
+        if(item.url==file.response.data.url){
+          this.detail_filelist.splice(index,1)
+        }
+      })
+    },
+    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 }？`);
+    },
     getEnterpriseInfo() {
       this.$api.getEnterprise({ id: this.form.enterprise_id }).then((res) => {
         this.dialogFormVisible2 = true;
@@ -638,12 +787,20 @@ export default {
     saveGridDetail() {
       let params = this.form1;
       params.enterprise_grid_id = this.curItem.id;
+      params.detail_filelist = this.detail_filelist;
+      if(!this.yayun){
+        params.yayun_person_name = null
+        params.yayun_person_phone = null
+        params.yayun_person_photo = null
+        params.yayun_certificate = null
+      }
       if (params.id) {
         this.$api.updateGridDetail(params).then((res) => {
           if (res.data.code != 0) {
             this.$message.error(res.data.message);
           }
           this.dialogFormVisible1 = false;
+          this.$message({ message: "成功！", type: "success" });
         });
       } else {
         this.$api.addGridDetail(params).then((res) => {
@@ -651,6 +808,7 @@ export default {
             this.$message.error(res.data.message);
           }
           this.dialogFormVisible1 = false;
+          this.$message({ message: "成功！", type: "success" });
         });
       }
     },
@@ -670,6 +828,13 @@ export default {
       this.curItem = item;
       this.$api.getGridDetail({ id: item.id }).then((res) => {
         this.form1 = res.data.data?res.data.data:{};
+        this.detail_filelist = this.form1.detail_filelist;
+        this.fileList = this.form1.detail_filelist;
+        if(this.form1.yayun_person_name){
+          this.yayun = true
+        }else{
+          this.yayun = false
+        }
       });
     },
     upload(type) {