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

plm BMM

master
ruanqi 1 year ago
parent
7d1ff7d1c7
commit
1f52c8bda2
5 changed files with 21 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/views/modules/base/benchmark/workCenterBM.vue
  2. 2
      src/views/modules/sampleManagement/com_technical-add-or-update.vue
  3. 2
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
  4. 21
      src/views/modules/tooling/searchToolApply.vue
  5. 6
      src/views/modules/tooling/toolingInfo.vue

2
src/views/modules/base/benchmark/workCenterBM.vue
View File

@ -15,7 +15,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label=" "> <el-form-item label=" ">
<el-button type="primary" @click="searchTable">刷新</el-button>
<el-button type="primary" @click="searchTable">查询</el-button>
<download-excel <download-excel
:fields="fields()" :fields="fields()"
:data="exportData" :data="exportData"

2
src/views/modules/sampleManagement/com_technical-add-or-update.vue
View File

@ -511,7 +511,7 @@
if(type==8) { if(type==8) {
strVal = this.dataForm.technicianNo strVal = this.dataForm.technicianNo
} }
this.$refs.userList.init(this.$store.state.user.site,'%%', strVal)
this.$refs.userList.init(this.$store.state.user.site,this.dataForm.buNo!==''?this.dataForm.buNo:'%%', strVal)
}) })
}, },
/* 列表方法的回调 */ /* 列表方法的回调 */

2
src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
View File

@ -65,7 +65,7 @@
width="90" width="90"
label="操作"> label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<a type="text" size="small" @click="jumpPeifang(scope.row)">跳转配方</a>
<a type="text" v-if="scope.row.ifHasPeifang==='Y'" size="small" @click="jumpPeifang(scope.row)">跳转配方</a>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

21
src/views/modules/tooling/searchToolApply.vue
View File

