productDev/dmvisit.git

liukangdong

2024-06-11 8db235ea53d0909dff13844dcb2aa258fe9e6f7c

''

已修改8个文件

	admin/src/views/business/approvalConfiguration.vue	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/views/business/approvalReport.vue	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/views/operation/danger/record.vue	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/views/operation/serviceCar/apprConfig.vue	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/views/operation/serviceCar/apprRecord.vue	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	h5/pages/staff/task/index.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	h5/pages/staff/task/visitorApprove.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	h5/pages/staff/task/visitorReport.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 admin/src/views/business/approvalConfiguration.vue

@@ -32,13 +32,13 @@
                <div class="content">
                  <div v-if="item.objIds && item.objIds.length === 1 ">
                    <span>{{ item.objIds[0].name }} {{ item.objIds[0].companyName }}</span>
                    <span v-if="item.approveType == 0"> 或签</span>
                    <span v-if="item.approveType == 1"> 会签</span>
                    <span v-if="item.approveType == 0 && item.type == '0'"> 或签</span>
                    <span v-if="item.approveType == 1 && item.type == '0'"> 会签</span>
                  </div>
                  <div v-else-if="item.objIds && item.objIds.length > 1">
                    <span>{{ item.objIds[0].name }} {{ item.objIds[0].companyName }}等</span>
                    <span v-if="item.approveType == 0"> 或签</span>
                    <span v-if="item.approveType == 1"> 会签</span>
                    <span>{{ item.objIds[0].name }} 等</span>
                    <span v-if="item.approveType == 0 && item.type == '0'"> 或签</span>
                    <span v-if="item.approveType == 1 && item.type == '0'"> 会签</span>
                  </div>
                  <div v-else>请选择</div>
                  <i class="el-icon-arrow-right"></i>
@@ -277,7 +277,7 @@
          item.active = true
          if (item.objIds && item.objIds.length > 0) {
            const objIds = item.objIds.map(i => {
              return i.id + '-' + i.name
              return `${i.id}-${i.name}${i.companyName ? '-' + i.companyName : ''}`
            })
            this.$set(this.searchForm, 'objIds', objIds)
          } else {
@@ -298,18 +298,19 @@
              item.objIds = item.memberList.map(i => {
                return {
                  id: i.id,
                  name: i.name
                  name: i.name,
                  companyName: i.companyName
                }
              })
            }
          })
          this.apprList = arr
          this.flowClick(0)
          this.$forceUpdate()
        }

        // console.log(res);
      })
      this.flowClick(0)
      this.$forceUpdate()
    },
    onSubmit () {
      const { apprList, activeType } = this

 admin/src/views/business/approvalReport.vue

@@ -28,13 +28,13 @@
                <div class="content">
                  <div v-if="item.objIds && item.objIds.length === 1 ">
                    <span>{{ item.objIds[0].name }} {{ item.objIds[0].companyName }}</span>
                    <span v-if="item.approveType == 0"> 或签</span>
                    <span v-if="item.approveType == 1"> 会签</span>
                    <span v-if="item.approveType == 0 && item.type == '0'"> 或签</span>
                    <span v-if="item.approveType == 1 && item.type == '0'"> 会签</span>
                  </div>
                  <div v-else-if="item.objIds && item.objIds.length > 1">
                    <span>{{ item.objIds[0].name }} {{ item.objIds[0].companyName }}等</span>
                    <span v-if="item.approveType == 0"> 或签</span>
                    <span v-if="item.approveType == 1"> 会签</span>
                    <span>{{ item.objIds[0].name }} 等</span>
                    <span v-if="item.approveType == 0 && item.type == '0'"> 或签</span>
                    <span v-if="item.approveType == 1 && item.type == '0'"> 会签</span>
                  </div>
                  <div v-else>请选择</div>
                  <i class="el-icon-arrow-right"></i>
@@ -264,7 +264,7 @@
          item.active = true
          if (item.objIds && item.objIds.length > 0) {
            const objIds = item.objIds.map(i => {
              return i.id + '-' + i.name
              return `${i.id}-${i.name}${i.companyName ? '-' + i.companyName : ''}`
            })
            this.$set(this.searchForm, 'objIds', objIds)
          } else {
@@ -285,18 +285,19 @@
              item.objIds = item.memberList.map(i => {
                return {
                  id: i.id,
                  name: i.name
                  name: i.name,
                  companyName: i.companyName
                }
              })
            }
          })
          this.apprList = arr
          this.flowClick(0)
          this.$forceUpdate()
        }

        // console.log(res);
      })
      this.flowClick(0)
      this.$forceUpdate()
    },
    onSubmit () {
      const { apprList, activeType } = this

 admin/src/views/operation/danger/record.vue

@@ -125,7 +125,8 @@
        queryEndTime: '',
        areaId: null,
        cateId: null,
        status:null
        status: null,
        radio: 0
      },
      cateList: [],
      areaList: [],

 admin/src/views/operation/serviceCar/apprConfig.vue

