Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/SalesModule/MyCustomer.vue

@@ -763,6 +763,31 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+            <el-col :span="6">
+              <el-form-item label="签约" prop="SigningType">
+                <el-checkbox v-model='updateMsg.SigningType'>签约月结客户
+                </el-checkbox>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6" v-show="updateMsg.SigningType">
+              <el-form-item label="签约资料" prop="SigningFile">
+              <el-upload v-if="!saveMsg || !saveMsg.length" class="upload-demo" :disabled="!updateMsg.SigningType"
+                style="display:inline-block;position:relative;top:-1px;left:3px;" :http-request="uploadFileBtn"
+                :show-file-list="false" action="">
+                <el-button size="small" type="primary">签约材料</el-button>
+              </el-upload>
+              <template v-if="updateMsg.SigningType && saveMsg&& saveMsg.length>0">
+                <template v-for="(subItem,subIndex) in saveMsg">
+                  <a style="margin-left:20px;color:blue;cursor:pointer;" target="_blank" :key="subIndex"
+                    @click="downloadFile(subItem.URL,subItem.FileName)">{{subItem.FileName}}</a>
+
+                    <a :key="subIndex+1000" style="margin-left:20px;color:blue;cursor:pointer;"
+                      @click="DeleteFile(subIndex)">删除</a>
+                  </template>
+                </template>
+              </el-form-item>
+            </el-col></el-row>
         <el-row :gutter="20" style='margin-top:13px;'>
           <el-col :span="24">
             <p class="fz12 color333 fbold" style="border: none; margin-bottom: 15px; padding-left: 20px;">需审核信息<span
@@ -982,6 +1007,7 @@
         khly: [], //客户来源
         outerVisible: false,
         updateMsg: {
+          SigningType: false,
           contactNumber: '',
           CustomerName: '',
           CustomerId: 0,
@@ -1092,6 +1118,15 @@
         //     return
         //   }
         // }
+        if (this.updateMsg.SigningType && !this.saveMsg.length) {
+          this.$message.error('请上传签约材料')
+          return
+        } else {
+          if (this.saveMsg && this.saveMsg.length > 0) {
+            this.updateMsg.SigningFile = this.saveMsg[0].Path
+          }
+        }
+        this.updateMsg.SigningType = this.updateMsg.SigningType ? 1 : 0
         if (this.updateMsg.District == '') {
           this.updateMsg.District = 0
         }
@@ -1204,6 +1239,13 @@
             this.updateMsg.uniqueCode = x.uniqueCode
             this.updateMsg.lineid = x.lineid
             this.updateMsg.email = x.email
+            this.updateMsg.email = x.email
+            this.updateMsg.email = x.email
+            this.saveMsg = x.signingFile ? [{Path: x.signingFile,
+            URL: x.signingFile,
+            FileName: '签约附件'}] : []
+        this.updateMsg.SigningType = x.signingType ? true : false
+        console.log('updateMsg', x)
           } else {}
         }, err => {})
       },

src/components/SalesModule/customerApprovalFor.vue

@@ -622,7 +622,7 @@
         <th width="20%">{{ $t("salesModule.Stores") }}</th>
         <th width="10%">{{ $t("hotel.suplier_contact") }}</th>
         <th width="15%">{{ $t("hotel.table_tel") }}</th>
-        <th width="15%">{{ $t("salesModule.SaveTime") }}</th>
+        <!-- <th width="15%">{{ $t("salesModule.SaveTime") }}</th> -->
         <th width="15%" v-if="type != 1">到期时间</th>
         <th width="15%" v-if="type != 1">签约金额</th>
         <th width="10%">{{ $t("salesModule.Laiyuan") }}</th>
@@ -641,7 +641,7 @@
           {{ item.contact }}
         </td>
         <td>{{ item.contactNumber }}</td>
-        <td>{{ item.expectVisitDateTime }}</td>
+        <!-- <td>{{ item.expectVisitDateTime }}</td> -->
         <td v-if="type != 1">{{ item.signingEndTime }}</td>
         <td v-if="type != 1">{{ item.signingPrice }}</td>
         <td>{{ item.emName }}</td>

src/components/SalesModule/signedFinance.vue

@@ -882,12 +882,12 @@ input[type="number"] {
                     placeholder=''></el-date-picker>
         </span>
       </li>
-      <li>
+      <li v-show="type==1">
         <span style="display: block;padding: 10px">
           <em>状态：</em>
                   <el-select type="daterange" v-model="msg.IsSelectAduiting"
                     placeholder=''>
-                    <el-option :key="0" label="查看全部" :value="0">
+                    <el-option :key="0" label="全部" :value="0">
                   </el-option>
                     <el-option :key="1" label="已提交审核" :value="1">
                   </el-option>
@@ -1379,6 +1379,7 @@ import myGZBill from "../FinancialModule/FinancialSubmodule/GZBillModule.vue";
       this.yfcheckList = [];
     },
       clickGetList(type) {
+        this.msg.IsSelectAduiting = 0
         this.msg.pageIndex = 1
         this.currentPage = 1
         this.msg.FinanceStatus = type

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -362,7 +362,7 @@
           </li>
           <li>
             <button class="hollowFixedBtn" @click="resetPageIndex(),getControlList()">{{$t('pub.searchBtn')}}</button>
-            <button class="hollowFixedBtn" @click='goToOpenTravel("TravelManager5")'>{{$t('sm.kaituan')}}</button>
+            <!-- <button class="hollowFixedBtn" @click='goToOpenTravel("TravelManager5")'>{{$t('sm.kaituan')}}</button> -->
           </li>
         </ul>
       </div>