plm BM

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

@@ -4,7 +4,7 @@
       <el-row :gutter="20">
         <el-col :span="6"><div class="grid-content bg-purple">
           <el-form-item :label="'BenchmarkNo'">
-            <el-input v-model="dataForm.codeNo" disabled  ></el-input>
+            <el-input v-model="dataForm.oriCodeNo" disabled  ></el-input>
           </el-form-item>
         </div></el-col>
         <el-col :span="6"><div class="grid-content bg-purple">

src/views/modules/sampleManagement/technicalSpecificationList.vue

@@ -346,6 +346,23 @@
         exportList:[],
         columnList1:[
           {
+            userId: this.$store.state.user.name,
+            functionId: 103002,
+            serialNumber: '103002Table1BuNo',
+            tableId: "103002Table1",
+            tableName: "技术参数卡列表",
+            columnProp: "buNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "部门编号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 60
+          },{
             userId: this.$store.state.user.name,
             functionId: 103002,
             serialNumber: '103002Table1OriCodeNo',
@@ -361,24 +378,24 @@
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 80
+            columnWidth: 100
           },{
             userId: this.$store.state.user.name,
             functionId: 103002,
-            serialNumber: '103002Table1BuNo',
+            serialNumber: '103002Table1RevNo',
             tableId: "103002Table1",
             tableName: "技术参数卡列表",
-            columnProp: "buNo",
+            columnProp: "revNo",
             headerAlign: "center",
             align: "left",
-            columnLabel: "部门编号",
+            columnLabel: "版本号",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 60
+            columnWidth: 50
           },{
             userId: this.$store.state.user.name,
             functionId: 103002,
@@ -395,7 +412,7 @@
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 80
+            columnWidth: 100
           },{
             userId: this.$store.state.user.name,
             functionId: 103002,
@@ -446,7 +463,7 @@
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 80
+            columnWidth: 140
           },{
             userId: this.$store.state.user.name,
             functionId: 103002,
@@ -463,7 +480,7 @@
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 80
+            columnWidth: 110
           },{
             userId: this.$store.state.user.name,
             functionId: 103002,
@@ -515,23 +532,6 @@
             status: true,
             fixed: '',
             columnWidth: 120
-          },{
-            userId: this.$store.state.user.name,
-            functionId: 103002,
-            serialNumber: '103002Table1RevNo',
-            tableId: "103002Table1",
-            tableName: "技术参数卡列表",
-            columnProp: "revNo",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "版本号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 50
           },{
             userId: this.$store.state.user.name,
             functionId: 103002,

src/views/modules/tooling/searchToolApply.vue

@@ -216,7 +216,7 @@
       </el-tab-pane>
     </el-tabs>
     <el-dialog
-      width="800px" v-drag
+      width="600px" v-drag
       :title="'处理信息'"
       :close-on-click-modal="false"
       :visible.sync="modelFlag">
@@ -224,36 +224,36 @@
         <el-row :gutter="15" v-if="this.currentRow.statusCode==='50'">
           <el-col :span="6">
             <el-form-item label="IFS PR编号" >
-              <el-input v-model="modelData.prNo"  readonly></el-input>
+              <el-input v-model="modelData.prNo"  ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="18">
             <el-form-item label="备注" >
-              <el-input v-model="modelData.remark1" readonly></el-input>
+              <el-input v-model="modelData.remark1" ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="15" style="margin-top: 20px" v-if="this.currentRow.statusCode==='60'">
           <el-col :span="6">
             <el-form-item label="采购订单号" >
-              <el-input v-model="modelData.poNo" readonly ></el-input>
+              <el-input v-model="modelData.poNo"  ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂商名称" >
-              <el-input v-model="modelData.supplierName" readonly></el-input>
+              <el-input v-model="modelData.supplierName" ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="总成本(元)" >
-              <el-input v-model="modelData.allCost" type="number" readonly></el-input>
+              <el-input v-model="modelData.allCost" type="number" ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="15" style="margin-top: 0px">
           <el-col :span="24">
             <el-form-item label="备注" >
-              <el-input v-model="modelData.remark2" readonly></el-input>
+              <el-input v-model="modelData.remark2" ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -1003,7 +1003,7 @@
           })
           return false;
         }
-        this.modalData={
+        this.modelData={
           site:this.currentRow.site,
           applyNo:this.currentRow.applyNo,
           prNo:this.currentRow.prNo,
@@ -1021,15 +1021,15 @@
           cancelButtonText:'取消',
           type:'warning'
         }).then(()=>{
-          saveHeaderMessage(this.modalData).then(({data}) => {
+          saveHeaderMessage(this.modelData).then(({data}) => {
             if (data && data.code == 0) {
               this.modelFlag=false;
-              this.currentRow.prNo=this.modalData.prNo
-              this.currentRow.remark1=this.modalData.remark1
-              this.currentRow.poNo=this.modalData.poNo
-              this.currentRow.supplierName=this.modalData.supplierName
-              this.currentRow.allCost=this.modalData.allCost
-              this.currentRow.remark2=this.modalData.remark2
+              this.currentRow.prNo=this.modelData.prNo
+              this.currentRow.remark1=this.modelData.remark1
+              this.currentRow.poNo=this.modelData.poNo
+              this.currentRow.supplierName=this.modelData.supplierName
+              this.currentRow.allCost=this.modelData.allCost
+              this.currentRow.remark2=this.modelData.remark2
               this.$message({
                 message: '操作成功',
                 type: 'success',