Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0

src/api/Inventory/SubstitutePart.js

@@ -102,7 +102,7 @@ export function addSubstitutepart(data1, data2, data3, data4, data5, data6, data
     data: {
       type: '2',
       name: '库存管理_替换件_零件替换',
-      param: '离线合同明细流水号=' + data1 + '&替换件组件零件流水号=' + data2 + '&替换单编号=' + data3 + '&替换件名称=' + data4 + '&被替换件名称=' + data5 + '&申请人=' + data6 + '&替换数量=' + data7 + '&备注=' + data8
+      param: '离线合同明细流水号=' + data1 + '&替换件采购合同明细流水号=' + data2 + '&替换单编号=' + data3 + '&替换件名称=' + data4 + '&被替换件名称=' + data5 + '&申请人=' + data6 + '&替换数量=' + data7 + '&备注=' + data8
     }
   })
 }

src/views/Inventory/PartOut/index.vue

@@ -8,6 +8,7 @@
         v-loading="listLoading"
         :data="tableData1"
         border
+        size="mini"
         style="width: 100%;"
         height="300">
         <el-table-column
@@ -32,7 +33,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="200px">
           <template slot-scope="scope" align="center">
-            <el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="chooseListinfor(scope.row)">选择</el-button>
+            <el-button size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="chooseListinfor(scope.row)">选择</el-button>
           </template>
         </el-table-column>
       </el-table>

src/views/Inventory/SubPartCome/index.vue

@@ -12,6 +12,7 @@
         v-loading="listLoading"
         :data="tableDataExchange"
         border
+        size="mini"
         style="width: 100%;"
         height="450">
         <el-table-column

src/views/Inventory/SubstitutePart/index.vue

@@ -445,7 +445,7 @@ export default {
     },
     // 增加交换件
     addListDetailinfor() {
-      addSubstitutepart(this.tableData2[0].离线合同明细流水号, this.tableData1[0].组件零件流水号, this.form.ExchangeNumber, this.tableData1[0].物料名称, this.tableData2[0].物料名称, this.picikingPeople, this.form.ExchangeNumberx, this.form.ExchangeNote).then(response => {
+      addSubstitutepart(this.tableData2[0].离线合同明细流水号, this.tableData1[0].采购合同明细流水号, this.form.ExchangeNumber, this.tableData1[0].物料名称, this.tableData2[0].物料名称, this.picikingPeople, this.form.ExchangeNumberx, this.form.ExchangeNote).then(response => {
         if (response.data[0].result === '1') {
           this.$message.success('增加成功')
         } else { this.$message.error('增加失败') }

src/views/PurchasingCenter/CreatePurchaseContract/index.vue

@@ -73,7 +73,7 @@
           </el-col>
         </el-row>
       </el-form>
-      <el-table :data="tableData1" border style="margin-bottom: 10px;max-height: 300px;" height="300px" size="mini" show-summary>
+      <el-table :data="tableData1" border style="margin: 10px 0;max-height: 300px;" height="300px" size="mini" show-summary>
         <el-table-column label="序号" align="center" width="50" type="index"/>
         <el-table-column label="交货期" align="center" min-width="130">
           <template slot-scope="scope">
@@ -510,8 +510,8 @@ export default {
         document.getElementById('untaxTotal') ? document.getElementById('untaxTotal').innerHTML = this.untaxTotal : ''
         document.getElementById('tax') ? document.getElementById('tax').innerHTML = this.tax : ''
         document.getElementById('taxTotal') ? document.getElementById('taxTotal').innerHTML = this.taxTotal : ''
-        document.getElementsByClassName('actualTotal') ? document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal : ''
+        document.getElementsByClassName('actualTotal')[0] ? document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal : ''
-        document.getElementsByClassName('actualTotal') ? document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal : ''
+        document.getElementsByClassName('actualTotal')[1] ? document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal : ''
         document.getElementById('actualTotal_zh') ? document.getElementById('actualTotal_zh').innerHTML = this.actualTotal_zh : ''
         this.contentNew = document.getElementsByClassName('editor-content')[0].innerHTML
         this.$refs.tinymce.initTinymce()
@@ -579,4 +579,7 @@ export default {
   span{
     margin: 0 0 0 20px;
   }
+  .el-form-item{
+    margin: 0;
+  }
 </style>

src/views/PurchasingCenter/PurchaseContractSearch/index.vue

@@ -56,6 +56,7 @@
     <el-card>
       <el-table
         v-loading="loading1"
+        id="expandTable"
         :data="tableData1"
         size="mini"
         border
@@ -363,7 +364,7 @@ export default {
   }
 </style>
 <style>
-  .el-form-item {
+  #expandTable .el-form-item {
     margin: 0;
   }
 </style>