联合利华（上海）
上一版本: d1062daf | 补丁 | 提交 | 忽略空白
jiangping
2025-04-25 6b929b3a19e0580e255c02c2702895f361784d90 
代码初始化
已修改12个文件
47 ■■■■■ 文件已修改
admin/lianhelihua_admin/index.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/business/OperaWorkorderDetailDbhWindow.vue 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/business/OperaWorkorderDetailDcaInfoWindow.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/business/OperaWorkorderDetailDcaWindow.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/business/OperaWorkorderDetailSheWindow.vue 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/companyMember.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/workorderDbh.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/workorderDcaChild.vue 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/workorderShe.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/src/main/java/com/doumee/core/utils/qiyeweixin/QywxUtil.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/src/main/java/com/doumee/dao/business/vo/WorkorderDcaChildDto.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/src/main/resources/application.yml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 admin/lianhelihua_admin/index.html


@@ -1 +1 @@


<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/lianhelihua_admin/icon.png"><title>联合利华事件上报系统</title><link href="/lianhelihua_admin/static/css/app.fa0e49b1.css" rel="preload" as="style"><link href="/lianhelihua_admin/static/css/chunk-vendors.d9e68312.css" rel="preload" as="style"><link href="/lianhelihua_admin/static/js/app.85dbe4af.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/js/chunk-vendors.fd387514.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/css/chunk-vendors.d9e68312.css" rel="stylesheet"><link href="/lianhelihua_admin/static/css/app.fa0e49b1.css" rel="stylesheet"></head><body><div id="app"></div><script src="/lianhelihua_admin/static/js/chunk-vendors.fd387514.js"></script><script src="/lianhelihua_admin/static/js/app.85dbe4af.js"></script></body></html>


<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/lianhelihua_admin/icon.png"><title>联合利华事件上报系统</title><link href="/lianhelihua_admin/static/css/app.08950188.css" rel="preload" as="style"><link href="/lianhelihua_admin/static/css/chunk-vendors.d9e68312.css" rel="preload" as="style"><link href="/lianhelihua_admin/static/js/app.813d15d9.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/js/chunk-vendors.fd387514.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/css/chunk-vendors.d9e68312.css" rel="stylesheet"><link href="/lianhelihua_admin/static/css/app.08950188.css" rel="stylesheet"></head><body><div id="app"></div><script src="/lianhelihua_admin/static/js/chunk-vendors.fd387514.js"></script><script src="/lianhelihua_admin/static/js/app.813d15d9.js"></script></body></html>




 admin/src/components/business/OperaWorkorderDetailDbhWindow.vue


@@ -8,9 +8,9 @@


    <div class="modal_wrap">


      <div class="modal_content">


        <div class="header">


          <img v-if="info.status == '3'" class="head_bg"


          <img v-if="info.status == '0'" class="head_bg"


               src="@/assets/task/bg_shenhe_fail@2x.png" alt="">


          <img v-else-if="info.status == '4'" class="head_bg"


          <img v-else-if="info.status == '4' || info.status == '3'||info.status == '5'" class="head_bg"


               src="@/assets/task/bg_shenhe_pass@2x.png" alt="">


          <img v-else class="head_bg" src="@/assets/task/bg_shenhe@2x.png" alt="">


          <div class="left">




 admin/src/components/business/OperaWorkorderDetailDcaInfoWindow.vue


@@ -8,9 +8,9 @@


    <div class="modal_wrap">


      <div class="modal_content">


        <div class="header">


          <img v-if="info.status == '3'" class="head_bg"


          <img v-if="info.status == '0'" class="head_bg"


               src="@/assets/task/bg_shenhe_fail@2x.png" alt="">


          <img v-else-if="info.status == '4'" class="head_bg"


          <img v-else-if="info.status == '4' || info.status == '3'||info.status == '5'" class="head_bg"


               src="@/assets/task/bg_shenhe_pass@2x.png" alt="">


          <img v-else class="head_bg" src="@/assets/task/bg_shenhe@2x.png" alt="">


          <div class="left">


@@ -46,7 +46,7 @@


              <div class="label">发现时间</div>


              <div class="value">{{ info.happenTime}}</div>


            </div>


            <div class="item">


            <div class="item" style="width: 100%">


              <div class="label">通知人</div>


              <div class="value">{{ info.memberNames }}</div>


            </div>




 admin/src/components/business/OperaWorkorderDetailDcaWindow.vue


