menc 2 лет назад
Родитель
Сommit
a3587d91a9

+ 1 - 7
base/httputil.js

@@ -1,11 +1,5 @@
 // let BASE_Server = "http://127.0.0.1:8329"
-
-
-
-
-
-
-  //let BASE_Server = "https://192.168.1.100:18080"
+  // let BASE_Server = "https://192.168.1.100:18080"
 let BASE_Server = "https://sookajs.top:18080"
 
 let app = getApp()

+ 1 - 1
pages/xqzggzs/xqzggzs.wxml

@@ -14,7 +14,7 @@
   </view>
   <view class="flex_row mar_top2">检查人员:<input type="text" style="width: 190rpx;" /><text>编号:</text><input type="text" style="width: 190rpx;" /></view>
   <view class="flex_row mar_top2"><text style="opacity: 0;">检查人员:</text><input type="text" style="width: 190rpx;" />编号:<input type="text" style="width: 190rpx;" /></view>
-  <view class="flex_row mar_top2" style="text-align: right;"><input type="text" style="width: 370rpx;" />部门(印章)</view>
+  <view class="flex_row mar_top2" style="text-align: right;"><input type="text" style="width: 370rpx;" />部门</view>
   <!-- <view class="flex_row mar_top2" style="text-align: right;"><input type="number" style="width: 100rpx;" />年<input type="number" style="width: 100rpx;" />月<input type="number" style="width: 100rpx;" />日</view> -->
   <view class="flex_row mar_top2" style="text-align: right;"><text type="text" style="width: 340rpx;" />{{time}}</view>
 

+ 55 - 15
pages/xqzggzs2/xqzggzs2.js

