Browse Source

plm BM

master
ruanqi 2 years ago
parent
commit
2c1e4c8fb9
  1. 1
      src/api/sampleManagement/technicalSpecificationList.js
  2. 3
      src/store/modules/user.js
  3. 4
      src/views/modules/sampleManagement/com_technical-add-or-update.vue
  4. 2
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
  5. 6
      src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
  6. 71
      src/views/modules/sampleManagement/technicalSpecificationList.vue
  7. 2
      static/config/index.js

1
src/api/sampleManagement/technicalSpecificationList.js

@ -86,3 +86,4 @@ export const updateBMPrintingDetail= data => createAPI(`/technicalSpecification/
export const searchBMPrintingColor= data => createAPI(`/technicalSpecification/searchBMPrintingColor`,'post',data) export const searchBMPrintingColor= data => createAPI(`/technicalSpecification/searchBMPrintingColor`,'post',data)
export const saveBMPrintingColor= data => createAPI(`/technicalSpecification/saveBMPrintingColor`,'post',data) export const saveBMPrintingColor= data => createAPI(`/technicalSpecification/saveBMPrintingColor`,'post',data)
export const deleteBMPrintingColor= data => createAPI(`/technicalSpecification/deleteBMPrintingColor`,'post',data) export const deleteBMPrintingColor= data => createAPI(`/technicalSpecification/deleteBMPrintingColor`,'post',data)
export const upBMRevNo= data => createAPI(`/technicalSpecification/upBMRevNo`,'post',data)

3
src/store/modules/user.js

@ -10,7 +10,8 @@ export default {
multiLanguage: '', multiLanguage: '',
authControl: '', authControl: '',
userSite: 0, userSite: 0,
bmPicUrl:'http://192.168.1.83:81/upload/',
bmPicUrl:'http://172.19.1.142:80/upload/',
//bmPicUrl:'http://192.168.1.83:81/upload/',
}, },
mutations: { mutations: {
updateId (state, id) { updateId (state, id) {

4
src/views/modules/sampleManagement/com_technical-add-or-update.vue

@ -27,7 +27,7 @@
<el-form :inline="true" label-position="top" label-width="100px" :rules="dataRole"> <el-form :inline="true" label-position="top" label-width="100px" :rules="dataRole">
<el-form-item :label="'参数卡编码'" > <el-form-item :label="'参数卡编码'" >
<el-input v-model="dataForm.codeNo" disabled style="width: 130px" ></el-input>
<el-input v-model="dataForm.oriCodeNo" disabled style="width: 130px" ></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'版本号'" prop="revNo" :rules="dataRole.revNo"> <el-form-item :label="'版本号'" prop="revNo" :rules="dataRole.revNo">
<el-input v-model="dataForm.revNo" style="width: 130px" ></el-input> <el-input v-model="dataForm.revNo" style="width: 130px" ></el-input>
@ -207,6 +207,7 @@
quotationOfficerList:[], quotationOfficerList:[],
engineerList:[], engineerList:[],
technicianList:[], technicianList:[],
oriCodeNo:'',
}, },
quotationOfficerList:[], quotationOfficerList:[],
engineerList:[], engineerList:[],
@ -370,6 +371,7 @@
quotationOfficerList:[], quotationOfficerList:[],
engineerList:[], engineerList:[],
technicianList:[], technicianList:[],
oriCodeNo:'',
} }
} }

2
src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue

@ -9,7 +9,7 @@
</div></el-col> </div></el-col>
<el-col :span="6"><div class="grid-content bg-purple"> <el-col :span="6"><div class="grid-content bg-purple">
<el-form-item :label="'Revision Number'"> <el-form-item :label="'Revision Number'">
<el-input v-model="dataForm.revNo" :disabled="ifDisableFlag" ></el-input>
<el-input v-model="dataForm.revNo" disabled ></el-input>
</el-form-item> </el-form-item>
</div></el-col> </div></el-col>
<el-col :span="6"><div class="grid-content bg-purple"> <el-col :span="6"><div class="grid-content bg-purple">

6
src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue

@ -1,8 +1,8 @@
<template> <template>
<div class="mod-config"> <div class="mod-config">
<el-tabs class="tabs" tab-position="left" style="height: 200px;" type="border-card" v-model="activeName" @tab-click="refreshCurrentTabTable">
<el-tabs class="tabs" tab-position="left" style="height: 200px;" type="border-card" v-model="activeName" @tab-click="refreshCurrentTabTable">
<el-tab-pane label="基本信息" name="baseInfo" > <el-tab-pane label="基本信息" name="baseInfo" >
<basicInformation ref="basicInformation" v-if="getPageIf('baseInfo')"></basicInformation>
<basicInformation ref="basicInformation" ></basicInformation>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="客户信息" name="customerInfo" v-if="getPageIf('customerInfo')"> <el-tab-pane label="客户信息" name="customerInfo" v-if="getPageIf('customerInfo')">
<customerInfo ref="customerInfo" ></customerInfo> <customerInfo ref="customerInfo" ></customerInfo>
@ -174,7 +174,7 @@
type:'', type:'',
}, },
pageRole:'', pageRole:'',
activeName:'',
activeName:'baseInfo',
} }
}, },

71
src/views/modules/sampleManagement/technicalSpecificationList.vue

@ -61,6 +61,7 @@
fixed="right" fixed="right"
label="操作"> label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<a type="text" size="small" @click="addRevModel(scope.row)">升版</a>
<a type="text" size="small" @click="jumpDetail(scope.row)">详情</a> <a type="text" size="small" @click="jumpDetail(scope.row)">详情</a>
<a type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</a> <a type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</a>
<a type="text" size="small" @click="deleteData(scope.row)">删除</a> <a type="text" size="small" @click="deleteData(scope.row)">删除</a>
@ -278,6 +279,33 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="search" v-drag></add-or-update> <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="search" v-drag></add-or-update>
<el-dialog width="500px"
:title="'升版'"
:close-on-click-modal="false"
:visible.sync="revNoFlag">
<el-form :inline="true" label-position="top" label-width="100px" >
<el-form-item :label="'参数卡编码'">
<el-input v-model="revNoData.oriCodeNo" style="width: 130px" disabled></el-input>
</el-form-item>
<el-form-item :label="'版本号'">
<el-input v-model="revNoData.oldRevNo" style="width: 130px" disabled></el-input>
</el-form-item>
<el-form-item :label="'项目物料'">
<el-input v-model="revNoData.testPartNo" style="width: 130px" disabled></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" label-width="100px" >
<el-form-item :label="'版本号'">
<el-input v-model="revNoData.revNo" style="width: 130px" ></el-input>
</el-form-item>
</el-form>
<el-form label-position="top" style="margin-top: 60px; margin-left: 0px;text-align:center">
<el-button type="primary" @click="upBMRevNo()">{{'确定'}}</el-button>
<el-button type="primary" @click="revNoFlag = false">{{'关闭'}}</el-button>
</el-form>
</el-dialog>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist> <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
</div> </div>
</template> </template>
@ -287,6 +315,7 @@
getTechnicalCustomerInfoData, getTechnicalCustomerInfoData,
technicalSpecificationListSearch, technicalSpecificationListSearch,
deleteTechnicalSpecificationList, deleteTechnicalSpecificationList,
upBMRevNo,
} from "@/api/sampleManagement/technicalSpecificationList.js" } from "@/api/sampleManagement/technicalSpecificationList.js"
import Chooselist from '@/views/modules/common/Chooselist' import Chooselist from '@/views/modules/common/Chooselist'
import AddOrUpdate from './com_technical-add-or-update' import AddOrUpdate from './com_technical-add-or-update'
@ -319,10 +348,10 @@
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 103002, functionId: 103002,
serialNumber: '103002Table1CodeNo',
serialNumber: '103002Table1OriCodeNo',
tableId: "103002Table1", tableId: "103002Table1",
tableName: "技术参数卡列表", tableName: "技术参数卡列表",
columnProp: "codeNo",
columnProp: "oriCodeNo",
headerAlign: "center", headerAlign: "center",
align: "left", align: "left",
columnLabel: "参数卡编码", columnLabel: "参数卡编码",
@ -661,6 +690,15 @@
} }
], ],
}, },
revNoFlag:false,
revNoData: {
site:'',
oriCodeNo:'',
oldCodeNo:'',
oldRevNo:'',
revNo:'',
testPartNo:'',
},
// start // start
exportData: [], exportData: [],
exportName: '技术参数卡清单'+this.dayjs().format('YYYYMMDDHHmmss'), exportName: '技术参数卡清单'+this.dayjs().format('YYYYMMDDHHmmss'),
@ -794,6 +832,35 @@
}).catch(() => { }).catch(() => {
}) })
}, },
addRevModel(row){
this.revNoData={
site:row.site,
oriCodeNo:row.oriCodeNo,
oldCodeNo:row.codeNo,
oldRevNo:row.revNo,
revNo:'',
testPartNo:row.testPartNo,
}
this.revNoFlag=true;
},
upBMRevNo(){
this.$confirm('确定要升版?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
upBMRevNo(this.revNoData).then(({data}) => {
if (data && data.code === 0) {
this.$message.success( '操作成功')
this.revNoFlag=false;
this.search();
} else {
this.$message.error(data.msg)
}
})
}).catch(() => {
})
},
//excel //excel
async createExportData() { async createExportData() {
this.searchData.limit = -1 this.searchData.limit = -1

2
static/config/index.js

@ -5,7 +5,7 @@
window.SITE_CONFIG = {}; window.SITE_CONFIG = {};
// api接口请求地址 // api接口请求地址
window.SITE_CONFIG['baseUrl'] = 'http://127.0.0.1:9090/xujie-fast';
window.SITE_CONFIG['baseUrl'] = 'http://172.19.1.142:8802';
// cdn地址 = 域名 + 版本号 // cdn地址 = 域名 + 版本号
window.SITE_CONFIG['domain'] = './'; // 域名 window.SITE_CONFIG['domain'] = './'; // 域名

Loading…
Cancel
Save