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

2025/6/10

master
Aoi_Tori 7 months ago
parent
69b82bd83f
commit
796a589e5c
3 changed files with 87 additions and 34 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. 5
      src/api/sampleManagement/technicalSpecificationList.js
  2. 87
      src/views/common/filterSearch.vue
  3. 29
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue

5
src/api/sampleManagement/technicalSpecificationList.js
View File

@ -144,8 +144,3 @@ export const bmStatusToFinish = data => createAPI("/technicalSpecification/bmSta
export const getNodeList = data => createAPI("/technicalSpecification/node/list",'post',data)
export const updateBMProcessInfo= data => createAPI(`/technicalSpecification/updateBMProcessInfo`,'post',data)

87
src/views/common/filterSearch.vue
View File

@ -386,10 +386,59 @@ export default {
</template>
</el-table-column>
<el-table-column label="属性名称" align="left" header-align="center" show-overflow-tooltip width="120" prop="fieldCaption"></el-table-column>
<!-- <el-table-column label="条件" align="center" width="240">-->
<!-- <template slot-scope="{row,$index}">-->
<!-- <div v-if="row.dataType === 'D'" style="width: 100%">-->
<!-- <el-date-picker-->
<!-- v-model="row.formula"-->
<!-- type="date"-->
<!-- placeholder="选择日期"-->
<!-- value-format="yyyy-MM-dd" style="width: 100%;"-->
<!-- />-->
<!-- </div>-->
<!-- <div v-else>-->
<!-- <el-input v-model="row.formula" clearable>-->
<!-- <el-select slot="prepend" clearable v-model="row.symbol" style="width: 100px;cursor:pointer;">-->
<!-- &lt;!&ndash; <el-option value="eq" label="等于"></el-option>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-option value="gt" label="大于"></el-option>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-option value="ge" label="大于等于"></el-option>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-option value="lt" label="小于"></el-option>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-option value="le" label="小于等于"></el-option>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-option value="between" label="之间"></el-option>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-option value="in" label="或者"></el-option>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-option value="ne" label="不等于"></el-option>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-option value="like" label="LIKE"></el-option>&ndash;&gt;-->
<!-- </el-select>-->
<!-- </el-input>-->
<!-- </div>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="条件" align="center" width="240">
<template slot-scope="{row,$index}">
<el-input v-model="row.formula" clearable>
<el-select slot="prepend" clearable v-model="row.symbol" style="width: 100px;cursor:pointer;">
<!-- 情况一：日期类型 D -->
<div v-if="row.dataType === 'D'" style="width: 100%">
<el-date-picker
v-model="row.formula"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd"
style="width: 100%;"
/>
<el-select v-model="row.symbol" style="width: 100px; cursor: pointer; margin-top: 5px;" clearable>
<el-option value="eq" label="等于"></el-option>
<el-option value="gt" label="大于"></el-option>
<el-option value="ge" label="大于等于"></el-option>
<el-option value="lt" label="小于"></el-option>
<el-option value="le" label="小于等于"></el-option>
<el-option value="between" label="之间"></el-option>
<el-option value="ne" label="不等于"></el-option>
</el-select>
</div>
<!-- 情况二：数字类型 N -->
<div v-else-if="row.dataType === 'N'" style="width: 100%">
<el-input-number v-model.number="row.formula" style="width: 100%" clearable />
<el-select v-model="row.symbol" style="width: 100px; cursor: pointer; margin-top: 5px;" clearable>
<el-option value="eq" label="等于"></el-option>
<el-option value="gt" label="大于"></el-option>
<el-option value="ge" label="大于等于"></el-option>
@ -398,11 +447,22 @@ export default {
<el-option value="between" label="之间"></el-option>
<el-option value="in" label="或者"></el-option>
<el-option value="ne" label="不等于"></el-option>
</el-select>
</div>
<!-- 情况三：字符串类型 S -->
<div v-else style="width: 100%">
<el-input v-model="row.formula" clearable />
<el-select v-model="row.symbol" style="width: 100px; cursor: pointer; margin-top: 5px;" clearable>
<el-option value="eq" label="等于"></el-option>
<el-option value="ne" label="不等于"></el-option>
<el-option value="like" label="LIKE"></el-option>
<el-option value="in" label="或者"></el-option>
</el-select>
</el-input>
</div>
</template>
</el-table-column>
<el-table-column label="排序" align="center" prop="sortBy" show-overflow-tooltip width="80">
<template slot-scope="{row,$index}">
<el-select v-model="row.sortBy" clearable style="width: 100%">
@ -425,7 +485,7 @@ export default {
<template slot-scope="{row,$index}">
<el-input v-model="row.formula" clearable>
<el-select slot="prepend" clearable v-model="row.symbol" style="width: 80px;cursor:pointer;">
<el-option value="eq" label="等于"></el-option>
<!-- <el-option value="eq" label="等于"></el-option>
<el-option value="gt" label="大于"></el-option>
<el-option value="ge" label="大于等于"></el-option>
<el-option value="lt" label="小于"></el-option>
@ -433,7 +493,24 @@ export default {
<el-option value="between" label="之间"></el-option>
<el-option value="in" label="或者"></el-option>
<el-option value="ne" label="不等于"></el-option>
<el-option value="like" label="LIKE"></el-option>
<el-option value="like" label="LIKE"></el-option>-->
<!-- 数字类型支持的条件 -->
<el-option value="eq" label="等于" v-if="row.dataType === 'N' || row.dataType === 'D'"></el-option>
<el-option value="gt" label="大于" v-if="row.dataType === 'N' || row.dataType === 'D'"></el-option>
<el-option value="ge" label="大于等于" v-if="row.dataType === 'N' || row.dataType === 'D'"></el-option>
<el-option value="lt" label="小于" v-if="row.dataType === 'N' || row.dataType === 'D'"></el-option>
<el-option value="le" label="小于等于" v-if="row.dataType === 'N' || row.dataType === 'D'"></el-option>
<el-option value="between" label="之间" v-if="row.dataType === 'N' || row.dataType === 'D'"></el-option>
<!-- 字符串类型支持的条件 -->
<el-option value="eq" label="等于" v-if="row.dataType === 'S'"></el-option>
<el-option value="ne" label="不等于" v-if="row.dataType === 'S'"></el-option>
<el-option value="like" label="LIKE" v-if="row.dataType === 'S'"></el-option>
<el-option value="in" label="或者" v-if="row.dataType === 'S'"></el-option>
<!-- 通用条件 -->
<el-option value="ne" label="不等于" v-if="row.dataType !== 'S'"></el-option>
<el-option value="in" label="或者" v-if="row.dataType === 'N'"></el-option>
</el-select>
</el-input>
</template>

29
src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
View File

@ -14,6 +14,11 @@
<span slot="label" style="" @click="getBaseList(2)"><a herf="#">印刷人员</a></span>
<el-input v-model="sheetData.printOperatorName" ref="printOperatorName" placeholder="请选择人员" readonly style="width: 120px" ></el-input>
</el-form-item>
<el-form-item label=" ">
<el-button type="primary" @click="searchTable(true)">刷新</el-button>
<el-button type="primary" @click="changeRouteRev()" v-if="((!ifDisableFlag && spForm.sp.includes(searchData.username) && baseForm.status === 'spz') || baseForm.status === 'cg' || superAdmin)">变更</el-button>
<el-button type="primary" @click="jumpRoute()">跳转至Routing</el-button>
</el-form-item>
<el-form-item label=" ">
<el-button type="primary" @click="updateBMProcess()" v-if="(!ifDisableFlag && isAuth('103002:bmSave') && spForm.sp.includes(searchData.username) && baseForm.status === 'spz') || baseForm.status === 'cg' || superAdmin">保存数据</el-button>
<el-button v-if="baseForm.status === 'spz' && ((!ifDisableFlag && spForm.sp.includes(searchData.username)) || (superAdmin))" type="primary" @click="agreeSubmit">同意</el-button>
@ -189,11 +194,6 @@
<el-form-item label="替代编码">
<el-input v-model="routeData.alternativeNo" readonly style="width: 120px"></el-input>
</el-form-item>
<el-form-item label=" ">
<el-button type="primary" @click="searchTable(true)">刷新</el-button>
<el-button type="primary" @click="changeRouteRev()" v-if="((!ifDisableFlag && spForm.sp.includes(searchData.username) && baseForm.status === 'spz') || baseForm.status === 'cg' || superAdmin)">变更</el-button>
<el-button type="primary" @click="jumpRoute()">跳转至Routing</el-button>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" style="margin-top: 1px; margin-left: 0px;" >
<el-row :gutter="20">
@ -246,7 +246,6 @@
<el-form-item label="修边公差(+/-)">
<el-input v-model="sheetData.slittingTolerance" style="width: 120px" ></el-input>
</el-form-item>
<el-button type="primary" @click="updateBMProcessInfo">修改</el-button>
</el-col>
</el-row>
</el-form>
@ -1538,24 +1537,6 @@
}
})
},
updateBMProcessInfo(){
updateBMProcessInfo(this.sheetData).then(({data}) => {
if (data && data.code === 0) {
this.$clearHighLight()
tsdBasicInformationSearch(this.searchData).then(({data}) => {
if(data.row){
this.sheetData=data.row
}else {
}
});
this.$message.success('操作成功')
} else {
this.$message.error(data.msg)
}
})
},
updateBMRouteRev(){
if(this.currentRoute==null){

Write Preview
Loading…
Cancel
Save