|
|
@@ -37,7 +37,7 @@
|
|
|
<tr style="border:1px solid #000;">
|
|
|
<th style="width: 40px; line-height: 22px">序号</th>
|
|
|
<th >物料编码</th>
|
|
|
- <th >物料名称</th>
|
|
|
+ <th style="width: 150px;word-wrap: normal !important;word-break: break-all !important;">物料名称</th>
|
|
|
<th >货号</th>
|
|
|
<th >批号</th>
|
|
|
<th >规格/特征</th>
|
|
|
@@ -54,21 +54,21 @@
|
|
|
</thead>
|
|
|
<tbody>
|
|
|
<tr v-for="(item, index) in item1" :key="index" style="border:1px solid #000;">
|
|
|
- <td style="width: 20px">{{ index + 1 }}</td>
|
|
|
- <td style="width: 70px">{{ item.wu_liao_bian_ma_ }}</td>
|
|
|
- <td style="width: 80px">{{ item.wu_liao_ming_chen }}</td>
|
|
|
- <td style="width: 60px">{{ item.huo_hao_ }}</td>
|
|
|
- <td style="width: 60px">{{ item.pi_hao_ }}</td>
|
|
|
- <td style="width: 80px">{{ item.gui_ge_xing_hao_ }}</td>
|
|
|
- <td style="width: 100px"> {{ item.gong_ying_shang_| gongyingshang(gongyingshangList) }} </td>
|
|
|
- <td style="width: 45px">{{ item.shu_liang_ }}</td>
|
|
|
- <td style="width: 45px">{{ item.dan_wei_ }}</td>
|
|
|
- <td style="width: 60px;padding: 1px;">{{ item.dan_jia_han_shui_ |numToFixed}}</td>
|
|
|
- <td style="width: 45px">{{ item.shui_lv_ }}</td>
|
|
|
- <td style="width: 45px;padding: 1px;">{{ item.dan_jia_|numToFixed}}</td>
|
|
|
- <td style="width: 45px;padding: 1px;"> {{ item.dan_jia_han_shui_|shuieToFixed(item.shu_liang_,item.dan_jia_) }}</td>
|
|
|
- <td style="width: 45px;padding: 1px;">{{ item.dan_jia_|jineToFixed(item.shu_liang_)}}</td>
|
|
|
- <td style="width: 60px">{{ item.dan_jia_han_shui_|jineToFixed(item.shu_liang_) }}</td>
|
|
|
+ <td style="width: 20px;word-wrap: normal !important;word-break: break-all !important;">{{ index + 1 }}</td>
|
|
|
+ <td style="width: 70px;word-wrap: normal !important;word-break: break-all !important;">{{ item.wu_liao_bian_ma_ }}</td>
|
|
|
+ <td style="width: 150px;word-wrap: normal !important;word-break: break-all !important;">{{ item.wu_liao_ming_chen }}</td>
|
|
|
+ <td style="width: 60px;word-wrap: normal !important;word-break: break-all !important;">{{ item.huo_hao_ }}</td>
|
|
|
+ <td style="width: 60px;word-wrap: normal !important;word-break: break-all !important;">{{ item.pi_hao_ }}</td>
|
|
|
+ <td style="width: 80px;word-wrap: normal !important;word-break: break-all !important;">{{ item.gui_ge_xing_hao_ }}</td>
|
|
|
+ <td style="width: 100px;word-wrap: normal !important;word-break: break-all !important;"> {{ item.gong_ying_shang_| gongyingshang(gongyingshangList) }} </td>
|
|
|
+ <td style="width: 45px;word-wrap: normal !important;word-break: break-all !important;">{{ item.shu_liang_ }}</td>
|
|
|
+ <td style="width: 45px;word-wrap: normal !important;word-break: break-all !important;">{{ item.dan_wei_ }}</td>
|
|
|
+ <td style="width: 60px;padding: 1px;word-wrap: normal !important;word-break: break-all !important;">{{ item.dan_jia_han_shui_ |numToFixed}}</td>
|
|
|
+ <td style="width: 45px;word-wrap: normal !important;word-break: break-all !important;">{{ item.shui_lv_ }}</td>
|
|
|
+ <td style="width: 45px;padding: 1px;word-wrap: normal !important;word-break: break-all !important;">{{ item.dan_jia_|numToFixed}}</td>
|
|
|
+ <td style="width: 45px;padding: 1px;word-wrap: normal !important;word-break: break-all !important;"> {{ item.dan_jia_han_shui_|shuieToFixed(item.shu_liang_,item.dan_jia_) }}</td>
|
|
|
+ <td style="width: 45px;padding: 1px;word-wrap: normal !important;word-break: break-all !important;">{{ item.dan_jia_|jineToFixed(item.shu_liang_)}}</td>
|
|
|
+ <td style="width: 60px;word-wrap: normal !important;word-break: break-all !important;">{{ item.dan_jia_han_shui_|jineToFixed(item.shu_liang_) }}</td>
|
|
|
</tr>
|
|
|
<tr class="count" style="border:1px solid #000;">
|
|
|
<td colspan="15">
|
|
|
@@ -82,10 +82,12 @@
|
|
|
<tfoot class="bottom">
|
|
|
<tr>
|
|
|
<td colspan="5" style="text-align:left">
|
|
|
- <div style="float: left;margin-top:5px">仓管员:{{ item1.name2 }}</div>
|
|
|
+ <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>
|
|
|
</td>
|
|
|
<td colspan="10" style="text-align:right">
|
|
|
- <div style="margin-top:5px;">审核人:{{ item1.name3 }} </div>
|
|
|
+ <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>
|
|
|
</td>
|
|
|
</tr>
|
|
|
</tfoot>
|
|
|
@@ -107,7 +109,7 @@
|
|
|
import VueBarcode from "vue-barcode";
|
|
|
import vueEasyPrint from "vue-easy-print";
|
|
|
import repostCurd from "@/business/platform/form/utils/custom/joinCURD.js";
|
|
|
-
|
|
|
+import { BASE_API as baseApi } from '@/constant'
|
|
|
export default {
|
|
|
components: {
|
|
|
VueBarcode,
|
|
|
@@ -250,15 +252,22 @@ export default {
|
|
|
var idStr = "";
|
|
|
this.obj.forEach((item) => {idStr += item + ",";});
|
|
|
idStr = idStr.substring(0, idStr.length - 1);
|
|
|
- this.getLook(idStr);
|
|
|
+ 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);
|
|
|
+ })
|
|
|
+
|
|
|
},
|
|
|
- getLook(id) {
|
|
|
+ getLook(id,qzArr) {
|
|
|
this.list = [];
|
|
|
let this_ = this;
|
|
|
let sql = `select * FROM t_yszb WHERE FIND_IN_SET(id_,'${id}')`;
|
|
|
let zhubiao = [];
|
|
|
let name1, name2, name3;
|
|
|
let time1, time2, time3;
|
|
|
+ let id2, id3;
|
|
|
+ let qz2, qz3;
|
|
|
let addhanshuiheji = 0;
|
|
|
let addjine = 0;
|
|
|
let addshuie = 0;
|
|
|
@@ -268,18 +277,36 @@ export default {
|
|
|
let sql1 = `select * FROM t_cgysjlb WHERE FIND_IN_SET(wai_jian_,'${item.id_}') and shu_liang_ != '0'`;
|
|
|
repostCurd("sql", sql1).then((res) => {
|
|
|
let data = res.variables.data;
|
|
|
- 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`;
|
|
|
+ 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`;
|
|
|
repostCurd("sql", s2).then((res) => {
|
|
|
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_;
|
|
|
data["name2"] = name2;
|
|
|
+ data["id2"] = id2;
|
|
|
+ data["qz2"] = qz2;
|
|
|
data["time2"] = time2;
|
|
|
- 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`;
|
|
|
+ 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`;
|
|
|
repostCurd("sql", s3).then((res) => {
|
|
|
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_;
|
|
|
data["name3"] = name3;
|
|
|
+ data["id3"] = id3;
|
|
|
data["time3"] = time3;
|
|
|
+ data["qz3"] = qz3;
|
|
|
data["gong_ying_shang_"] = item.gong_ying_shang_;
|
|
|
data["shen_gou_bu_men_"] = item.shen_gou_bu_men_;
|
|
|
data["cai_gou_ding_dan_"] = item.cai_gou_ding_dan_;
|
|
|
@@ -301,6 +328,7 @@ export default {
|
|
|
data["addjine"] = this_.toDecimal2(data["addjine"]);
|
|
|
data["addshuie"] = this_.toDecimal2(data["addshuie"]);
|
|
|
this_.list.push(data);
|
|
|
+ console.log(this_.list,'aaaaaaa')
|
|
|
addhanshuiheji = 0;
|
|
|
addjine = 0;
|
|
|
addshuie = 0;
|
|
|
@@ -309,7 +337,6 @@ export default {
|
|
|
});
|
|
|
});
|
|
|
});
|
|
|
-
|
|
|
},
|
|
|
},
|
|
|
};
|
|
|
@@ -362,4 +389,9 @@ thead > tr > th {
|
|
|
border-left: 1px solid #fff;
|
|
|
border-right: 1px solid #fff;
|
|
|
}
|
|
|
+.imgOut{
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ justify-content: flex-end;
|
|
|
+}
|
|
|
</style>
|