@@ -32,13 +32,13 @@
                <div class="content">
                  <div v-if="item.objIds && item.objIds.length === 1 ">
                    <span>{{ item.objIds[0].name }} {{ item.objIds[0].companyName }}</span>
                    <span v-if="item.approveType == 0"> 或签</span>
                    <span v-if="item.approveType == 1"> 会签</span>
                    <span v-if="item.approveType == 0 && item.type == '0'"> 或签</span>
                    <span v-if="item.approveType == 1 && item.type == '0'"> 会签</span>
                  </div>
                  <div v-else-if="item.objIds && item.objIds.length > 1">
                    <span>{{ item.objIds[0].name }} {{ item.objIds[0].companyName }}等</span>
                    <span v-if="item.approveType == 0"> 或签</span>
                    <span v-if="item.approveType == 1"> 会签</span>
                    <span>{{ item.objIds[0].name }} 等</span>
                    <span v-if="item.approveType == 0 && item.type == '0'"> 或签</span>
                    <span v-if="item.approveType == 1 && item.type == '0'"> 会签</span>
                  </div>
                  <div v-else>请选择</div>
                  <i class="el-icon-arrow-right"></i>
@@ -286,7 +286,7 @@
          item.active = true
          if (item.objIds && item.objIds.length > 0) {
            const objIds = item.objIds.map(i => {
              return i.id + '-' + i.name
              return `${i.id}-${i.name}${i.companyName ? '-' + i.companyName : ''}`
            })
            this.$set(this.searchForm, 'objIds', objIds)
          } else {
@@ -307,18 +307,19 @@
              item.objIds = item.memberList.map(i => {
                return {
                  id: i.id,
                  name: i.name
                  name: i.name,
                  companyName: i.companyName
                }
              })
            }
          })
          this.apprList = arr
          this.flowClick(0)
          this.$forceUpdate()
        }

        // console.log(res);
      })
      this.flowClick(0)
      this.$forceUpdate()
    },
    onSubmit () {
      const { apprList, activeType } = this

 admin/src/views/operation/serviceCar/apprRecord.vue

@@ -132,7 +132,8 @@
        queryStartTime: '',
        queryEndTime: '',
        type: null,
        status:null
        status: null,
        radio: 0
      },
      cateList: [],
      areaList: [],

 h5/pages/staff/task/index.vue

@@ -27,13 +27,13 @@
          @click="statusClick(1)"
          :class="{ active: search.queryType === 1 }"
          class="box_head_item"
          >已处理 {{ headData.noticeDealNum }}</view
          >已处理</view
        >
        <view
          @click="statusClick(2)"
          :class="{ active: search.queryType === 2 }"
          class="box_head_item"
          >我发起的 {{ headData.noticeCreateNum }}</view
          >我发起的</view
        >
        <view
          @click="statusClick(3)"

 h5/pages/staff/task/visitorApprove.vue

@@ -138,7 +138,7 @@
      </view>
    </view>
    <view class="emyty"></view>
    <view class="main_footer">
    <view v-if="info.approveDateVO!=null&& info.approveDateVO.canBeApproved!=null && info.approveDateVO.canBeApproved ==1" class="main_footer">
      <view class="btn" @click="handleSub(3)">拒绝</view>
      <view class="btn agree" @click="handleSub(2)">同意</view>
    </view>

 h5/pages/staff/task/visitorReport.vue

