wilson
/
rongxing-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

工具 2022-06-30 sxm

master
[li_she] 4 years ago
parent
874afd6989
commit
43f2644442
3 changed files with 1774 additions and 1751 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      dist.zip
  2. 168
      src/views/modules/knifemold/tool-info.vue
  3. 175
      src/views/modules/purchaseorder/purchaseRequisition.vue

BIN
dist.zip
View File

168
src/views/modules/knifemold/tool-info.vue
View File

@ -1,10 +1,12 @@
<template>
<div>
<el-main style="background-color: #B3C0D1;padding: 2px;">
<fieldset class="customer-field" style="width: 100%; padding: 0.35em 0.75em 0.425em;">
<el-row>
<el-col :span="24">
<el-form :inline="true" label-position="top" label-width="100px">
<el-form-item :label="inputLabel.headerInput.label1">
<el-input style="width: 100px;" @focus="initToolHeaderModel()" readonly v-model="headerData.toolId" ></el-input> <!---->
<el-input style="width: 100px;" @focus="initToolHeaderModel()" readonly
v-model="headerData.toolId"></el-input> <!---->
</el-form-item>
<el-form-item :label="inputLabel.headerInput.label2">
<el-input style="width: 100px;" readonly v-model="headerData.toolDescription"></el-input>
@ -28,7 +30,10 @@
<el-input style="width: 100px;" readonly v-model="headerData.strActive"></el-input>
</el-form-item>
</el-form>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form :inline="true" label-position="top" label-width="100px">
<el-form-item :label="inputLabel.headerInput.label9">
<el-input style="width: 100px;" readonly v-model="headerData.codeNo"></el-input>
@ -52,21 +57,25 @@
<el-input style="width: 215px;" readonly v-model="headerData.remark"></el-input>
</el-form-item>
</el-form>
</el-main>
<el-container >
<el-aside width="59%" style="padding: 0px 2px;">
</el-col>
</el-row>
</fieldset>
<el-row>
<fieldset class="customer-field" style="width: 100%; margin-top: 5px">
<legend>工具实例</legend>
<el-col :span="7">
<fieldset class="customer-field" style="width: 98%;">
<el-form :inline="true" label-position="top" label-width="95px" style="padding: 5px;">
<el-form-item>
<!-- <el-button type="primary">{{ inputLabel.leftInput.label1 }}</el-button> &lt;!&ndash;@click="initViewIfsTable('Y')"&ndash;&gt;-->
<el-button @click="initToolModel()" type="primary" v-show="showDefault">{{ buttons.edit }}</el-button>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" label-width="100px">
<el-form :inline="true" label-position="top" label-width="95px" >
<el-row>
<el-col :span="12">
<el-form-item :label="inputLabel.leftInput.label1">
<el-select @change="toolInstanceIdChange(currentDetailData.toolInstanceId)" v-model="currentDetailData.toolInstanceId" placeholder="请选择" style="width: 100px;">
<el-select @change="toolInstanceIdChange(currentDetailData.toolInstanceId)"
v-model="currentDetailData.toolInstanceId" placeholder="请选择" style="width: 150px;">
<el-option
v-for="item in selectList.select4"
:key="item.value"
@ -75,74 +84,102 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="inputLabel.leftInput.label2">
<el-input style="width: 95px;" readonly v-model="currentDetailData.status"></el-input>
<el-input style="width: 150px;" readonly v-model="currentDetailData.status"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item :label="inputLabel.leftInput.label3">
<el-input style="width: 95px;" readonly v-model="currentDetailData.supplierId"></el-input>
<el-input style="width: 150px;" readonly v-model="currentDetailData.supplierId"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="inputLabel.leftInput.label4">
<el-input style="width: 100px;" readonly v-model="currentDetailData.supplierName"></el-input>
<el-input style="width: 150px;" readonly v-model="currentDetailData.supplierName"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item :label="inputLabel.leftInput.label5">
<el-input style="width: 100px;" readonly v-model="currentDetailData.strPurchaseDate"></el-input>
<el-input style="width: 150px;" readonly v-model="currentDetailData.strPurchaseDate"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" label-width="100px">
</el-col>
<el-col :span="12">
<el-form-item :label="inputLabel.leftInput.label6">
<el-input style="width: 100px;" readonly v-model="currentDetailData.steelSeal"></el-input>
<el-input style="width: 150px;" readonly v-model="currentDetailData.steelSeal"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item :label="inputLabel.leftInput.label7">
<el-input style="width: 95px;" readonly v-model="currentDetailData.strPhaseInDate"></el-input>
<el-input style="width: 150px;" readonly v-model="currentDetailData.strPhaseInDate"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="inputLabel.leftInput.label8">
<el-input style="width: 95px;" readonly v-model="currentDetailData.strPhaseOutDate"></el-input>
<el-input style="width: 150px;" readonly v-model="currentDetailData.strPhaseOutDate"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item :label="inputLabel.leftInput.label9">
<el-input style="width: 100px;" readonly v-model="currentDetailData.estUseQty"></el-input>
<el-input style="width: 150px;" readonly v-model="currentDetailData.estUseQty"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="inputLabel.leftInput.label10">
<el-input style="width: 100px;" readonly v-model="currentDetailData.actualUseQty"></el-input>
<el-input style="width: 150px;" readonly v-model="currentDetailData.actualUseQty"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" label-width="100px">
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item :label="inputLabel.leftInput.label11">
<el-input style="width: 100px;" readonly v-model="currentDetailData.strCreateDate"></el-input>
<el-input style="width: 150px;" readonly v-model="currentDetailData.strCreateDate"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="inputLabel.leftInput.label12">
<el-input style="width: 95px;" readonly v-model="currentDetailData.createdBy"></el-input>
<el-input style="width: 150px;" readonly v-model="currentDetailData.createdBy"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item :label="inputLabel.leftInput.label13">
<el-input style="width: 95px;" readonly v-model="currentDetailData.orderNo"></el-input>
<el-input style="width: 150px;" readonly v-model="currentDetailData.orderNo"></el-input>
</el-form-item>
</el-col>
<el-col :span="12"></el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item :label="inputLabel.leftInput.label14">
<el-input style="width: 215px;" readonly v-model="currentDetailData.remark"></el-input>
</el-form-item>
</el-form>
</el-aside>
<el-main style="padding: 0px;">
<el-form :inline="true" label-position="top" label-width="100px">
<el-form-item :label="inputLabel.rightInput.label1">
<el-input style="width: 300px;" readonly v-model="currentDetailData.remark"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</fieldset>
</el-col>
<el-col :span="17">
<fieldset class="customer-field" style="width: 100%; ">
<span> {{inputLabel.rightInput.label1}}</span>
<el-table
id="commmon1"
height="36%"
width="100%"
:height="height/2"
:data="sfdcToolingHistList"
border
v-loading="dataListLoading"
@selection-change="selectionChangeHandle"
style="width: 100%;">
<!-- <el-table-column
type="selection"
header-align="center"
width="40"
align="center">
</el-table-column>-->
<el-table-column
v-for="(item,index) in columnList" :key="index"
:sortable="item.columnSortable"
@ -160,26 +197,15 @@
</template>
</el-table-column>
</el-table>
<el-form :inline="true" label-position="top" label-width="100px">
<el-form-item :label="inputLabel.rightInput.label2">
</el-form-item>
</el-form>
<span> {{inputLabel.rightInput.label2}}</span>
<el-table
id="commmon2"
height="36%"
width="100%"
:height="height/2"
:data="toolInstanceIdUseHist"
border
v-loading="dataListLoading"
@selection-change="selectionChangeHandle"
style="width: 100%;">
<!-- <el-table-column
type="selection"
header-align="center"
width="40"
align="center">
</el-table-column>-->
<el-table-column
v-for="(item,index) in columnList1" :key="index"
:sortable="item.columnSortable"
@ -197,11 +223,15 @@
</template>
</el-table-column>
</el-table>
</el-main>
</el-container>
</fieldset>
</el-col>
</fieldset>
</el-row>
<column v-if="visible" ref="column" @refreshData="getTableUserColumn"></column>
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag :title="inputLabel.leftInput.label15" :visible.sync="setUp.toolHeaderFlag" width="485px">
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag
:title="inputLabel.leftInput.label15" :visible.sync="setUp.toolHeaderFlag" width="485px">
<el-form :inline="true" label-position="left">
<el-form-item :label="inputLabel.headerInput.label1">
<el-input style="width: 110px;" v-model="queryHeaderData.toolId"></el-input>
@ -238,8 +268,8 @@
</span>
</el-dialog>
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag :title="inputLabel.leftInput.label15" :visible.sync="setUp.toolEditFlag" width="620px">
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag
:title="inputLabel.leftInput.label15" :visible.sync="setUp.toolEditFlag" width="620px">
<el-form :inline="true" label-position="top">
<el-form-item :label="inputLabel.leftInput.label1">
<el-input style="width: 130px;" readonly v-model="editData.toolInstanceId"></el-input>
@ -409,7 +439,7 @@
label15: '录入人',
},
leftInput: {
label1 : '工具编号',
label1: '实例编号',
label2: '状态',
label3: '供应商编码',
label4: '供应商名称',
@ -802,7 +832,7 @@
},
mounted() {
this.$nextTick(() => {
this.height = window.innerHeight - 255;
this.height = window.innerHeight - 275;
})
},
activated() {

175
src/views/modules/purchaseorder/purchaseRequisition.vue
View File

@ -1,11 +1,58 @@
<template>
<div class="mod-config">
<el-row>
<el-col :span="24">
<div>
<span @click="favoriteFunction()">
<icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>
</span>
</div>
<el-button @click="getDataList('Y')" type="primary">{{ buttons.search }}</el-button>
<el-button @click="initAddModel(null)" type="primary">{{ buttons.addLabelName }}</el-button>
<el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{ buttons.defaultTable }}
</el-button>
<el-button @click="userSetting()" type="primary">{{ buttons.settingTable }}</el-button>
<download-excel
:fields="fields()"
:data="exportData"
type="xls"
:name="exportName"
:header="exportHeader"
:footer="exportFooter"
:defaultValue="exportDefaultValue"
:fetch="createExportData"
:before-generate="startDownload"
:before-finish="finishDownload"
worksheet="导出信息"
class="el-button el-button--primary el-button--medium">
{{ buttons.download }}
</download-excel>
<el-button v-if="isAuth(':prd:delete')" type="danger" @click="deleteHandle()"
:disabled="dataListSelections.length <= 0">{{ buttons.deleteList }}
</el-button>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form :inline="true" label-position="top">
<el-form-item :label="'创建日期'">
<el-date-picker
style="width: 110px"
v-model="mainQueryData.startDate"
type="date"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
placeholder="选择日期">\
</el-date-picker>
<el-date-picker
style="width: 110px"
v-model="mainQueryData.endDate"
type="date"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd 23:59:59"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item :label="inputSearch1">
<el-input style="width: 100px;" clearable placeholder="" v-model="mainQueryData.requisitionno"></el-input>
</el-form-item>
@ -43,34 +90,11 @@
<el-option value="审批部分通过" label="审批部分通过"></el-option>
</el-select>
</el-form-item>
<el-form-item style="margin-top: 20px;">
<el-button @click="getDataList('Y')" type="primary">{{ buttons.search }}</el-button>
<el-button @click="initAddModel(null)" type="primary">{{ buttons.addLabelName }}</el-button>
<el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{ buttons.defaultTable }}
</el-button>
<el-button @click="userSetting()" type="primary">{{ buttons.settingTable }}</el-button>
<download-excel
:fields="fields()"
:data="exportData"
type="xls"
:name="exportName"
:header="exportHeader"
:footer="exportFooter"
:defaultValue="exportDefaultValue"
:fetch="createExportData"
:before-generate="startDownload"
:before-finish="finishDownload"
worksheet="导出信息"
class="el-button el-button--primary el-button--medium">
{{ buttons.download }}
</download-excel>
<el-button v-if="isAuth(':prd:delete')" type="danger" @click="deleteHandle()"
:disabled="dataListSelections.length <= 0">{{ buttons.deleteList }}
</el-button>
</el-form-item>
</el-form>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-table
:height="height"
:data="dataList"
@ -121,59 +145,11 @@
:total="totalPage"
layout="total, sizes, prev, pager, next, jumper">
</el-pagination>
</el-col>
</el-row>
<el-dialog :close-on-click-modal="false" :show-close="false" :close-on-press-escape="false" title="设置table列"
:visible.sync="visible" width="1000px" v-drag>
<el-form @keyup.enter.native="updateColumnList()"
v-model="userColumnList"
inline="inline"
size="mini"
label-width="80px">
<el-form-item v-for="(item,index) in userColumnList"
:key="item.columnProp"
:label="item.columnLabel"
:prop="item.columnProp">
<el-form-item>
排序
<el-input-number v-model="item.sortLv" controls-position="right" size="mini" :min="0"
:max="10"></el-input-number>
</el-form-item>
<el-form-item>
<el-switch
v-model="item.status"
active-text="显示"
inactive-text="隐藏">
</el-switch>
</el-form-item>
<el-form-item>
<el-switch
v-model="item.columnSortable"
active-text="排序"
inactive-text="不排序">
</el-switch>
</el-form-item>
<el-form-item>
<el-switch
v-model="item.fixed"
active-text="固定"
inactive-text="不固定">
</el-switch>
</el-form-item>
<el-form-item>
宽度
<el-input-number v-model="item.columnWidth" controls-position="right" size="mini" :min="0"
:max="1000"></el-input-number>
</el-form-item>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="updateColumnList()">确定</el-button>
</span>
</el-dialog>
<!-- 设置列 -->
<column v-if="visible" ref="column" @refreshData="getTableUserColumn"></column>
<el-dialog title="申请单信息" :visible.sync="addPRDetailFlag" width="672px" :close-on-click-modal="false"
:close-on-press-escape="false" v-drag>
@ -191,14 +167,16 @@
</el-form-item>
<el-form-item>
<span slot="label" @click="getBaseList(3)">{{inputSearch10}} </span>
<el-input v-model="currentPRDetailData.supplierid" onkeyup="this.value = this.value.toUpperCase()" style="width: 143px"></el-input>
<el-input v-model="currentPRDetailData.supplierid" onkeyup="this.value = this.value.toUpperCase()"
style="width: 143px"></el-input>
</el-form-item>
<el-form-item :label="inputSearch6">
<el-input style="text-align: left;width: 143px" onkeyup="this.value = this.value.toUpperCase()"
v-model="currentPRDetailData.partno"></el-input>
</el-form-item>
<el-form-item :label="inputSearch11">
<el-input style="text-align: left;width: 143px" onkeyup="this.value = this.value.toUpperCase()" v-model="currentPRDetailData.partdesc"></el-input>
<el-input style="text-align: left;width: 143px" onkeyup="this.value = this.value.toUpperCase()"
v-model="currentPRDetailData.partdesc"></el-input>
</el-form-item>
<el-form-item :label="inputSearch7">
<el-input style="text-align: left;width: 143px" @change="getNumber()"
@ -349,6 +327,7 @@
<script>
import Chooselist from '@/views/modules/common/Chooselist'
import column from "../common/column";
import {
searchSysLanguagePackList,
searchSysLanguageParam,
@ -364,7 +343,8 @@ import {
getTableDefaultListLanguage,
getTableUserListLanguage,
removerDefault,
removerUser} from "@/api/table.js"
removerUser
} from "@/api/table.js"
import {
userFavoriteList, saveUserFavorite, removeUserFavorite
} from '@/api/userFavorite.js'
@ -387,8 +367,10 @@ import Vue from "vue";
export default {
components: {
upload
,Chooselist},
upload,
Chooselist,
column
},
data() {
return {
//模态框编码
@ -437,10 +419,12 @@ export default {
sysOssEntityList: [],
},
mainQueryData: {
startDate: '',
endDate: '',
requisitionno: '',
orderType: '',
partno: '',
authorizeFlag: 'N',
authorizeFlag: '',
approveresult: '',
site: this.$store.state.user.site,
userId: this.$store.state.user.name,
@ -497,7 +481,7 @@ export default {
columnProp: "requisitionno",
headerAlign: "center",
align: "center",
columnLabel: "申请单单号",
columnLabel: "申请单号",
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -560,7 +544,7 @@ export default {
tableName: "PRHeader",
columnProp: "qty",
headerAlign: "center",
align: "center",
align: "right",
columnLabel: "申请数量",
columnHidden: false,
columnImage: false,
@ -1064,7 +1048,7 @@ export default {
},
mounted() {
this.$nextTick(() => {
this.height = window.innerHeight - 200;
this.height = window.innerHeight - 210;
})
},
activated() {
@ -1310,11 +1294,13 @@ export default {
})
},
initReapply(row) {
this.currentPRDetailData.orderref1 = row.requisitionno
this.currentPRDetailData.orderref1 = row.requisitionno``
this.currentPRDetailData.orderref2 = row.itemno
this.initAddModel(null, 'Y')
},
initAddModel(row, val) {
this.initTblBaseDataList()
this.getPartFamily()
this.fileList = []
this.insertFileList = []
if (row == null) {
@ -1416,13 +1402,20 @@ export default {
// 打开页面设置
userSetting() {
this.visible = true;
this.getTableUserAll()
let queryTable = {
userId: this.userId,
functionId: this.functionId,
tableId: this.tableId,
languageCode: this.$i18n.locale
}
this.$nextTick(() => {
this.$refs.column.init(queryTable);
});
},
// 获取 用户的配置
getTableUserAll() {
let queryTable = {
userId: this.$store.state.user.name,
tableId: "common1001",
languageCode: this.$i18n.locale
}

Write Preview
Loading…
Cancel
Save