马宇豪
2025-01-03 020ecfe0ae4ce42c51712a38656fe87faa7cffce
修改数据上报
已修改4个文件
156 ■■■■■ 文件已修改
src/views/dataUpload/contractorManage/contractorEnter/components/addReport.vue 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dataUpload/contractorManage/contractorInfo/components/addReport.vue 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dataUpload/contractorManage/contractorUser/components/addReport.vue 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dataUpload/peopleLocate/components/addReport.vue 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dataUpload/contractorManage/contractorEnter/components/addReport.vue
@@ -13,8 +13,8 @@
          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-if="title == '新增上报'? false : true">
            <el-form-item label="删除状态" prop="deleted">
              <el-radio-group v-model="form.deleted">
                <el-radio label="0">未删除</el-radio>
                <el-radio label="1">已删除</el-radio>
                <el-radio :label="0">未删除</el-radio>
                <el-radio :label="1">已删除</el-radio>
              </el-radio-group>
            </el-form-item>
          </el-col>
@@ -48,7 +48,7 @@
    userName: string
    contractorId: string
    contractorName: string
    deleted: string
    deleted: number | null
  }
  rules:{}
  contractorList: []
@@ -69,7 +69,7 @@
        contractorName: '',
        userId: '',
        userName: '',
        deleted: '0'
        deleted: 0
      },
      rules:{
        userId: [{ required: true, message: '请选择人员', trigger: 'blur' }]
@@ -96,19 +96,25 @@
          contractorName: '',
          userId: '',
          userName: '',
          deleted: '0'
          deleted: 0
        }
      }else{
        state.title = '重新上报';
        state.form = {
          uuid: data.uuid,
          companyCode: '652310082',
          contractorId: '',
          contractorName: '',
          userId: '',
          userName: '',
          deleted: '0'
        }
        state.title = '重新上报'
        Object.keys(state.form).forEach(key => {
          if (Object.prototype.hasOwnProperty.call(data,key)) {
            state.form[key] = JSON.parse(JSON.stringify(data))[key];
          }
        })
        state.form.deleted = Number(data.deleted)
        // state.form = {
        //   uuid: data.uuid,
        //   companyCode: '652310082',
        //   contractorId: '',
        //   contractorName: '',
        //   userId: '',
        //   userName: '',
        //   deleted: '0'
        // }
      }
    };
src/views/dataUpload/contractorManage/contractorInfo/components/addReport.vue
@@ -45,8 +45,8 @@
          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-if="title == '新增上报'? false : true">
            <el-form-item label="删除状态" prop="deleted">
              <el-radio-group v-model="form.deleted">
                <el-radio label="0">未删除</el-radio>
                <el-radio label="1">已删除</el-radio>
                <el-radio :label="0">未删除</el-radio>
                <el-radio :label="1">已删除</el-radio>
              </el-radio-group>
            </el-form-item>
          </el-col>
@@ -80,7 +80,7 @@
    contractorPerson: string
    contractorState: null | number
    contractorType: string
    deleted: string
    deleted: null | number
    // createBy: string
    // updateBy: string
  }
@@ -102,7 +102,7 @@
        contractorPerson: '',
        contractorState: null,
        contractorType: '',
        deleted: '0'
        deleted: 0
      },
      rules:{
        contractorName: [{ required: true, message: '请填写承包商名称', trigger: 'blur' }],
@@ -130,20 +130,26 @@
          contractorPerson: '',
          contractorState: null,
          contractorType: '',
          deleted: '0'
          deleted: 0
        }
      }else{
        state.title = '重新上报';
        state.form = {
          uuid: data.uuid,
          companyCode: '652310082',
          contractorName: '',
          contractorNumber: '',
          contractorPerson: '',
          contractorState: null,
          contractorType: '',
          deleted: '0'
        }
        Object.keys(state.form).forEach(key => {
          if (Object.prototype.hasOwnProperty.call(data,key)) {
            state.form[key] = JSON.parse(JSON.stringify(data))[key];
          }
        })
        state.form.deleted = data.delFlag
        // state.form = {
        //   uuid: data.uuid,
        //   companyCode: '652310082',
        //   contractorName: '',
        //   contractorNumber: '',
        //   contractorPerson: '',
        //   contractorState: null,
        //   contractorType: '',
        //   deleted: '0'
        // }
      }
    };
