|
@@ -82,12 +82,10 @@
|
|
|
<tfoot class="bottom">
|
|
<tfoot class="bottom">
|
|
|
<tr>
|
|
<tr>
|
|
|
<td colspan="5" style="text-align:left">
|
|
<td colspan="5" style="text-align:left">
|
|
|
- <div v-if="item1.qz2===''" style="float: left;margin-top:5px">仓管员:{{ item1.name2 }}</div>
|
|
|
|
|
- <div v-else class="imgOut" style="justify-content: flex-start;margin-top:5px;">审核人:<img style="width:20%;" :src="item1.qz2" alt="" /> </div>
|
|
|
|
|
|
|
+ <div style="float: left;margin-top:5px">仓管员:{{ item1.name2 }}</div>
|
|
|
</td>
|
|
</td>
|
|
|
<td colspan="10" style="text-align:right">
|
|
<td colspan="10" style="text-align:right">
|
|
|
- <div v-if="item1.qz3===''" style="margin-top:5px;">审核人:{{ item1.name3 }} </div>
|
|
|
|
|
- <div v-else class="imgOut" style="margin-top:5px;">审核人:<img style="width:20%;" :src="item1.qz3" alt="" /> </div>
|
|
|
|
|
|
|
+ <div style="margin-top:5px;">审核人:{{ item1.name3 }} </div>
|
|
|
</td>
|
|
</td>
|
|
|
</tr>
|
|
</tr>
|
|
|
</tfoot>
|
|
</tfoot>
|
|
@@ -109,7 +107,7 @@
|
|
|
import VueBarcode from "vue-barcode";
|
|
import VueBarcode from "vue-barcode";
|
|
|
import vueEasyPrint from "vue-easy-print";
|
|
import vueEasyPrint from "vue-easy-print";
|
|
|
import repostCurd from "@/business/platform/form/utils/custom/joinCURD.js";
|
|
import repostCurd from "@/business/platform/form/utils/custom/joinCURD.js";
|
|
|
-import { BASE_API as baseApi } from '@/constant'
|
|
|
|
|
|
|
+
|
|
|
export default {
|
|
export default {
|
|
|
components: {
|
|
components: {
|
|
|
VueBarcode,
|
|
VueBarcode,
|
|
@@ -252,22 +250,15 @@ export default {
|
|
|
var idStr = "";
|
|
var idStr = "";
|
|
|
this.obj.forEach((item) => {idStr += item + ",";});
|
|
this.obj.forEach((item) => {idStr += item + ",";});
|
|
|
idStr = idStr.substring(0, idStr.length - 1);
|
|
idStr = idStr.substring(0, idStr.length - 1);
|
|
|
- let s4 = `select a.ID_, a.FILE_PATH_,b.parent_id_ from ibps_file_attachment a join t_ryjbqk b on a.id_ = b.qian_zi_tu_wen_ `
|
|
|
|
|
- repostCurd("sql", s4).then((res4) => {
|
|
|
|
|
- // console.log(res4.variables.data,qz)
|
|
|
|
|
- this.getLook(idStr,res4.variables.data);
|
|
|
|
|
- })
|
|
|
|
|
-
|
|
|
|
|
|
|
+ this.getLook(idStr);
|
|
|
},
|
|
},
|
|
|
- getLook(id,qzArr) {
|
|
|
|
|
|
|
+ getLook(id) {
|
|
|
this.list = [];
|
|
this.list = [];
|
|
|
let this_ = this;
|
|
let this_ = this;
|
|
|
let sql = `select * FROM t_yszb WHERE FIND_IN_SET(id_,'${id}')`;
|
|
let sql = `select * FROM t_yszb WHERE FIND_IN_SET(id_,'${id}')`;
|
|
|
let zhubiao = [];
|
|
let zhubiao = [];
|
|
|
let name1, name2, name3;
|
|
let name1, name2, name3;
|
|
|
let time1, time2, time3;
|
|
let time1, time2, time3;
|
|
|
- let id2, id3;
|
|
|
|
|
- let qz2, qz3;
|
|
|
|
|
let addhanshuiheji = 0;
|
|
let addhanshuiheji = 0;
|
|
|
let addjine = 0;
|
|
let addjine = 0;
|
|
|
let addshuie = 0;
|
|
let addshuie = 0;
|
|
@@ -277,36 +268,18 @@ export default {
|
|
|
let sql1 = `select * FROM t_cgysjlb WHERE FIND_IN_SET(wai_jian_,'${item.id_}') and shu_liang_ != '0'`;
|
|
let sql1 = `select * FROM t_cgysjlb WHERE FIND_IN_SET(wai_jian_,'${item.id_}') and shu_liang_ != '0'`;
|
|
|
repostCurd("sql", sql1).then((res) => {
|
|
repostCurd("sql", sql1).then((res) => {
|
|
|
let data = res.variables.data;
|
|
let data = res.variables.data;
|
|
|
- let s2 = `select a.id_,a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y-%m-%d') AS CREATE_TIME_ FROM ibps_party_employee as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT PROC_INST_ID_ FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item.id_}' LIMIT 1) AND b.NODE_ID_ = 'Activity_04lhxla' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
|
|
|
|
|
|
|
+ let s2 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y-%m-%d') AS CREATE_TIME_ FROM ibps_party_employee as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT PROC_INST_ID_ FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item.id_}' LIMIT 1) AND b.NODE_ID_ = 'Activity_04lhxla' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
|
|
|
repostCurd("sql", s2).then((res) => {
|
|
repostCurd("sql", s2).then((res) => {
|
|
|
name2 = res.variables.data[0].NAME_;
|
|
name2 = res.variables.data[0].NAME_;
|
|
|
- id2 = res.variables.data[0].id_;
|
|
|
|
|
- let qzIndex2 = qzArr.findIndex(q=> q.parent_id_ === id2)
|
|
|
|
|
- if(qzIndex2!==-1&&qzArr[qzIndex2].FILE_PATH_!==null&&qzArr[qzIndex2].FILE_PATH_!==''){
|
|
|
|
|
- qz2 = baseApi.slice(0,-4) + qzArr[qzIndex2].FILE_PATH_
|
|
|
|
|
- }else{
|
|
|
|
|
- qz2=''
|
|
|
|
|
- }
|
|
|
|
|
time2 = res.variables.data[0].CREATE_TIME_;
|
|
time2 = res.variables.data[0].CREATE_TIME_;
|
|
|
data["name2"] = name2;
|
|
data["name2"] = name2;
|
|
|
- data["id2"] = id2;
|
|
|
|
|
- data["qz2"] = qz2;
|
|
|
|
|
data["time2"] = time2;
|
|
data["time2"] = time2;
|
|
|
- let s3 = `select a.id_,a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y-%m-%d') AS CREATE_TIME_ FROM ibps_party_employee as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT PROC_INST_ID_ FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item.id_}' LIMIT 1) AND b.NODE_ID_ = 'Activity_1dk76gy' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
|
|
|
|
|
|
|
+ let s3 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y-%m-%d') AS CREATE_TIME_ FROM ibps_party_employee as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT PROC_INST_ID_ FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item.id_}' LIMIT 1) AND b.NODE_ID_ = 'Activity_1dk76gy' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
|
|
|
repostCurd("sql", s3).then((res) => {
|
|
repostCurd("sql", s3).then((res) => {
|
|
|
name3 = res.variables.data[0].NAME_;
|
|
name3 = res.variables.data[0].NAME_;
|
|
|
- id3 = res.variables.data[0].id_;
|
|
|
|
|
- let qzIndex3 = qzArr.findIndex(q=> q.parent_id_ === id3)
|
|
|
|
|
- if(qzIndex3!==-1&&qzArr[qzIndex3].FILE_PATH_!==null&&qzArr[qzIndex3].FILE_PATH_!==''){
|
|
|
|
|
- qz3 = baseApi.slice(0,-4) + qzArr[qzIndex3].FILE_PATH_
|
|
|
|
|
- }else{
|
|
|
|
|
- qz3=''
|
|
|
|
|
- }
|
|
|
|
|
time3 = res.variables.data[0].CREATE_TIME_;
|
|
time3 = res.variables.data[0].CREATE_TIME_;
|
|
|
data["name3"] = name3;
|
|
data["name3"] = name3;
|
|
|
- data["id3"] = id3;
|
|
|
|
|
data["time3"] = time3;
|
|
data["time3"] = time3;
|
|
|
- data["qz3"] = qz3;
|
|
|
|
|
data["gong_ying_shang_"] = item.gong_ying_shang_;
|
|
data["gong_ying_shang_"] = item.gong_ying_shang_;
|
|
|
data["shen_gou_bu_men_"] = item.shen_gou_bu_men_;
|
|
data["shen_gou_bu_men_"] = item.shen_gou_bu_men_;
|
|
|
data["cai_gou_ding_dan_"] = item.cai_gou_ding_dan_;
|
|
data["cai_gou_ding_dan_"] = item.cai_gou_ding_dan_;
|
|
@@ -328,7 +301,6 @@ export default {
|
|
|
data["addjine"] = this_.toDecimal2(data["addjine"]);
|
|
data["addjine"] = this_.toDecimal2(data["addjine"]);
|
|
|
data["addshuie"] = this_.toDecimal2(data["addshuie"]);
|
|
data["addshuie"] = this_.toDecimal2(data["addshuie"]);
|
|
|
this_.list.push(data);
|
|
this_.list.push(data);
|
|
|
- console.log(this_.list,'aaaaaaa')
|
|
|
|
|
addhanshuiheji = 0;
|
|
addhanshuiheji = 0;
|
|
|
addjine = 0;
|
|
addjine = 0;
|
|
|
addshuie = 0;
|
|
addshuie = 0;
|
|
@@ -337,6 +309,7 @@ export default {
|
|
|
});
|
|
});
|
|
|
});
|
|
});
|
|
|
});
|
|
});
|
|
|
|
|
+
|
|
|
},
|
|
},
|
|
|
},
|
|
},
|
|
|
};
|
|
};
|
|
@@ -389,9 +362,4 @@ thead > tr > th {
|
|
|
border-left: 1px solid #fff;
|
|
border-left: 1px solid #fff;
|
|
|
border-right: 1px solid #fff;
|
|
border-right: 1px solid #fff;
|
|
|
}
|
|
}
|
|
|
-.imgOut{
|
|
|
|
|
- display: flex;
|
|
|
|
|
- align-items: center;
|
|
|
|
|
- justify-content: flex-end;
|
|
|
|
|
-}
|
|
|
|
|
</style>
|
|
</style>
|