no message

CallCenterWeb.UI/RMYY/src/components/workOrder/repairbase/addRepairbase.vue

@@ -99,7 +99,7 @@
                 v-model="ruleForm.repairCenter"
                 :autosize="{ minRows: 4, maxRows: 8 }"
                 show-word-limit
-                maxlength="100"
+                maxlength="200"
                 type="textarea"
                 placeholder="请详细描述具体故障内容"
               />

CallCenterWeb.UI/RMYY/src/views/faultRepair/clinicalReporting/components/addRepairbase.vue

@@ -71,7 +71,7 @@
                 v-model="ruleForm.repairCenter"
                 :autosize="{ minRows: 4, maxRows: 8 }"
                 show-word-limit
-                maxlength="100"
+                maxlength="200"
                 type="textarea"
                 placeholder="请输入报修内容"
               />

CallCenterWeb.UI/RMYY/src/views/faultRepairManagement/addRepairbase/index.vue

@@ -86,7 +86,7 @@
                 v-model="ruleForm.repairCenter"
                 :autosize="{ minRows: 4, maxRows: 8 }"
                 show-word-limit
-                maxlength="100"
+                maxlength="200"
                 type="textarea"
                 placeholder="请详细描述具体故障内容"
               />

CallCenterWeb.UI/RMYY/src/views/orderManage/mySubmit/repairEdit.vue

@@ -49,7 +49,7 @@
                 v-model="ruleForm.repairCenter"
                 :autosize="{ minRows: 4, maxRows: 8 }"
                 show-word-limit
-                maxlength="100"
+                maxlength="200"
                 type="textarea"
                 placeholder="请输入报修内容"
               />

CallCenterWeb.UI/RMYY/src/views/performance/cpns/js/reportListCommon.js

