|
|
@@ -886,6 +886,13 @@
|
|
|
>
|
|
|
</el-col>
|
|
|
<el-col style="display: flex; justify-content: flex-end">
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ size="small"
|
|
|
+ @click="showElabel"
|
|
|
+ v-show="showDataElabel == '0'"
|
|
|
+ >查看电子标签
|
|
|
+ </el-button>
|
|
|
<el-button size="small" type="info" prop="打印" @click="printZyd" v-if="entryPrinting == 0"
|
|
|
>作业单
|
|
|
</el-button>
|
|
|
@@ -4448,7 +4455,7 @@
|
|
|
<td>备注</td>
|
|
|
</tr>
|
|
|
<tr v-for="(item, index) in Printinglist" :key="index">
|
|
|
- <td>{{ item.fCntrno }}</td>
|
|
|
+ <td></td>
|
|
|
<td>{{ item.fMarks }}</td>
|
|
|
<td></td>
|
|
|
<td>{{ item.fSealno }}</td>
|
|
|
@@ -4483,7 +4490,7 @@
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
@click="
|
|
|
- addprint('dcckd');
|
|
|
+ addprint('dcckd_blank');
|
|
|
print_dcckd_blank = false;
|
|
|
"
|
|
|
>打印
|
|
|
@@ -5246,6 +5253,31 @@
|
|
|
<el-button type="primary" @click="save4()">确 定</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
+ <!-- 点击查看电子标签 -->
|
|
|
+ <el-dialog title="电子标签"
|
|
|
+ :visible.sync="showElabelDialog"
|
|
|
+ :close-on-click-modal="false"
|
|
|
+ width="40%">
|
|
|
+ <span>
|
|
|
+ <el-table :data="elabelList" element-loading-text="努力加载中">
|
|
|
+ <el-table-column
|
|
|
+ label="序号"
|
|
|
+ type="index"
|
|
|
+ width="50"
|
|
|
+ fixed
|
|
|
+ align="center"
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ prop="fContent"
|
|
|
+ align="center"
|
|
|
+ label="电子标签"
|
|
|
+ />
|
|
|
+ </el-table>
|
|
|
+ </span>
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
+ <el-button @click="showElabelDialog = false">取 消</el-button>
|
|
|
+ </span>
|
|
|
+ </el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -5301,7 +5333,7 @@ import { getToken } from '@/utils/auth'
|
|
|
import { addSet, select, resetModule } from '@/api/system/set'
|
|
|
import upLoad from '../components/upLoad'
|
|
|
import draggable from 'vuedraggable'
|
|
|
-import { queryClerkRoleList } from '@/api/warehouseBusiness/warehouseInStock'
|
|
|
+import { listElabelByfGPid, queryClerkRoleList } from '@/api/warehouseBusiness/warehouseInStock'
|
|
|
import { listCharge } from '@/api/system/viewApproval'
|
|
|
import { getDept } from '@/api/basicdata/dept'
|
|
|
|
|
|
@@ -6228,7 +6260,10 @@ export default {
|
|
|
width: 150
|
|
|
}
|
|
|
],
|
|
|
- showPrint: null
|
|
|
+ showPrint: null,
|
|
|
+ showDataElabel: null,
|
|
|
+ showElabelDialog: false,
|
|
|
+ elabelList: [],
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
|
@@ -6303,6 +6338,9 @@ export default {
|
|
|
this.getDicts('data_ifdamage_status').then((response) => {
|
|
|
this.fIfdamageOptions = response.data
|
|
|
})
|
|
|
+ this.getConfigKey('show.data_elabel').then((response) => {
|
|
|
+ this.showDataElabel = response.msg
|
|
|
+ })
|
|
|
this.getConfigKey('stockoi').then((response) => {
|
|
|
this.stockoi = response.msg
|
|
|
})
|
|
|
@@ -7187,6 +7225,15 @@ export default {
|
|
|
getDataList() {
|
|
|
this.addOrUpdateVisible = false
|
|
|
},
|
|
|
+ // 查看电子标签
|
|
|
+ showElabel() {
|
|
|
+ this.showElabelDialog = true;
|
|
|
+ if (this.form.fId) {
|
|
|
+ listElabelByfGPid(this.form.fId).then((response) => {
|
|
|
+ this.elabelList = response.data.elabelList;
|
|
|
+ });
|
|
|
+ }
|
|
|
+ },
|
|
|
returnData() {
|
|
|
this.addOrUpdateVisib = false
|
|
|
this.$router.push({ path: '/index' })
|
|
|
@@ -9553,6 +9600,14 @@ export default {
|
|
|
scanStyles: false
|
|
|
})
|
|
|
break
|
|
|
+ case 'dcckd_blank':
|
|
|
+ print({
|
|
|
+ printable: 'print_area7_1',
|
|
|
+ type: 'html',
|
|
|
+ style: style, // 亦可使用引入的外部css;
|
|
|
+ scanStyles: false
|
|
|
+ })
|
|
|
+ break
|
|
|
case 'zccdckd':
|
|
|
print({
|
|
|
printable: 'print_area8',
|
nzf