@@ -143,10 +143,49 @@ Page({
     })
   },
   submitXqzggzs2(){
+    if(this.data.company==null){
+      wx.showToast({
+        title: '请输入组织名称',
+        icon:'none'
+      })
+      return
+    }
+    
+    if(this.data.number==null){
+      wx.showToast({
+        title: '请输入检查人员编号',
+        icon:'none'
+      })
+      return
+    }
+    
+    if(this.data.qianming==null){
+      wx.showToast({
+        title: '请监督人员签名',
+        icon:'none'
+      })
+      return
+    }
+    
+    if(this.data.number1==null){
+      wx.showToast({
+        title: '请输入监督人员编号',
+        icon:'none'
+      })
+      return
+    }
+    
+    if(this.data.qianming1==null){
+      wx.showToast({
+        title: '请被复查单位负责人签名',
+        icon:'none'
+      })
+      return
+    }
     if(this.data.pageData!=null&&this.data.pageData.riskInspections!=null){
       let array=this.data.pageData.riskInspections;
       let listdata;
-      debugger
+      
         for(var i=0;i<array.length;i++){
           this.setData({
             [`submitdata[${i}].itemId `]: array[i].busItemsId,
@@ -156,20 +195,21 @@ Page({
         console.log("TAG",this.data.submitdata)
     }
     // http.post("/system/AppXunjianController/submitXqzggzs2",null,this.submitXqzggzs2Success)
-    var data={
-      logId:this.data.logId,
-      enterpriseId:this.data.busEnterpriseId,
-      enterpriseName:"",
-      lastTime:this.data.pageData.latTime,
-      askCom:this.data.company,
-      checker1Sign:this.data.pageData.nickName,
-      checker1Code:this.data.number,
-      checker2Sign:this.data.qianming,
-      checker2Code:this.data.number1,
-      becheckerSign:this.data.qianming1,
-      checkTime:this.data.time,
-      tzs_items:this.data.submitdata,
-    }
+    var data={};
+    var xqzgtzs={};
+    // var tzs_items=[];   
+    data["xqzgtzs"]=xqzgtzs
+    data["tzs_items"]=this.data.submitdata
+    xqzgtzs["logId"]=this.data.logId,
+    xqzgtzs["enterpriseId"]=this.data.busEnterpriseId,
+    xqzgtzs["lastTime"]=new Date(this.data.pageData.latTime.replace("年","-").replace("月","-").replace("日","")),
+    xqzgtzs["askCom"]=this.data.company,
+    xqzgtzs["checker1Sign"]=this.data.pageData.nickName,
+    xqzgtzs["checker1Code"]=this.data.number,
+    xqzgtzs["checker2Sign"]=this.data.qianming,
+    xqzgtzs["checker2Code"]=this.data.number1,
+    xqzgtzs["becheckerSign"]=this.data.qianming1,
+    xqzgtzs["checkTime"]=new Date()
     http.send_post("/system/AppXunjianController/saveZGTZS",data,this.submitXqzggzs2Success)
   },
   submitXqzggzs2Success(e){

+ 1 - 1
pages/xqzggzs2/xqzggzs2.wxml

@@ -18,7 +18,7 @@
   <view class="flex_row mar_top2 txt_vi" bindtap="bindQianming1"><text>被复查单位负责人(签名):</text>
     <image wx:if="{{qianming1 != undefined && qianming1 != null}}" src="{{qianming1}}" class="qm_img"></image>
   </view>
-  <view class="flex_row mar_top2" style="text-align: right;"><text type="text" style="width: 340rpx;" />部门:{{pageData.deptName}}(印章)</view>
+  <view class="flex_row mar_top2" style="text-align: right;"><text type="text" style="width: 340rpx;" />部门:{{pageData.deptName}}</view>
   <view class="flex_row mar_top2" style="text-align: right;"><text type="text" style="width: 340rpx;" />{{time}}</view>
 
   <!-- <view class="flex_row mar_top2" style="text-align: right;"><text type="number" style="width: 100rpx;" />{{year}}年<text type="number" style="width: 100rpx;"/>{{month}}月<text type="number" style="width: 100rpx;"/>{{day}}日</view> -->

+ 1 - 1
pages/xuncha/xuncha.wxml

@@ -51,7 +51,7 @@
         <text class="time-text">{{item.nickName}}</text>
         <text class="time-text">{{item.createTime}}</text>
       </view>
-      <view class="line2"></view>
+      <!-- <view class="line2"></view> -->
     </view>
     <!--bindmenuItemClick为按钮点击的时候的回调方法  mainmodel是显示的按钮,menulist为折叠的菜单的数组数据-->
     <menu bindmenuItemClick="menuItemClick" mainmodel="{{mainmodel}}" menulist="{{menulist}}"></menu>

+ 7 - 1
pages/xunjianmore/xunjianmore.js

@@ -13,11 +13,17 @@ Page({
     buslogid: null,
     mapdata : null,
     pictureBasePath : null,
-    hiddenName:true
+    hiddenName:true,
+    isShowFuChaGaoZhiShu:true,
   },
   onLoad(e) {
     this.initData(e)
   },
+  onShow(){
+    this.setData({
+      isShowFuChaGaoZhiShu:true
+    })
+  },
   initData(e){
      let buslogid = e.buslogid
      this.data.buslogid = buslogid

+ 10 - 5
pages/xunjianmore/xunjianmore.wxml

@@ -21,11 +21,16 @@
       </view>
     </view>
     <!-- 巡检悬浮按钮 -->
-    <view class="float_btn iconfont icon-wenjianjia" bindtap="shghnn"></view>
-    <view class="tab_nav" hidden="{{hiddenName}}">
-      <text mode="heightFix">隐患限期整改告知书</text>
-      <text mode="heightFix">复查意见告知书</text>
-      <i class="iconfont icon-zengjiashuzi" bindtap="bindViewXqZgGzS"></i>
+    <view class="float_btn iconfont icon-wenjianjia" bindtap="shghnn">
+      <view class="tab_nav" hidden="{{hiddenName}}">
+        <text mode="heightFix" >隐患限期整改告知书</text>
+        <view class="tab_nav" hidden="{{!isShowFuChaGaoZhiShu}}">
+        <text mode="heightFix">复查意见告知书</text>
+        </view>
+        <view class="tab_nav" hidden="{{isShowFuChaGaoZhiShu}}">
+          <i class="iconfont icon-zengjiashuzi" bindtap="bindViewXqZgGzS"></i>
+        </view>
     </view>
   </view>
+</view>
 </view>