@@ -14,7 +14,7 @@ export default {
       columnMergeData: {
         1: {
           1: 8,
-          2: 9
+          2: 7
         },
         2: {
           1: 8,
@@ -91,8 +91,6 @@ export default {
       })
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-      console.log(this.listType, columnIndex)
-
       if (columnIndex === this.columnMergeData[this.params.label][this.listType]) {
         const _row = this.spanArr[rowIndex]
         const _col = _row > 0 ? 1 : 0

CallCenterWeb.UI/RMYY/src/views/performance/cpns/reportCommon.vue

@@ -79,7 +79,21 @@ export default {
     }
   },
   mounted() {
-    this.dataValue = getNowDate().split('-')[0] + '-' + getNowDate().split('-')[1]
+    const date = new Date()
+    let y = date.getFullYear()
+    let m = date.getMonth()
+    if (m === 0) {
+      y -= 1
+      m = 12
+    }
+	m = m < 10 ? `0${m}` : m;
+
+    // if (this.labelIndex === 1) {
+    this.dataValue = `${y}-${m}`
+    // } else {
+    //   this.dataValue = getNowDate().split('-')[0] + '-' + getNowDate().split('-')[1]
+    // }
+
     if (this.labelIndex) {
       this.ruleForm.label = this.labelIndex
     }

CallCenterWeb.UI/RMYY/src/views/performance/cpns/reportSpecimen.vue

@@ -92,11 +92,13 @@
 
       </el-table-column>
 
-      <el-table-column prop="F_OtherBBAmount" label="其它标本" align="center" min-width />
-      <el-table-column prop="F_OtherBBCount" label="体检标本" align="center" min-width />
+      <el-table-column :prop="listType ==='1' ?'F_OtherBBCount':'F_OtherBBAmount' " label="其它标本" align="center" min-width />
+      <el-table-column :prop="listType ==='1' ?'F_BBCount':'F_BBAmount'" label="体检标本" align="center" min-width />
+
       <!-- <el-table-column v-if="listType ==='2'" :key="Math.random()*10000" :prop="listType ==='1' ?'F_BBCount':'F_BBAmount'" label="标本总量" align="center" min-width /> -->
 
       <el-table-column v-if="listType ==='2'" :key="Math.random()*10000" prop="F_IndividualAmount" label="个人合计金额" align="center" min-width />
+
       <el-table-column prop="F_Amount" label="录入总金额" align="center" min-width >
         <template slot-scope="scope">
           <template v-if="listType ==='1'">

CallCenterWeb.UI/RMYY/src/views/performance/cpns/reportSpecimenRegister.vue

@@ -2,7 +2,7 @@
   <div>
     <el-row :gutter="20" />
     <el-table :data="dataLists" :cell-class-name="tableCellClassName" border @cell-click="tableCellFn">
-      <el-table-column label="员工姓名" align="center" width="170px">
+      <el-table-column fixed label="员工姓名" align="center" width="170px">
         <template slot-scope="scope">
           <div>
             <span>{{ scope.row.username }}</span>

CallCenterWeb.UI/RMYY/src/views/performance/specimenRegister/index.vue

@@ -11,7 +11,7 @@
       </el-form-item>
       <el-form-item>
         <el-button v-show="btnPermission" type="primary" size="medium" @click="btn_search_task">查询</el-button>
-        <el-button v-show="btnPermission" type="primary" size="medium" @click="btn_add">添加</el-button>
+        <!-- <el-button v-show="btnPermission" type="primary" size="medium" @click="btn_add">添加</el-button> -->
         <el-button
           type="primary"
           size="medium"
@@ -32,7 +32,7 @@ export default {
   data() {
     return {
       btnPermission: false,
-      dataValue: '2023-11',
+      dataValue: '',
       ruleForm: {
         sdate: ''
       }
@@ -44,6 +44,13 @@ export default {
     }
     this.btn_search_task()
   },
+  created (){
+	const date = new Date()
+    let y = date.getFullYear()
+    let m = date.getMonth() + 1 < 10 ? `0${date.getMonth() + 1}` : date.getMonth() + 1; 
+
+	this.dataValue = `${y}-${m}`
+  },
   methods: {
     btn_add() {
       this.$prompt('请输入数量', '提示', {

CallCenterWeb.UI/RMYY/src/views/systemSetup/roleSetting/userManage/index.vue

@@ -85,7 +85,7 @@
                       scope.row.F_UserCode.toString()
                     )
                   ">编辑</el-button>
-                <el-button v-show="logincode=='8000'" @click="btn_resetpwd(scope.row.F_UserCode)">重置密码</el-button>
+                <el-button v-show=" roleCode =='GLY' || roleCode =='ZGLY' || roleCode =='DDZX' " @click="btn_resetpwd(scope.row.F_UserCode)">重置密码</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -180,6 +180,7 @@ export default {
     }
     return {
       logincode: localStorage.getItem('storageUsercode'),
+      roleCode: localStorage.getItem('roleCode'),
       rules: {
         confirmpas: [{
           required: true,

CallCenterWeb.UI/RMYYAPP/manifest.json

@@ -2,7 +2,7 @@
     "name" : "郑州人民医院综合服务保障调度平台",
     "appid" : "__UNI__5A5207D",
     "description" : "",
-    "versionName" : "1.2.82",
+    "versionName" : "1.2.83",
     "versionCode" : 180,
     "transformPx" : false,
     /* 5+App特有相关 */

CallCenterWeb.UI/RMYYAPP/pages.json

@@ -26,6 +26,14 @@
                 "background": "transparent"
             }
         },
+		{
+		    "path": "pages/deBug/deBug",
+		    "style": {
+		        "navigationBarTitleText": "调试输出窗口",
+		        "disableScroll": true,
+		        "background": "transparent"
+		    }
+		},
         {
             "path": "pages/login/login",
             "style": {

CallCenterWeb.UI/RMYYAPP/pages/deBug/deBug.vue

@@ -0,0 +1,21 @@
+<template>
+	<div>
+		deBug
+	</div>
+</template>
+
+<script> 
+	import VConsole from 'vconsole'
+	export default {
+		data() {
+			return { 
+			}
+		},
+		onLoad(optioin) { 
+			const vConsole = new VConsole() 
+		}, 
+	}
+</script>
+
+<style>
+</style>

CallCenterWeb.UI/RMYYAPP/pages/index/index.vue

@@ -3,7 +3,7 @@
 		<view></view>
 		<view class="header">
 			<view>
-				<image src="/static/login-icon.png"></image>
+				<image @click="logShow" src="/static/login-icon.png"></image>
 			</view>
 			<view style="margin-top: 40px;">郑州人民医院综合服务保障调度平台</view>
 		</view>
@@ -13,6 +13,7 @@
 <script> 
 	import { getCode } from '@/utils/dd'
 	import { getToken } from '@/utils/auth'
+	import VConsole from 'vconsole'
 	export default {
 		data() {
 			return {
@@ -130,6 +131,27 @@
 					}
 				})
 			},
+			
+			logShow(){
+				if(this.logShow.index){
+					this.logShow.index += 1;
+				}else{
+					this.logShow.index = 1;
+				}
+				
+				clearTimeout(this.logShow.timeOut)
+				
+				this.logShow.timeOut = setTimeout(()=>{
+					this.logShow.index = 0; 
+					console.log(this.logShow.index)
+				},1000)
+				
+				console.log(this.logShow.index)	
+				
+				if(this.logShow.index >= 5){
+					const vConsole = new VConsole() 
+				}
+			}
 		},
 	}
 </script>

CallCenterWeb.UI/RMYYAPP/pages/login/login.vue

@@ -3,7 +3,7 @@
 		<view class="content">
 			<!-- 头部logo -->
 			<view class="header">
-				<image :src="logoImage"></image>
+				<image @click="logShow" :src="logoImage"></image>
 			</view>
 			<!-- 主体表单 -->
 			<view class="main">
@@ -20,6 +20,7 @@
 </template>
 
 <script>
+	import { debuggerModule, installDebugger } from 'uni_modules/imengyu-IMDebuggerWindow/common/debuggerExtern.js'
 	import wInput from '@/components/watch-login/watch-input.vue' //input
 	import wButton from '@/components/watch-login/watch-button.vue' //button
 	// import CryptoJS from '@/static/js/crypto-js/crypto-js.js'
@@ -235,6 +236,30 @@
 					uni.setStorageSync('deptTreeData', JSON.stringify(res))
 					uni.setStorageSync('deptAllList', JSON.stringify(data))
 				})
+			},
+			
+			logShow(){
+				if(this.logShow.index){
+					this.logShow.index += 1;
+				}else{
+					this.logShow.index = 1;
+				}
+				
+				clearTimeout(this.logShow.timeOut)
+				
+				this.logShow.timeOut = setTimeout(()=>{
+					this.logShow.index = 0; 
+					console.log(this.logShow.index)
+				},1000)
+				
+				console.log(this.logShow.index)	
+				
+				if(this.logShow.index >= 5){
+					installDebugger({
+						enableRequestInterceptor: true, //默认为false，指示是否拦截网络请求，参见下一条
+						showGlobalFloatWindow: true //默认为true，指定是否添加一个全局的调试按钮，点击可跳转至窗口
+					});
+				}
 			}
 
 		}

CallCenterWeb.UI/RMYYAPP/pages/myTask/repairList/addRepair/addRepair.vue

@@ -37,7 +37,7 @@
 					<uni-easyinput v-model="valiFormData.PlaceOfRepair" placeholder="请详细描述具体故障位置或者床号" />
 				</uni-forms-item>
 				<uni-forms-item label="报修内容" required name="Content">
-					<uni-easyinput type="textarea" v-model="valiFormData.Content" placeholder="请详细描述具体故障内容" />
+					<uni-easyinput :maxlength="200" type="textarea" v-model="valiFormData.Content" placeholder="请详细描述具体故障内容" />
 				</uni-forms-item>
 				<uni-forms-item label="紧急程度" name="EmergencyTypes">
 					<uni-data-checkbox v-model="valiFormData.EmergencyTypes" :localdata="EmergencyTypesList" />