@ -173,7 +173,8 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="总成本(元)" > <el-form-item label="总成本(元)" >
<el-input v-field="accessField('10601001')" v-model="currentRow.allCost" readonly></el-input>
<el-input v-if="accessField('10601001')" v-model="currentRow.allCost" readonly></el-input>
<el-input v-if="!accessField('10601001')" v-model="valueNull" style="width: 130px" disabled></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -208,7 +209,8 @@
<el-input v-model="dataForm.applySumQty" style="width: 130px" disabled></el-input> <el-input v-model="dataForm.applySumQty" style="width: 130px" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'总成本'"> <el-form-item :label="'总成本'">
<el-input v-field="accessField('10601001')" v-model="dataForm.totalCost" style="width: 130px" disabled></el-input>
<el-input v-if="accessField('10601001')" v-model="dataForm.totalCost" style="width: 130px" disabled></el-input>
<el-input v-if="!accessField('10601001')" v-model="valueNull" style="width: 130px" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'申请人'" required="required"> <el-form-item :label="'申请人'" required="required">
<el-input v-model="dataForm.applyBy" style="width: 130px" disabled></el-input> <el-input v-model="dataForm.applyBy" style="width: 130px" disabled></el-input>
@ -278,8 +280,9 @@
style="width: 100px; height: 80px"/></span> style="width: 100px; height: 80px"/></span>
</div> </div>
<div v-else-if=" (item.columnProp === 'standardCost')"> <div v-else-if=" (item.columnProp === 'standardCost')">
<el-input v-model="scope.row.standardCost" type="number" @change="changeSum(scope.row)" placeholder="请输入成本"
<el-input v-if="accessField('10601001')" v-model="scope.row.standardCost" type="number" @change="changeSum(scope.row)" placeholder="请输入成本"
style="width:98%"></el-input> style="width:98%"></el-input>
</div> </div>
<div v-else> <div v-else>
<el-input v-model="scope.row.applyQty" type="number" @change="changeSum(scope.row)" placeholder="请输入数量" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" <el-input v-model="scope.row.applyQty" type="number" @change="changeSum(scope.row)" placeholder="请输入数量" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')"
@ -354,7 +357,8 @@
<el-input v-model="dataForm.applySumQty" style="width: 130px" disabled></el-input> <el-input v-model="dataForm.applySumQty" style="width: 130px" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'总成本'"> <el-form-item :label="'总成本'">
<el-input v-field="accessField('10601001')" v-model="dataForm.totalCost" style="width: 130px" disabled></el-input>
<el-input v-if="accessField('10601001')" v-model="dataForm.totalCost" style="width: 130px" disabled></el-input>
<el-input v-if="!accessField('10601001')" v-model="valueNull" style="width: 130px" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'申请人'" required="required"> <el-form-item :label="'申请人'" required="required">
<el-input v-model="dataForm.applyBy" style="width: 130px" disabled></el-input> <el-input v-model="dataForm.applyBy" style="width: 130px" disabled></el-input>
@ -424,7 +428,7 @@
style="width: 100px; height: 80px"/></span> style="width: 100px; height: 80px"/></span>
</div> </div>
<div v-else-if=" (item.columnProp === 'standardCost')"> <div v-else-if=" (item.columnProp === 'standardCost')">
<el-input v-model="scope.row.standardCost" type="number" @change="changeSum(scope.row)" placeholder="请输入成本"
<el-input v-if="accessField('10601001')" v-model="scope.row.standardCost" type="number" @change="changeSum(scope.row)" placeholder="请输入成本"
style="width:98%"></el-input> style="width:98%"></el-input>
</div> </div>
<div v-else> <div v-else>
@ -467,7 +471,8 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="总成本(元)" > <el-form-item label="总成本(元)" >
<el-input v-field="accessField('10601001')" v-model="modelData.allCost" type="number" :disabled="$store.state.user.name!==dataForm.purchaser"></el-input>
<el-input v-if="accessField('10601001')" v-model="modelData.allCost" type="number" :disabled="$store.state.user.name!==dataForm.purchaser"></el-input>
<el-input v-if="!accessField('10601001')" v-model="valueNull" style="width: 130px" disabled></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -521,7 +526,8 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="总成本(元)" > <el-form-item label="总成本(元)" >
<el-input v-field="accessField('10601001')" v-model="modelData.allCost" type="number" ></el-input>
<el-input v-if="accessField('10601001')" v-model="modelData.allCost" type="number" ></el-input>
<el-input v-if="!accessField('10601001')" v-model="valueNull" style="width: 130px" disabled></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -666,6 +672,7 @@
userName: this.$store.state.user.name, userName: this.$store.state.user.name,
nodeId: '' nodeId: ''
}, },
valueNull:'******',
modelData:{ modelData:{
site:'', site:'',
applyNo:'', applyNo:'',

6
src/views/modules/tooling/toolingInfo.vue
View File

@ -93,7 +93,8 @@
<el-input v-model="dataForm.applySumQty" style="width: 130px" disabled></el-input> <el-input v-model="dataForm.applySumQty" style="width: 130px" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'总成本'"> <el-form-item :label="'总成本'">
<el-input v-field="accessField('10601001')" v-model="dataForm.totalCost" style="width: 130px" disabled></el-input>
<el-input v-if="accessField('10601001')" v-model="dataForm.totalCost" style="width: 130px" disabled></el-input>
<el-input v-if="!accessField('10601001')" v-model="valueNull" style="width: 130px" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'申请人'" required="required"> <el-form-item :label="'申请人'" required="required">
<el-input v-model="dataForm.applyBy" style="width: 130px" ></el-input> <el-input v-model="dataForm.applyBy" style="width: 130px" ></el-input>
@ -160,7 +161,7 @@
</el-table-column> </el-table-column>
<el-table-column label="工具成本" width="70" prop="standardCost" show-overflow-tooltip> <el-table-column label="工具成本" width="70" prop="standardCost" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-field="accessField('10601001')" v-model="scope.row.standardCost" type="number" @change="changeSum(scope.row)" placeholder="请输入成本"
<el-input v-if="accessField('10601001')" v-model="scope.row.standardCost" type="number" @change="changeSum(scope.row)" placeholder="请输入成本"
style="width:98%"></el-input> style="width:98%"></el-input>
</template> </template>
</el-table-column> </el-table-column>
@ -498,6 +499,7 @@
}, },
], ],
jumpFlag:true, jumpFlag:true,
valueNull:'******',
dataForm:{ dataForm:{
site: '', site: '',
applyNo: '', applyNo: '',

Write Preview
Loading…
Cancel
Save