ERP_override.git

			@@ -88,7 +88,7 @@

			<template>
			<div id="sheet">
			<table border="1" >
			<table >
			<tr class="title-s">
			<th colspan="15">
			<img src="../../../assets/northGlass.ico" alt="" style="float: left;max-width: 60px;max-height: 60px">

			@@ -79,7 +79,7 @@

			<template>
			<div id="sheet">
			<table border="1">
			<table >
			<tr class="title-s">
			<th colspan="17">
			<img src="../../../assets/northGlass.ico" alt="" style="float: left;max-width: 60px;max-height: 60px">
			@@ -94,7 +94,12 @@
			<th colspan="5">电话:{{ company.telephone }}</th>
			<th colspan="5">传真:{{ company.fax }}</th>
			</tr>

			<tr class="title-s" style="height: 30px">
			<th colspan="17" >
			<hr class=".hr-border"/>
			<hr class=".hr-border"/>
			</th>
			</tr>

			<tr class="title-s" >
			<th colspan="17">
			@@ -260,11 +265,11 @@

			table{
			border-collapse: collapse;
			border: 1px solid black;
			//border: 1px solid black;
			width: 100%;
			text-align: center;
			}
			table, th, td {
			tr, th, td {
			border: 1px solid black;
			border-collapse: collapse;
			}

			@@ -144,7 +144,6 @@
			total.dataTotal = res.data.total.total*1
			total.pageTotal= res.data.total.pageTotal
			}
			pageNum.value=1
			produceList = deepClone(res.data.data)
			xGrid.value.loadData(produceList)
			gridOptions.loading=false

			@@ -159,7 +159,6 @@
			</if>
			</where>
			order by fol.`status` desc
			limit #{offset},#{pageSize};
			</select>

			<update id="updateToExamine">
			@@ -297,8 +296,6 @@
			and fol.remarks regexp #{finishedOperateLog.remarksr}
			</if>
			</where>
			order by fol.`status` desc
			limit #{offset},#{pageSize};
			</select>

			<select id="getselectAllocateFinishedOperateLog" resultMap="selectFinishedGoodsInventory" >
			@@ -404,7 +401,6 @@
			and fol.operate_time regexp #{finishedOperateLog.operateTime}
			</if>
			</where>
			limit #{offset},#{pageSize};
			</select>


			@@ -545,8 +541,6 @@
			and fol.remarks regexp #{finishedOperateLog.remarksr}
			</if>
			</where>
			order by fol.`status` desc
			limit #{offset},#{pageSize};
			</select>

			<select id="getselectFinishedOperateLog" >

	north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet1.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/mainProductStock/StorageRecord.vue	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史