@@ -8,9 +8,9 @@


    <div class="modal_wrap">


      <div class="modal_content">


        <div class="header">


          <img v-if="info.status == '3'" class="head_bg"


          <img v-if="info.status == '0'" class="head_bg"


               src="@/assets/task/bg_shenhe_fail@2x.png" alt="">


          <img v-else-if="info.status == '4'" class="head_bg"


          <img v-else-if="info.status == '4' || info.status == '3'||info.status == '5'" class="head_bg"


               src="@/assets/task/bg_shenhe_pass@2x.png" alt="">


          <img v-else class="head_bg" src="@/assets/task/bg_shenhe@2x.png" alt="">


          <div class="left">


@@ -82,7 +82,7 @@


            <el-table-column prop="index" label="序号" width="55" fixed="left">


              <template slot-scope="scope">{{ scope.$index+1}}</template>


            </el-table-column>


            <el-table-column label="工单号" prop="code" min-width="100">


            <el-table-column label="工单号" prop="code" min-width="120">


              <template slot-scope="{row}">


                <span style="color: #2E68EC;cursor: pointer" @click="$refs.OperaWorkorderDetailDcaInfoWindow.open('DCA不符合项工单详情', row)" >{{ row.code || '-'}}</span>


              </template>


@@ -90,7 +90,6 @@


            <el-table-column label="一级主题" prop="typeName" min-width="60"> </el-table-column>


            <el-table-column label="二级主题" prop="categoryName" min-width="60"> </el-table-column>


            <el-table-column label="观察项" prop="problemTitle" min-width="100"> </el-table-column>


            <el-table-column label="不符合原因" prop="eventInfo" min-width="120" />


            <el-table-column label="状态" prop="status" min-width="80">


              <template slot-scope="{row}">


<!--                <span :class="'statusInfo'+row.status" v-if="row.status ==0">待处理</span>-->


@@ -103,6 +102,7 @@


                <span :class="'statusInfo'+row.status" >{{ row.statusName }}</span>


              </template>


            </el-table-column>


            <el-table-column label="不符合原因" prop="eventInfo" min-width="180" />


            <el-table-column label="操作" prop="status" min-width="80">


              <template slot-scope="{row}">


                <el-button type="text" @click="$refs.OperaWorkorderDetailDcaInfoWindow.open('DCA不符合项工单详情', row)" icon="el-icon-zoom-out" >查看详情</el-button>


@@ -117,7 +117,7 @@


            <el-table-column prop="index" label="序号" width="55" fixed="left">


              <template slot-scope="scope">{{ scope.$index+1}}</template>


            </el-table-column>


            <el-table-column label="一级主题" prop="typeName" min-width="160"> </el-table-column>


            <el-table-column label="一级主题" prop="typeName" min-width="140"> </el-table-column>


            <el-table-column label="二级主题" prop="categoryName" min-width="150"> </el-table-column>


            <el-table-column label="观察项" prop="problemTitle" min-width="400"> </el-table-column>


          </el-table>




 admin/src/components/business/OperaWorkorderDetailSheWindow.vue


@@ -8,9 +8,9 @@


    <div class="modal_wrap">


      <div class="modal_content">


        <div class="header">


          <img v-if="info.status == '3'" class="head_bg"


          <img v-if="info.status == '0'" class="head_bg"


               src="@/assets/task/bg_shenhe_fail@2x.png" alt="">


          <img v-else-if="info.status == '4'" class="head_bg"


          <img v-else-if="info.status == '4' || info.status == '3'||info.status == '5'||info.status == '6'" class="head_bg"


               src="@/assets/task/bg_shenhe_pass@2x.png" alt="">


          <img v-else class="head_bg" src="@/assets/task/bg_shenhe@2x.png" alt="">


          <div class="left">




 admin/src/views/business/companyMember.vue


