2024-03-24 ECN更新

src/api/changeManagement/changeManagement.js

@@ -89,11 +89,95 @@ export const costImpactSave = data => createAPI(`/plm/changeManagement/costImpac
 export const executionSave = data => createAPI(`/plm/changeManagement/executionSave`,'post',data)
 
 /**
- * 新增库存成本影响（变更记录页面）
+ * 编辑库存成本影响
  * @param data
  * @returns {*}
  */
-export const costImpactSave2 = data => createAPI(`/plm/changeManagement/costImpactSave2`,'post',data)
+export const costImpactUpdate = data => createAPI(`/plm/changeManagement/costImpactUpdate`,'post',data)
+
+/**
+ * 查询ECN种类数据
+ * @param data
+ * @returns {*}
+ */
+export const getEcnTypeData = data => createAPI(`/plm/changeManagement/getEcnTypeData`,'post',data)
+
+/**
+ * 查询ECN的模板
+ * @param data
+ * @returns {*}
+ */
+export const getEcnModel = data => createAPI(`/plm/changeManagement/getEcnModel`,'post',data)
+
+/**
+ * 查询模板属性
+ * @param data
+ * @returns {*}
+ */
+export const getItemList = data => createAPI(`/plm/changeManagement/getItemList`,'post',data)
+
+/**
+ * 查询执行信息
+ * @param data
+ * @returns {*}
+ */
+export const executionInfoSearch = data => createAPI(`/plm/changeManagement/executionInfoSearch`,'post',data)
+
+/**
+ * 查询变更明细
+ * @param data
+ * @returns {*}
+ */
+export const requestDetailSearch = data => createAPI(`/plm/changeManagement/requestDetailSearch`,'post',data)
+
+/**
+ * 删除变更明细
+ * @param data
+ * @returns {*}
+ */
+export const deleteChangeDetail = data => createAPI(`/plm/changeManagement/deleteChangeDetail`,'post',data)
+
+/**
+ * 编辑变更单基础信息
+ * @param data
+ * @returns {*}
+ */
+export const changeRequestUpdate = data => createAPI(`/plm/changeManagement/changeRequestUpdate`,'post',data)
+
+/**
+ * 查询所选择的ECN种类
+ * @param data
+ * @returns {*}
+ */
+export const getChooseEcnType = data => createAPI(`/plm/changeManagement/getChooseEcnType`,'post',data)
+
+/**
+ * 修改执行信息
+ * @param data
+ * @returns {*}
+ */
+export const executionUpdate = data => createAPI(`/plm/changeManagement/executionUpdate`,'post',data)
+
+/**
+ * 新增会签信息
+ * @param data
+ * @returns {*}
+ */
+export const countersignatureSave = data => createAPI(`/plm/changeManagement/countersignatureSave`,'post',data)
+
+/**
+ * 查询会签信息
+ * @param data
+ * @returns {*}
+ */
+export const countersignatureSearch = data => createAPI(`/plm/changeManagement/countersignatureSearch`,'post',data)
+
+/**
+ * 编辑会签信息
+ * @param data
+ * @returns {*}
+ */
+export const countersignatureUpdate = data => createAPI(`/plm/changeManagement/countersignatureUpdate`,'post',data)
 
 
 

src/views/modules/base/propertiesItem/propertiesItem.vue

@@ -14,6 +14,7 @@
           <el-option label="IP" value="IP"></el-option>
           <el-option label="MP" value="MP"></el-option>
           <el-option label="BM" value="BM"></el-option>
+          <el-option label="ECN" value="ECN"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="' '">
@@ -116,6 +117,7 @@
             <el-option label="IP" value="IP"></el-option>
             <el-option label="MP" value="MP"></el-option>
             <el-option label="BM" value="BM"></el-option>
+            <el-option label="ECN" value="ECN"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item :label="'是否值可选'" prop="valueChooseFlag" :rules="rules.valueChooseFlagType">

src/views/modules/base/propertiesItem/propertiesModel.vue

@@ -14,6 +14,7 @@
           <el-option label="IP" value="IP"></el-option>
           <el-option label="MP" value="MP"></el-option>
           <el-option label="BM" value="BM"></el-option>
+          <el-option label="ECN" value="ECN"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="'在用'">
@@ -127,6 +128,7 @@
             <el-option label="IP" value="IP"></el-option>
             <el-option label="MP" value="MP"></el-option>
             <el-option label="BM" value="BM"></el-option>
+            <el-option label="ECN" value="ECN"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="是否在用:" prop="active" :rules="rules.activeType">

src/views/modules/base/upload_file.vue

@@ -12,7 +12,7 @@
         <el-row>
           <el-col :span="24">
             <el-upload class="customer-upload" drag
-                       action="javascript:void(0);" ref="uploadFile" :limit="1"
+                       action="javascript:void(0);" ref="uploadFile" :limit="3"
                        :before-upload="beforeUploadHandle" :on-change="onChange"
                        accept="*" :auto-upload="false"
                        style="text-align: left;">
@@ -32,7 +32,7 @@
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="saveUploadFile()">保存</el-button>
+        <el-button type="primary" @click="saveUploadFile">保存</el-button>
         <el-button type="primary" @click="closeDialog">关闭</el-button>
       </span>
     </el-dialog>
@@ -54,8 +54,9 @@ export default {
         createBy: '',
         dataNo: '',
         fileRemark: '',
-        folder: '',
+        folder: ''
       },
+
     }
   },
   methods: {
@@ -79,41 +80,46 @@ export default {
     // 关闭modal
     closeDialog () {
       this.fileList = []
-      // 刷新报工的页面
-      this.$emit('refreshPageTables')
+      this.$refs.uploadFile.clearFiles()
       // 关闭当前的页面
       this.visible = false
     },
 
     // 保修当前的数据
     saveUploadFile () {
-      let remark = this.pageData.fileRemark
-      if (remark == null) {
-        remark = ''
+      if (this.pageData.fileRemark == null) {
+        this.pageData.fileRemark = ''
       }
       // 判断文件是否上传
       if (this.fileList == null || this.fileList.length === 0) {
         this.$message.error("请先上传文件!")
         return false
       }
-      const formData = new FormData()
-      //片接文件
-      formData.append("file", this.fileList[0].raw)
-      formData.append("orderRef1", this.pageData.site)
-      formData.append("orderRef2", this.pageData.dataNo)
-      formData.append("fileRemark", remark)
-      formData.append("folder", this.pageData.folder)
-      uploadFile(formData).then(({data}) => {
-        if (data.code === 0) {
-          this.$message.success(data.msg)
-          // 清空文件上传记录
-          this.$refs.uploadFile.clearFiles()
-          this.pageData.fileRemark = ''
-          this.fileList = []
-        }else {
-          this.$message.warning(data.msg)
-        }
-      })
+
+      // const formData = new FormData()
+      // //片接文件
+      // formData.append("file", this.fileList[0].raw)
+      // formData.append("orderRef1", this.pageData.site)
+      // formData.append("orderRef2", this.pageData.dataNo)
+      // formData.append("fileRemark", this.pageData.fileRemark)
+      // formData.append("folder", this.pageData.folder)
+
+      this.pageData.file = this.fileList[0].raw
+      this.$emit('refreshPageTables', this.pageData)
+      this.$message.success('Successful!')
+      this.closeDialog()
+
+      // uploadFile(formData).then(({data}) => {
+      //   if (data.code === 0) {
+      //     this.$message.success(data.msg)
+      //     // 清空文件上传记录
+      //     this.$refs.uploadFile.clearFiles()
+      //     this.pageData.fileRemark = ''
+      //     this.fileList = []
+      //   }else {
+      //     this.$message.warning(data.msg)
+      //   }
+      // })
     }
 
   }

src/views/modules/customer/customerInformationManagement.vue

@@ -222,12 +222,12 @@
         <el-form-item label="联系电话(3)">
           <el-input v-model="contactModalData.contactPhoneNumber3" :readonly="contactDetailModalFlag" style="width: 222px"></el-input>
         </el-form-item>
-        <el-form-item label="公司职务" prop="position" :rules="contactRules.position">
+        <el-form-item label="公司职务">
           <el-input v-model="contactModalData.position" :readonly="contactDetailModalFlag" style="width: 222px"></el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="contactModalData" :rules="contactRules" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item label="部门" prop="departmentName">
+        <el-form-item label="部门">
           <el-input v-model="contactModalData.departmentName" :readonly="contactDetailModalFlag" style="width: 144px"></el-input>
         </el-form-item>
         <el-form-item label="默认联系人" prop="primaryContact" :rules="contactRules.primaryContact">
@@ -1686,63 +1686,63 @@
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           customerDesc: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           customerIndustry: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           customerCurrency: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           contactName: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           contactPhoneNumber1: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           importantCustomer: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           customerStatus: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           customerType: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
         },
@@ -1751,35 +1751,35 @@
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           position: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           primaryContact: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           contactStatus: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           contactPhoneNumber1: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ]
         },
@@ -1788,28 +1788,28 @@
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           defaultAddress: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           addressStatus: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           addressType: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ]
         },
@@ -1818,56 +1818,56 @@
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           projectName: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           projectSourceDesc: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           priorityDesc: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           needDate: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           projectManagerName: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           projectOwnerName: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           userRoleName: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ]
         },
@@ -2097,7 +2097,7 @@
           departmentName:'',
           mailbox: '',
           primaryContact: 'N',
-          contactStatus: '',
+          contactStatus: '启用',
           remark: '',
           createDate: '',
           createBy: this.$store.state.user.name,
@@ -2708,14 +2708,14 @@
           this.$message.warning('请输入联系人电话(1)！')
           return
         }
-        if (this.contactModalData.position === '' || this.contactModalData.position == null) {
-          this.$message.warning('请输入公司职务！')
-          return
-        }
-        if(this.contactModalData.departmentName === '' || this.contactModalData.departmentName == null){
-          this.$message.warning('请输入部门名称')
-          return
-        }
+        // if (this.contactModalData.position === '' || this.contactModalData.position == null) {
+        //   this.$message.warning('请输入公司职务！')
+        //   return
+        // }
+        // if(this.contactModalData.departmentName === '' || this.contactModalData.departmentName == null){
+        //   this.$message.warning('请输入部门名称')
+        //   return
+        // }
         if (this.contactModalData.primaryContact === '' || this.contactModalData.primaryContact == null) {
           this.$message.warning('请选择是否为默认联系人！')
           return

src/views/modules/sys/dict-data-select.vue

@@ -36,7 +36,7 @@ export default {
     },
     disabledOptionsValue:{
       type:Array,
-      default:[],
+      default:()=>[],
     }
   },
   data () {