safecheck-client 3.0.32-12 → 3.0.32-13

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "safecheck-client",
   "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "3.0.32-12",
+  "version": "3.0.32-13",
   "description": "安检模块 前端组件",
   "author": "丁新 <417755458@qq.com>",
   "license": "ISC",

package/src/filiale/dexin/android/WebMeterOpen.vue

@@ -118,7 +118,7 @@
                 <input type="text"
                        class="search_input input-font"
                        v-model="model.f_floor"
-                       condition="f_userinfo_code like '%{}%'"
+                       condition="f_floor like '%{}%'"
                        placeholder="请输入楼层"/>
               </div>
             </div>

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

@@ -57,11 +57,11 @@ div {
       <div @click="back()">
         <img src="../../../assets/back.png" style="margin: 0px"/>
       </div>
-      <div @click="updateSpotCheck('合格')">
-        合格
+      <div>
+        <button type="button" class="btn btn-lg btn-font btn-color" style="width: 25%;" @click="updateSpotCheck('合格')">合格</button>
       </div>
-      <div @click="NoSpotCheck()">
-        不合格
+      <div @click="NoSpotCheck" style="color:black">
+        <button type="button" class="btn btn-lg btn-font btn-color" style="width: 25%;" @click="NoSpotCheck">不合格</button>
       </div>
     </div>
     <work-busy :is-busy="loading"></work-busy>
@@ -373,6 +373,7 @@ div {
     <article slot="modal-body" class="modal-body">
       <div class="from-group">
         <div class="row">
+          <lable>抽检不合格原因</lable>
           <textarea v-model="spotCheckMessage"></textarea>
         </div>
       </div>
@@ -588,7 +589,7 @@ export default {
     updateSpotCheck(value) {
       var reqData = {
         paperId:this.item.id,
-        userName: Vue.user.name,
+        userName: this.$login.f.name,
         spotCheckState: '已抽检',
         spotCheckResult: value,
         spotCheckMessage:this.spotCheckMessage