plm BM

src/api/sampleManagement/technicalSpecificationList.js

@@ -94,3 +94,6 @@ export const updateBMBomRev= data => createAPI(`/technicalSpecification/updateBM
 export const searchRouteDetail= data => createAPI(`/technicalSpecification/searchRouteDetail`,'post',data)
 export const updateBMRouteRev= data => createAPI(`/technicalSpecification/updateBMRouteRev`,'post',data)
 
+export const searchBMRemarkPage= data => createAPI(`/technicalSpecification/searchBMRemarkPage`,'post',data)
+
+export const updateBMRemarkPage= data => createAPI(`/technicalSpecification/updateBMRemarkPage`,'post',data)

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

@@ -1,6 +1,6 @@
 <template>
   <div class="mod-config">
-      <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;"   v-if="searchData.buNo==='DBE'">
+      <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
         <el-form-item >
           <el-button type="primary" @click="colorSearch()" >刷新</el-button>
           <el-button type="primary" @click="newColor()" v-if="!ifDisableFlag">新增</el-button>
@@ -162,8 +162,8 @@
         </el-row>
       </el-form>
 
-    <el-form label-position="top" style="margin-top:60px; margin-left: 0px;text-align:center">
-      <el-button type="primary" @click="saveData()" v-if="searchData.buNo==='DBE'" >保存</el-button>
+    <el-form label-position="top" style="margin-top:60px; margin-left: 0px;text-align:center" v-if="!ifDisableFlag">
+      <el-button type="primary" @click="saveData()"  >保存</el-button>
     </el-form>
 
 

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

@@ -1,6 +1,6 @@
 <template>
   <div class="mod-config">
-      <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;"   v-if="searchData.buNo==='DBE'||searchData.buNo==='SS'">
+      <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;"   >
         <el-form-item >
           <el-button type="primary" @click="cutSearch()" >刷新</el-button>
           <el-button type="primary" @click="newCut()" v-if="!ifDisableFlag">新增</el-button>
@@ -66,8 +66,8 @@
         </el-row>
       </el-form>
 
-    <el-form label-position="top" style="margin-top:60px; margin-left: 0px;text-align:center">
-      <el-button type="primary" @click="saveData()" v-if="searchData.buNo==='DBE'||searchData.buNo==='SS'" >保存</el-button>
+    <el-form label-position="top" style="margin-top:60px; margin-left: 0px;text-align:center" v-if="!ifDisableFlag">
+      <el-button type="primary" @click="saveData()" >保存</el-button>
     </el-form>
 
 

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

@@ -36,7 +36,7 @@
       </el-row>
     </el-form>
 
-      <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;"   v-if="searchData.buNo==='SS'||searchData.buNo==='DBE'">
+      <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;"   v-if="searchData.buNo!=='Flexo'">
         <el-form-item >
           <el-button type="primary" @click="colorSearch()" >刷新</el-button>
           <el-button type="primary" @click="newColor()" v-if="!ifDisableFlag">新增</el-button>
@@ -165,7 +165,7 @@
         </el-row>
       </el-form>
 
-    <el-form label-position="top" style="margin-top:60px; margin-left: 0px;text-align:center" v-if="!ifDisableFlag&&(searchData.buNo==='Flexo'||searchData.buNo==='SS'||searchData.buNo==='DBE')">
+    <el-form label-position="top" style="margin-top:60px; margin-left: 0px;text-align:center" v-if="!ifDisableFlag">
       <el-button type="primary" @click="saveData()"  >保存</el-button>
     </el-form>
 

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

@@ -1,7 +1,7 @@
 <template>
   <div class="mod-config">
 
-      <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;"   v-if="searchData.buNo==='Flexo'">
+      <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;"  >
         <el-form-item >
           <el-button type="primary" @click="colorSearch()" >刷新</el-button>
           <el-button type="primary" @click="newColor()" v-if="!ifDisableFlag">新增</el-button>
@@ -94,7 +94,7 @@
         </el-row>
       </el-form>
 
-    <el-form label-position="top" style="margin-top:60px; margin-left: 0px;text-align:center" v-if="!ifDisableFlag&&searchData.buNo==='Flexo'">
+    <el-form label-position="top" style="margin-top:60px; margin-left: 0px;text-align:center" v-if="!ifDisableFlag">
       <el-button type="primary" @click="saveData()"  >保存</el-button>
     </el-form>
 

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

@@ -0,0 +1,136 @@
+<template>
+  <div class="mod-config">
+    <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
+      <el-form-item style="">
+        <el-button type="primary" @click="saveData()" v-if="!ifDisableFlag">保存备注</el-button>
+      </el-form-item>
+      <el-form-item style="height: 500px">
+        <el-input
+          type="textarea"
+          v-model="dataForm.remarkPage "
+          :rows="25"
+          resize='none'
+          maxlength="500"
+          :disabled="ifDisableFlag"
+          style="height: 500px" >
+        </el-input>
+      </el-form-item>
+    </el-form>
+
+    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+  </div>
+</template>
+
+<script>
+  import {
+    searchBMRemarkPage,
+    updateBMRemarkPage,
+  } from "@/api/sampleManagement/technicalSpecificationList.js"
+  import Chooselist from '@/views/modules/common/Chooselist'
+  export default {
+    components: {
+      Chooselist
+    },
+    data() {
+      return {
+        searchData: {
+          site: '',
+          username: this.$store.state.user.name,
+          codeNo: '',
+          buNo:'',
+        },
+        ifDisableFlag:false,
+        dataForm:{
+          site: '',
+          codeNo:'',
+          remarkPage:'',
+        },
+        dataRole: {
+          partTypeDesc: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          partName: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+        }
+      }
+    },
+    methods: {
+      // 获取基础数据列表S
+      getBaseList (val, type) {
+        this.tagNo = val
+        this.tagNo1 = type
+        this.$nextTick(() => {
+          let strVal = ''
+          if (val === 1013) {
+            if(type==1) {
+              strVal = this.dataForm.partType
+            }
+          }
+          this.$refs.baseList.init(val, strVal)
+        })
+      },
+      /* 列表方法的回调 */
+      getBaseData (val) {
+        if (this.tagNo === 1013) {
+          if(this.tagNo1==1) {
+            this.dataForm.partType = val.Base_id
+            this.dataForm.partTypeDesc = val.Base_desc
+          }
+        }
+      },
+      //初始化组件的参数
+      init(inData) {
+        //初始化参数
+        this.searchData = JSON.parse(JSON.stringify(inData));
+        if(this.searchData.ifDisableFlag){
+          this.ifDisableFlag=true
+        }
+        //刷新表格
+        this.searchTable();
+
+      },
+      searchTable(){
+        searchBMRemarkPage(this.searchData).then(({data}) => {
+          if(data.rows.length>0){
+            this.dataForm = data.rows[0];
+          }else {
+            this.dataForm.site=this.searchData.site
+            this.dataForm.codeNo=this.searchData.codeNo
+          }
+
+
+        });
+      },
+      saveData(){
+        this.$confirm("是否保存信息？", '保存提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+        }).then(() => {
+          console.log(this.dataForm)
+          updateBMRemarkPage(this.dataForm).then(({data}) => {
+            if (data && data.code === 0) {
+              this.$message.success( '操作成功')
+            } else {
+              this.$message.error(data.msg)
+            }
+          })
+        }).catch(() => {
+          return
+        })
+      },
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>

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

@@ -215,7 +215,6 @@
           this.getBaseInfoData();
         }else if(this.activeName == 'customerInfo'){
           //有的页面要高一点
-          this.changeHeight(800);
           this.getCustomerInfo();
         }else if(this.activeName == 'packageInfo'){
           this.getPackageInfo();

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

@@ -4,6 +4,9 @@
         <el-tab-pane label="基本信息"  name="baseInfo" >
           <basicInformation ref="basicInformation"  ></basicInformation>
         </el-tab-pane>
+        <el-tab-pane label="备注区"  name="remarkPage" >
+          <remarkPage ref="remarkPage"  ></remarkPage>
+        </el-tab-pane>
         <el-tab-pane label="客户信息"  name="customerInfo" v-if="getPageIf('customerInfo')">
           <customerInfo ref="customerInfo"  ></customerInfo>
         </el-tab-pane>
@@ -56,6 +59,7 @@
     getBMPageBase
   } from '@/api/sampleManagement/technicalSpecificationList.js'
   import basicInformation from "./com_tsd_basicInformation";/*組件*/
+  import remarkPage from "./com_bm_remarkSlot.vue";/*备注*/
   import customerInfo from "./com_bm_customerInformation";/*客户信息*/
   import packageInfo from "./com_bm_packageInfo";/*包装信息*/
   import bom from "./com_bm_bom";/*BOM*/
@@ -104,6 +108,7 @@
       fai,
       cqeComfirm,
       tpInfo,
+      remarkPage,
     },
     data() {
       return {
@@ -139,6 +144,9 @@
         this.changeHeightAuto()
         if (this.activeName == 'baseInfo') {
           this.getBaseInfoData();
+        }if (this.activeName == 'remarkPage') {
+          this.changeHeight(800);
+          this.getRemarkSlot();
         }else if(this.activeName == 'customerInfo'){
           //有的页面要高一点
           this.changeHeight(800);
@@ -177,6 +185,9 @@
       getBaseInfoData(){
         this.$refs.basicInformation.init(JSON.parse(JSON.stringify(this.dataForm)))
       },
+      getRemarkSlot(){
+        this.$refs.remarkPage.init(JSON.parse(JSON.stringify(this.dataForm)))
+      },
       getCustomerInfo(){
         this.$refs.customerInfo.init(JSON.parse(JSON.stringify(this.dataForm)))
       },

src/views/modules/tooling/toolingInfo.vue

@@ -701,10 +701,10 @@
       changeSum(row){
         // if(row.applyQty!=null&&row.applyQty!==''&& row.toolQuantity<row.applyQty){
         //   row.applyQty=''
-        //   this.$alert('实际申请数量大于表单工具数量！', '错误', {
+        //   this.$alert(data.msg, '错误', {
         //     confirmButtonText: '确定'
         //   })
-        //   return false;
+        //
         // }
         this.dataForm.applySumQty =0
         for (const item of this.toolData) {