src/views/dataUpload/contractorManage/contractorUser/components/addReport.vue
@@ -54,8 +54,8 @@
          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-if="title == '新增上报'? false : true">
            <el-form-item label="删除状态" prop="deleted">
              <el-radio-group v-model="form.deleted">
                <el-radio label="0">未删除</el-radio>
                <el-radio label="1">已删除</el-radio>
                <el-radio :label="0">未删除</el-radio>
                <el-radio :label="1">已删除</el-radio>
              </el-radio-group>
            </el-form-item>
          </el-col>
@@ -93,7 +93,7 @@
    sex: string
    userName: string
    userState: null | number
    deleted: string
    deleted: null | number
  }
  rules:{},
  contractorList: []
@@ -117,7 +117,7 @@
        sex: '',
        userName: '',
        userState: null,
        deleted: '0'
        deleted: 0
      },
      rules:{
        cardNumber: [{ required: true, message: '请填写身份证号', trigger: 'blur' }],
@@ -153,23 +153,30 @@
          sex: '',
          userName: '',
          userState: null,
          deleted: '0'
          deleted: 0
        }
      }else{
        state.title = '重新上报';
        state.form = {
          uuid: data.uuid,
          cardNumber: '',
          companyCode: '652310082',
          contractorId: '',
          phone: '',
          post: '',
          projectName: '',
          sex: '',
          userName: '',
          userState: null,
          deleted: '0'
        }
        Object.keys(state.form).forEach(key => {
          if (Object.prototype.hasOwnProperty.call(data,key)) {
            state.form[key] = JSON.parse(JSON.stringify(data))[key];
          }
        })
        state.form.deleted = Number(data.deleted)
        // state.form = {
        //   uuid: data.uuid,
        //   cardNumber: '',
        //   companyCode: '652310082',
        //   contractorId: '',
        //   phone: '',
        //   post: '',
        //   projectName: '',
        //   sex: '',
        //   userName: '',
        //   userState: null,
        //   deleted: '0'
        // }
      }
    };
src/views/dataUpload/peopleLocate/components/addReport.vue
@@ -221,24 +221,29 @@
          thirdAddress: 'http://117.190.40.54:8081/location_system_5.4.9/login/login.html?company=GUOTAI&version=5.4.9'
        }
      }else{
        state.title = '重新上报';
        state.form = {
          uuid: data.uuid,
          serialNumber: '',
          cardNo: '',
          realName: '',
          alarmStatus: '',
          alarmTime: '',
          alarmInfo: '',
          alarmType: '',
          alarmLocation: '',
          longitude: '',
          latitude: '',
          floorNo: '',
          handleTime: '',
          handleInfo: '',
          thirdAddress: 'http://117.190.40.54:8081/location_system_5.4.9/login/login.html?company=GUOTAI&version=5.4.9'
        }
        state.title = '重新上报'
        Object.keys(state.form).forEach(key => {
          if (Object.prototype.hasOwnProperty.call(data,key)) {
            state.form[key] = JSON.parse(JSON.stringify(data))[key];
          }
        })
        // state.form = {
        //   uuid: data.uuid,
        //   serialNumber: '',
        //   cardNo: '',
        //   realName: '',
        //   alarmStatus: '',
        //   alarmTime: '',
        //   alarmInfo: '',
        //   alarmType: '',
        //   alarmLocation: '',
        //   longitude: '',
        //   latitude: '',
        //   floorNo: '',
        //   handleTime: '',
        //   handleInfo: '',
        //   thirdAddress: 'http://117.190.40.54:8081/location_system_5.4.9/login/login.html?company=GUOTAI&version=5.4.9'
        // }
      }
    };