Browse Source

2024-04-30 更新2

master
fengyuan_yang 2 years ago
parent
commit
1fcf8cb8d0
  1. 14
      src/api/changeManagement/changeManagement.js
  2. 6
      src/views/modules/changeManagement/changeRecord.vue
  3. 2
      src/views/modules/customer/customerInformationManagement.vue
  4. 6
      src/views/modules/part/partInformation.vue
  5. 4
      src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
  6. 2
      src/views/modules/sampleManagement/com_technical-add-or-update.vue

14
src/api/changeManagement/changeManagement.js

@ -200,6 +200,20 @@ export const submitChange = data => createAPI(`/plm/changeManagement/submitChang
*/
export const getNodeAuthority = data => createAPI(`/plm/changeManagement/getNodeAuthority`,'post',data)
/**
* 下达
* @param data
* @returns {*}
*/
export const issueChange2 = data => createAPI(`/plm/changeManagement/issueChange2`,'post',data)
/**
* 提交
* @param data
* @returns {*}
*/
export const submitChange2 = data => createAPI(`/plm/changeManagement/submitChange2`,'post',data)

6
src/views/modules/changeManagement/changeRecord.vue

@ -852,6 +852,8 @@
issueChange, //
submitChange, //
getNodeAuthority, //
issueChange2, //
submitChange2, //
} from '@/api/changeManagement/changeManagement.js'
import ChooseList from '@/views/modules/common/Chooselist'
import changeUploadFile from "../base/upload_file.vue";
@ -2157,7 +2159,7 @@
changeNo: row.changeNo,
menuId: this.$route.meta.menuId
}
issueChange(tempData).then(({data}) => {
issueChange2(tempData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
this.$message({message: '操作成功', type: 'success'})
@ -2193,7 +2195,7 @@
menuId: this.$route.meta.menuId,
nodeConclusion: this.modalData.nodeConclusion
}
submitChange(tempData).then(({data}) => {
submitChange2(tempData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
this.$message({message: '操作成功', type: 'success'})

2
src/views/modules/customer/customerInformationManagement.vue

@ -342,7 +342,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="customerName" label="所属客户">
<el-form-item prop="customerName" label="直接客户">
<el-input v-model="projectInformationModalData.customerName" readonly></el-input>
</el-form-item>
</el-col>

6
src/views/modules/part/partInformation.vue

@ -568,8 +568,8 @@
</el-container>
</el-form>
<el-footer style="height:35px;margin-top: 20px;text-align:center">
<el-button v-if="modalData.flag === '3'" type="primary" @click="saveData()">投产</el-button>
<el-button v-else type="primary" @click="saveData()">保存</el-button>
<el-button v-if="modalData.flag === '3'" type="primary" @click="saveData">同步</el-button>
<el-button v-else type="primary" @click="saveData">保存</el-button>
<el-button type="primary" @click="modalFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
@ -3844,7 +3844,7 @@
toBecomeOfficialPartModal (row) {
this.modalData = {
flag: '3',
title: '物料转正',
title: '同步物料信息',
site: row.site,
partNo: row.partNo,
partDesc: row.partDesc,

4
src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue

@ -37,7 +37,7 @@
</el-col>
<el-col :span="6">
<el-form-item prop="customerName">
<span slot="label" style="" @click="getBaseList(102,1)"><a herf="#">所属客户</a></span>
<span slot="label" style="" @click="getBaseList(102,1)"><a herf="#">直接客户</a></span>
<el-input v-model="dataForm.customerName" readonly ></el-input>
</el-form-item>
</el-col>
@ -675,7 +675,7 @@
// return false;
// }
if(!this.dataForm.customerId){
this.$alert('请选择所属客户!', '错误', {
this.$alert('请选择直接客户!', '错误', {
confirmButtonText: '确定'
})
return false;

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

@ -14,7 +14,7 @@
<el-checkbox v-model="jumpFlag">保存后跳转至详情</el-checkbox>
</el-form-item>
<el-form-item prop="testPartNo" :rules="dataRole.testPartNo" style="margin-left: 12px">
<span slot="label" style="" @click="getBaseList(134,1)" ><a herf="#">项目料号</a></span>
<span slot="label" style="" @click="getBaseList(134,1)" ><a herf="#">测试料号</a></span>
<el-input v-model="dataForm.testPartNo" @change="changeTestDesc" style="width: 130px" ></el-input>
</el-form-item>
</el-form>

Loading…
Cancel
Save