Merge branch 'master' of http://119.23.210.103:3000/wy/mj_firm_former

src/views/demo/yangPin/yangPinShuJu/EntrustNumber.vue

@@ -42,7 +42,8 @@ export default {
       //填充数量的数组
       filledNum:[],
       yearA:'',
-      monthA:''
+      monthA:'',
+      monthB:''
 
 
       // //已收到要填充的数组
@@ -81,7 +82,8 @@ export default {
       this.monthA = ''
       this.yearA = this.NowTime1.split('-')[0]
       this.monthA = this.NowTime1.split('-')[1]
-      this.NowTime = this.yearA + '-' + this.monthA
+      this.monthB = Number(this.NowTime1.split('-')[1])>=10? Number(this.NowTime1.split('-')[1])+"":"0"+Number(this.NowTime1.split('-')[1])
+      this.NowTime = this.yearA + '-' + this.monthB
       // console.log('页面第一次进来显示时间',date.year,date.month)
       //进来获取当前时间 之后获取当前月份天数 传给
       // console.log('页面显示的时间',this.NowTime)  //2022-11

src/views/demo/yangPin/yangPinShuJu/MonthlyNumber.vue

@@ -39,6 +39,8 @@
       day:0,
       //填充数量的数组
       filledNum:[],
+      yearA:'',
+      monthA:''
     }
   },
   created(){
@@ -63,7 +65,7 @@
       this.yearA = ''
       this.monthA = ''
       this.yearA = this.NowTime1.split('-')[0]
-      this.monthA = this.NowTime1.split('-')[1]
+      this.monthA = Number(this.NowTime1.split('-')[1])>=10? Number(this.NowTime1.split('-')[1])+"":"0"+Number(this.NowTime1.split('-')[1])
       this.NowTime = this.yearA + '-' + this.monthA
       // console.log('页面第一次进来显示时间',date.year,date.month)
       //进来获取当前时间 之后获取当前月份天数 传给

src/views/demo/yangPin/yangPinShuJu/MonthlyStatus.vue

@@ -57,7 +57,7 @@ export default {
       this.yearA = ''
       this.monthA = ''
       this.yearA = this.NowTime1.split('-')[0]
-      this.monthA = this.NowTime1.split('-')[1]
+      this.monthA = Number(this.NowTime1.split('-')[1])>=10? Number(this.NowTime1.split('-')[1])+"":"0"+Number(this.NowTime1.split('-')[1])
       this.NowTime = this.yearA + '-' + this.monthA
       // console.log('页面第一次进来显示时间',date.year,date.month)
       //进来获取当前时间 之后获取当前月份天数 传给

src/views/platform/bpmn/bpmInstHis/listType/jiLiang.vue

@@ -132,7 +132,7 @@ export default {
           { prop: 'tYear', label: '年份', width: 58 },
           { prop: 'month', label: '月份', width: 58 },
           { prop: 'tDept', label: '部门', width: 80 },
-          { prop: 'procDefName', label: '表单名称' },
+          { prop: 'procDefName', label: '表单名称', width: 250 },
           { prop: 'facilityNumber', label: '编号', width: 180 },
           { prop: 'facility', label: '设备名称', width: 220, fieldType: 'slot', slotName: "facilitySlot" },
           { prop: 'facilityFactor', label: '校准机构', width: 220, fieldType: 'slot', slotName: "facilityFactor" },