safecheck-client 3.0.35-6 → 3.0.35-60

package/src/filiale/weinan/android/SafecheckUserInfo.vue

@@ -174,6 +174,20 @@
             <input type="radio" name="isuseed" v-model="f_usegas" id="nousegas" style="transform: scale(1.5);" value="封堵">&ensp;封堵
           </div>
         </div>
+        <div class="form-group col-sm-12 col-xs-12" :class="style__" v-show="f_entry_status=='到访不遇'" style="margin-top: 6px">
+          <span class="col-md-3 col-sm-4 col-xs-3  text-left"><img src="../../../assets/enterstatus.png" style="width: 20px;margin-bottom: 5px;text-align: left" alt="">到访状态:</span>
+          <div v-if="userinfo.f_check_type=='民用'" :class="style__" class="col-md-9 col-sm-8 col-xs-8">
+            <input type="radio" name="daofang_status" v-model="f_daofang_status" id="f_daofang_status" style="transform: scale(1.5);" value="长期无人">&ensp;长期无人
+            <input type="radio" name="daofang_status" v-model="f_daofang_status" id="f_daofang_status" style="transform: scale(1.5);" value="尚未装修">&ensp;尚未装修
+            <p></p>
+            <input type="radio" name="daofang_status" v-model="f_daofang_status" id="f_daofang_status" style="transform: scale(1.5);" value="无法联系">&ensp;无法联系
+            <input type="radio" name="daofang_status" v-model="f_daofang_status" id="f_daofang_status" style="transform: scale(1.5);" value="首访不遇">&ensp;首访不遇
+          </div>
+          <div v-show="userinfo.f_check_type=='非民用'" :class="style__" class="col-md-9 col-sm-8 col-xs-8">
+            <input type="radio" name="daofang_status" v-model="f_daofang_status" id="f_daofang_status" style="transform: scale(1.5);" value="首访不遇">&ensp;首访不遇&ensp;
+            <input type="radio" name="daofang_status" v-model="f_daofang_status" id="f_daofang_status" style="transform: scale(1.5);" value="暂停营业">&ensp;暂停营业
+          </div>
+        </div>
 <!--        <div :class="style__" class="form-group" v-show="f_usegas == '未使用'">-->
 <!--          <sapn class="text-left col-md-12 col-sm-12 col-xs-12">处置方式：</sapn>-->
 <!--          <div class="col-xs-12 col-sm-12 col-md-12">-->

package/src/filiale/weinan/pc/NewCheckpaper.vue

@@ -290,6 +290,26 @@ div {
               </tr>
               </tbody>
             </table>
+            <table class="table table-striped table-bordered" v-show="item.f_select_record_path && isRecodrDownloadBtn">
+              <thead>
+              <tr>
+                <th style="text-align: center">录音文件</th>
+              </tr>
+              </thead>
+              <tbody>
+              <tr>
+                <td style="margin: auto;text-align: center">
+                  <div class="container" style="max-width: 500px; background: #FFFFFF;margin-bottom: 20px">
+                    <div id='item.id' ref="dp" style="height: 10vh; width:20vw ;margin-bottom:50px"></div>
+                  </div>
+                  <a class="button_spacing button_search-1" :download="item.f_user_name+'-'+item.f_check_type+'-'+'录音文件.arm'"
+                     :href="'rs/image/file/'+item.f_select_record_path" >录音下载</a>
+<!--                  <button class="button_spacing button_search-1" type="button" @click="getbaseYin()">播放录音</button>-->
+<!--                  <button class="button_spacing button_search-1" type="button" @click="stop()">停止播放</button>-->
+                </td>
+              </tr>
+              </tbody>
+            </table>
           </div>
         </div>
         <div class style="width: 1%;height: 100%;background-color: #F1F8FF;float: left;"></div>

package/src/filiale/weinan/pc/PaperList.vue

@@ -210,6 +210,17 @@
                           :search="false"
                           close-on-select clear-button></v-select>
               </div>
+              <div class="form-group col-sm-2"   v-show="$parent.$parent.criteriaShow && model.f_entry == '到访不遇'">
+                <label class="font_normal_body">到访状态</label>
+                <v-select
+                  class="select select_list"
+                  :value.sync="model.f_daofang_status"
+                  v-model="model.f_daofang_status"
+                  :options='$parent.$parent.daofang_status'
+                  placeholder='请选择'
+                  condition="f_daofang_status = '{}'"
+                  close-on-select clear-button></v-select>
+              </div>
             </div>
             <modal :show.sync="$parent.$parent.showModal" v-ref:modal backdrop="false">
               <div slot="modal-header" class="modal-header">
@@ -391,11 +402,13 @@
           'f_entry_status': '安检状态',
           'f_offsite_time': '安检时间',
           'f_no_checkplan': '有无计划',
-          'f_checker_name': '安检员'
+          'f_checker_name': '安检员',
+          'f_daofang_status': '到访不遇状态'
         },
         fun: this.$login.f,
         pcds:[],
         checkersid: [],
+        daofang_status:this.$appdata.getParam('到访不遇状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('到访不遇状态')]:[{label: '全部', value: ''}],
         safetype: this.$appdata.getParam('安检类型')?[{label: '全部', value: ''}, ...this.$appdata.getParam('安检类型')]:[{label: '全部', value: ''}],
         criteriaShow: false,
         showModal: false,

package/src/filiale/xilan/android/CurrentCreate.vue

@@ -104,16 +104,6 @@
                         close-on-select clear-button>
               </v-select>
             </div>
-            <div class="row app-row">
-              <div class="col-xs-4">
-                <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
-                <label for="f_userinfo_code" style="padding: 0" class="font text-left">旧用户编号：</label>
-              </div>
-              <div class="col-xs-8" >
-                <input id="f_userinfo_code" class="search_input input-font"
-                       v-model=model.f_olduserinfo_code condition="f_olduserinfo_code = '{}'" />
-              </div>
-            </div>
             <div class="row app-row">
               <div class="col-xs-4">
                 <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
@@ -276,10 +266,6 @@
                     <input type="checkbox" @click="$parent.$parent.$parent.setPlanParam(row.id, $event)"/>
                   </p>
                 </div>
-                <div class="col-xs-12">
-                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>旧用户编号:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font" style="width: 79%">{{ row.f_olduserinfo_code }}</p>
-                </div>
                 <div class="col-xs-12">
                   <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户名称:</b></p>
                   <p class="panel-title col-xs-7 text-left input-font" style="width: 79%">{{ row.f_user_name }}</p>

package/src/filiale/xilan/android.js

@@ -1,11 +1,10 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-// 手机特殊目录注册到该文件中
-let specialComp = {
-  'add-plan-item': (resolve) => { require(['./android/AddPlanItem'], resolve) },
-  'current-create': (resolve) => { require(['./android/CurrentCreate'], resolve) }
-}
-
-exports.specialComp = specialComp
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+// 手机特殊目录注册到该文件中
+let specialComp = {
+  'current-create': (resolve) => { require(['./android/CurrentCreate'], resolve) }
+}
+
+exports.specialComp = specialComp
+