@@ -131,7 +131,7 @@
      </view>
    </view>
    <view class="emyty"></view>
    <view class="main_footer">
    <view v-if="info.approveDateVO!=null&& info.approveDateVO.canBeApproved!=null && info.approveDateVO.canBeApproved ==1" class="main_footer">
      <view class="btn" @click="handleSub(3)">拒绝</view>
      <view class="btn agree" @click="handleSub(2)">同意</view>
    </view>

			@@ -32,13 +32,13 @@
			<div class="content">
			<div v-if="item.objIds && item.objIds.length === 1 ">
			<span>{{ item.objIds[0].name }} {{ item.objIds[0].companyName }}</span>
			<span v-if="item.approveType == 0"> 或签</span>
			<span v-if="item.approveType == 1"> 会签</span>
			<span v-if="item.approveType == 0 && item.type == '0'"> 或签</span>
			<span v-if="item.approveType == 1 && item.type == '0'"> 会签</span>
			</div>
			<div v-else-if="item.objIds && item.objIds.length > 1">
			<span>{{ item.objIds[0].name }} {{ item.objIds[0].companyName }}等</span>
			<span v-if="item.approveType == 0"> 或签</span>
			<span v-if="item.approveType == 1"> 会签</span>
			<span>{{ item.objIds[0].name }} 等</span>
			<span v-if="item.approveType == 0 && item.type == '0'"> 或签</span>
			<span v-if="item.approveType == 1 && item.type == '0'"> 会签</span>
			</div>
			<div v-else>请选择</div>
			<i class="el-icon-arrow-right"></i>
			@@ -277,7 +277,7 @@
			item.active = true
			if (item.objIds && item.objIds.length > 0) {
			const objIds = item.objIds.map(i => {
			return i.id + '-' + i.name
			return `${i.id}-${i.name}${i.companyName ? '-' + i.companyName : ''}`
			})
			this.$set(this.searchForm, 'objIds', objIds)
			} else {
			@@ -298,18 +298,19 @@
			item.objIds = item.memberList.map(i => {
			return {
			id: i.id,
			name: i.name
			name: i.name,
			companyName: i.companyName
			}
			})
			}
			})
			this.apprList = arr
			this.flowClick(0)
			this.$forceUpdate()
			}

			// console.log(res);
			})
			this.flowClick(0)
			this.$forceUpdate()
			},
			onSubmit () {
			const { apprList, activeType } = this

			@@ -28,13 +28,13 @@
			<div class="content">
			<div v-if="item.objIds && item.objIds.length === 1 ">
			<span>{{ item.objIds[0].name }} {{ item.objIds[0].companyName }}</span>
			<span v-if="item.approveType == 0"> 或签</span>
			<span v-if="item.approveType == 1"> 会签</span>
			<span v-if="item.approveType == 0 && item.type == '0'"> 或签</span>
			<span v-if="item.approveType == 1 && item.type == '0'"> 会签</span>
			</div>
			<div v-else-if="item.objIds && item.objIds.length > 1">
			<span>{{ item.objIds[0].name }} {{ item.objIds[0].companyName }}等</span>
			<span v-if="item.approveType == 0"> 或签</span>
			<span v-if="item.approveType == 1"> 会签</span>
			<span>{{ item.objIds[0].name }} 等</span>
			<span v-if="item.approveType == 0 && item.type == '0'"> 或签</span>
			<span v-if="item.approveType == 1 && item.type == '0'"> 会签</span>
			</div>
			<div v-else>请选择</div>
			<i class="el-icon-arrow-right"></i>
			@@ -264,7 +264,7 @@
			item.active = true
			if (item.objIds && item.objIds.length > 0) {
			const objIds = item.objIds.map(i => {
			return i.id + '-' + i.name
			return `${i.id}-${i.name}${i.companyName ? '-' + i.companyName : ''}`
			})
			this.$set(this.searchForm, 'objIds', objIds)
			} else {
			@@ -285,18 +285,19 @@
			item.objIds = item.memberList.map(i => {
			return {
			id: i.id,
			name: i.name
			name: i.name,
			companyName: i.companyName
			}
			})
			}
			})
			this.apprList = arr
			this.flowClick(0)
			this.$forceUpdate()
			}

			// console.log(res);
			})
			this.flowClick(0)
			this.$forceUpdate()
			},
			onSubmit () {
			const { apprList, activeType } = this

			@@ -125,7 +125,8 @@
			queryEndTime: '',
			areaId: null,
			cateId: null,
			status:null
			status: null,
			radio: 0
			},
			cateList: [],
			areaList: [],

			@@ -132,7 +132,8 @@
			queryStartTime: '',
			queryEndTime: '',
			type: null,
			status:null
			status: null,
			radio: 0
			},
			cateList: [],
			areaList: [],

			@@ -27,13 +27,13 @@
			@click="statusClick(1)"
			:class="{ active: search.queryType === 1 }"
			class="box_head_item"
			>已处理 {{ headData.noticeDealNum }}</view
			>已处理</view
			>
			<view
			@click="statusClick(2)"
			:class="{ active: search.queryType === 2 }"
			class="box_head_item"
			>我发起的 {{ headData.noticeCreateNum }}</view
			>我发起的</view
			>
			<view
			@click="statusClick(3)"

			@@ -138,7 +138,7 @@
			</view>
			</view>
			<view class="emyty"></view>
			<view class="main_footer">
			<view v-if="info.approveDateVO!=null&& info.approveDateVO.canBeApproved!=null && info.approveDateVO.canBeApproved ==1" class="main_footer">
			<view class="btn" @click="handleSub(3)">拒绝</view>
			<view class="btn agree" @click="handleSub(2)">同意</view>
			</view>

			@@ -131,7 +131,7 @@
			</view>
			</view>
			<view class="emyty"></view>
			<view class="main_footer">
			<view v-if="info.approveDateVO!=null&& info.approveDateVO.canBeApproved!=null && info.approveDateVO.canBeApproved ==1" class="main_footer">
			<view class="btn" @click="handleSub(3)">拒绝</view>
			<view class="btn agree" @click="handleSub(2)">同意</view>
			</view>