@@ -153,7 +153,7 @@


          this.loading = true


          memberSync({})


            .then(res => {


              this.$tip.apiSuccess(res || '同步成功')


              this.$tip.apiSuccess(  '同步成功')


              this.search()


            })


            .catch(e => {




 admin/src/views/business/workorderDbh.vue


@@ -85,7 +85,7 @@


        <el-table-column prop="submitDate" label="上报时间" min-width="150px"></el-table-column>


        <el-table-column prop="happenTime" label="发现时间" min-width="150px"></el-table-column>


        <el-table-column prop="locationName" label="发生地点" min-width="150px"></el-table-column>


        <el-table-column prop="riskInfo" label="风险描述" min-width="200px"></el-table-column>


        <el-table-column prop="riskInfo" label="风险描述" min-width="250px" show-overflow-tooltip ></el-table-column>


        <el-table-column prop="memberName" label="上报人员" min-width="150px">


          <template slot-scope="{row}">


            <span v-if="row.memberPhone" >{{row.memberName}} - {{row.memberPhone }}</span>




 admin/src/views/business/workorderDcaChild.vue


@@ -96,6 +96,7 @@


        <el-table-column prop="locationName" label="位置" min-width="150px"></el-table-column>


        <el-table-column prop="submitDate" label="上报时间" min-width="150px"></el-table-column>


        <el-table-column prop="happenTime" label="发现时间" min-width="150px"></el-table-column>


        <el-table-column prop="eventInfo" label="不符合原因" min-width="250px"  show-overflow-tooltip ></el-table-column>


        <el-table-column prop="memberName" label="上报人员" min-width="150px">


          <template slot-scope="{row}">


            <span v-if="row.memberPhone" >{{row.memberName}}/{{row.memberPhone }}</span>




 admin/src/views/business/workorderShe.vue


@@ -98,7 +98,7 @@


              <span v-else>否</span>


            </template>


          </el-table-column>


        <el-table-column prop="eventInfo" label="事件说明" min-width="200px"></el-table-column>


        <el-table-column prop="eventInfo" label="事件说明" min-width="200px"  show-overflow-tooltip ></el-table-column>


        <el-table-column prop="memberName" label="上报人员" min-width="150px">


          <template slot-scope="{row}">


            <span v-if="row.memberPhone" >{{row.memberName}} - {{row.memberPhone }}</span>




 server/src/main/java/com/doumee/core/utils/qiyeweixin/QywxUtil.java


@@ -118,7 +118,7 @@


        try {


            String[] interfaceUrl = QywxConstant.GET_MEDIA;


            String url = qyUtil.qiweiUrl+interfaceUrl[0].replace("${accesstoken}",token).replace("${media_id}",media);


            log.error("企业微信临时素材获取url=========="+url);


            log.info("企业微信临时素材获取url=========="+url);


            return  HttpsUtil.connectionInputsteam(url,"GET",null,null);


        }catch (Exception e){


            e.printStackTrace();




 server/src/main/java/com/doumee/dao/business/vo/WorkorderDcaChildDto.java


@@ -37,20 +37,20 @@


    @ExcelColumn(name="状态",index =6,width = 4, valueMapping = "0=待处理;1=处理中;2=处理中;3=已处理;4=已处理;5=已处理;")


    private Integer status;


    @ApiModelProperty(value = "状态描述")


    @ExcelColumn(name="状态描述",index =5,width = 8)


    @ExcelColumn(name="状态描述",index =7,width = 8)


    private String statusName;


    @ApiModelProperty(value = "上报时间", example = "1")


    @ExcelColumn(name="上报时间",index =7 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)


    @ExcelColumn(name="上报时间",index =8 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)


    private Date submitDate;


    @ApiModelProperty(value = "发现时间", example = "1")


    @ExcelColumn(name="发现时间",index =8 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)


    @ExcelColumn(name="发现时间",index =9 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)


    private Date happenTime;


    @ApiModelProperty(value = "位置", example = "1")


    @ExcelColumn(name="位置",index =9 ,width = 6)


    @ExcelColumn(name="位置",index =10 ,width = 6)


    private String locationName;




    @ApiModelProperty(value = "不符合原因", example = "1")


    @ExcelColumn(name="不符合原因",index =10,width = 10)


    @ExcelColumn(name="不符合原因",index =11,width = 10)


    private String eventInfo;


    @ApiModelProperty("提报人员名称")


    @ExcelColumn(name="上报员工",index =12,width = 8)




 server/src/main/resources/application.yml


@@ -9,7 +9,7 @@




spring:


  profiles:


    active: dev


    active: test


  # JSON返回配置


  jackson:


    # 默认时区