前端

src/views/contractManagement/component/routers/route.js

@@ -94,72 +94,72 @@ const contractManagementRouter = {
       },
       hidden: true
     },
-    // 收购合同
-    // {
-    //   path: 'acquisitionContract',
-    //   component: () =>
-    //     import(/* webpackChunkName: "sparepartList" */ '@/views/contractManagement/acquisitionContract'),
-    //   name: 'acquisitionContract',
-    //   meta: {
-    //     title: 'acquisitionContract',
-    //     shortcutEntrance: 'contractManagement',
-    //     module: 'contractManagement.buyContract',
-    //     permissicon: [],
-    //     keepAlive: true,
-    //     _title:'收购合同'
-    //   }
-    // },
-    // //收购合同查看
-    // {
-    //   path: 'acquisitionContractExamine',
-    //   component: () =>
-    //     import(/* webpackChunkName: "applDetail" */ '@/views/contractManagement/acquisitionContractExamine'),
-    //   name: 'acquisitionContractExamine',
-    //   meta: {
-    //     title: 'acquisitionContractExamine',
-    //     shortcutEntrance: 'contractManagement',
-    //     module: 'contractManagement.buyContract.buyContractInfo.view',
-    //     permissicon: [],
-    //     keepAlive: true,
-    //     _title:'收购合同查看'
-    //     // module: 'procurement.sparepart.applDetail'
-    //   },
-    //   hidden: true
-    // },
-    // //收购合同编辑
-    // {
-    //   path: 'acquisitionContractEdit',
-    //   component: () =>
-    //     import(/* webpackChunkName: "applDetail" */ '@/views/contractManagement/acquisitionContractEdit'),
-    //   name: 'acquisitionContractEdit',
-    //   meta: {
-    //     title: 'acquisitionContractEdit',
-    //     shortcutEntrance: 'contractManagement',
-    //     module: 'contractManagement.buyContract.buyContractInfo.edit',
-    //     permissicon: [],
-    //     keepAlive: true,
-    //     _title:'收购合同编辑'
-    //     // module: 'procurement.sparepart.applDetail'
-    //   },
-    //   hidden: true
-    // },
-    // //收购合同添加
-    // {
-    //   path: 'acquisitionContractAdd',
-    //   component: () =>
-    //     import(/* webpackChunkName: "applDetail" */ '@/views/contractManagement/acquisitionContractAdd'),
-    //   name: 'acquisitionContractAdd',
-    //   meta: {
-    //     title: 'acquisitionContractAdd',
-    //     shortcutEntrance: 'contractManagement',
-    //     module: 'contractManagement.buyContract.buyContractInfo.add',
-    //     permissicon: [],
-    //     keepAlive: true,
-    //     _title:'收购合同添加'
-    //     // module: 'procurement.sparepart.applDetail'
-    //   },
-    //   hidden: true
-    // },
+    收购合同
+    {
+      path: 'acquisitionContract',
+      component: () =>
+        import(/* webpackChunkName: "sparepartList" */ '@/views/contractManagement/acquisitionContract'),
+      name: 'acquisitionContract',
+      meta: {
+        title: 'acquisitionContract',
+        shortcutEntrance: 'contractManagement',
+        module: 'contractManagement.buyContract',
+        permissicon: [],
+        keepAlive: true,
+        _title:'收购合同'
+      }
+    },
+    //收购合同查看
+    {
+      path: 'acquisitionContractExamine',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/contractManagement/acquisitionContractExamine'),
+      name: 'acquisitionContractExamine',
+      meta: {
+        title: 'acquisitionContractExamine',
+        shortcutEntrance: 'contractManagement',
+        module: 'contractManagement.buyContract.buyContractInfo.view',
+        permissicon: [],
+        keepAlive: true,
+        _title:'收购合同查看'
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden: true
+    },
+    //收购合同编辑
+    {
+      path: 'acquisitionContractEdit',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/contractManagement/acquisitionContractEdit'),
+      name: 'acquisitionContractEdit',
+      meta: {
+        title: 'acquisitionContractEdit',
+        shortcutEntrance: 'contractManagement',
+        module: 'contractManagement.buyContract.buyContractInfo.edit',
+        permissicon: [],
+        keepAlive: true,
+        _title:'收购合同编辑'
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden: true
+    },
+    //收购合同添加
+    {
+      path: 'acquisitionContractAdd',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/contractManagement/acquisitionContractAdd'),
+      name: 'acquisitionContractAdd',
+      meta: {
+        title: 'acquisitionContractAdd',
+        shortcutEntrance: 'contractManagement',
+        module: 'contractManagement.buyContract.buyContractInfo.add',
+        permissicon: [],
+        keepAlive: true,
+        _title:'收购合同添加'
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden: true
+    },
 
     // 期货采购合同
     // {

src/views/warehousenew/warehousingOrder.vue

@@ -85,13 +85,13 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="contractNo" label="合同编号" width="80"></el-table-column>
-        <el-table-column prop="goodsSource" label="货源" width="80">
+        <el-table-column prop="contractNo" label="合同编号" width="130"></el-table-column>
+        <el-table-column prop="goodsSource" label="货源" width="130">
            <template scope="scope">
              <span style='color:#66b1ff;' @click='lookcustomer(scope.row)'>{{scope.row.goodsSource}}</span>
             </template>
         </el-table-column>
-        <el-table-column prop="deliveryWarehouse" label="发货库" width="80"></el-table-column>
+        <el-table-column prop="deliveryWarehouse" label="发货库" width="130"></el-table-column>
         <!-- <el-table-column prop="customer" label="客户" width="100">
            <template scope="scope">
              <span @click='lookcustomer(scope.row)'>{{scope.row.customer}}</span>
@@ -99,7 +99,7 @@
         </el-table-column> -->
         <el-table-column prop="goodsName" label="货名" width="60">
         </el-table-column>
-        <el-table-column prop="inWarehouseWeight1"  width="140" class="table_td" label="入库重量（吨）">
+        <el-table-column prop="inWarehouseWeight1"  width="120" class="table_td" label="入库重量">
           <template scope="scope">
             <span v-if='scope.row.weightedit==false&&scope.row.warehouseType==2||scope.row.warehouseType==1'>{{scope.row.inWarehouseWeight1}}</span>
             <el-input style='width:80%;' v-if='scope.row.weightedit&&scope.row.warehouseType==2' v-model='scope.row.inWarehouseWeight1'></el-input>
@@ -109,31 +109,31 @@
               src="../../../public/img/edit.png" @click="editWeight(scope.row)" alt="" />
           </template>
         </el-table-column>
-        <el-table-column prop="outWarehouseWeight"  width="110" class="table_td" label="出库重量（吨）"></el-table-column>
+        <el-table-column prop="outWarehouseWeight"  width="80" class="table_td" label="出库重量"></el-table-column>
         <el-table-column prop="profitAndLoss" class="table_td" label="盈亏（吨）"></el-table-column>
-        <el-table-column prop="surplusWeight" width="110" class="table_td" label="剩余重量（吨）"></el-table-column>
-        <el-table-column prop="grainFund"  width="100" class="table_td" label="粮款（元）"></el-table-column>
-        <el-table-column prop="amountEdPayable"  width="100" class="table_td" label="已付（元）">
+        <el-table-column prop="surplusWeight" width="80" class="table_td" label="剩余重量"></el-table-column>
+        <el-table-column prop="grainFund"  width="80" class="table_td" label="粮款（元）"></el-table-column>
+        <el-table-column prop="amountEdPayable"  width="90" class="table_td" label="已付（元）">
           <template scope="scope">
             <span >{{scope.row.amountEdPayable}}</span>
             <img v-if='scope.row.addressUrl' width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
             src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
           </template>
         </el-table-column>
-        <el-table-column prop="amountNotPayable" class="table_td" label="未付（元）"></el-table-column>
+        <el-table-column prop="amountNotPayable" width="80" class="table_td" label="未付（元）"></el-table-column>
         <el-table-column prop="amountMoney" width="80" class="table_td" label="费用（元）">
           <template scope="scope">
             <span @click='costclick(scope.row)'>{{scope.row.amountMoney}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="avgCost"  width="130" class="table_td" label="平均成本（元/吨）"></el-table-column>
-        <el-table-column prop="requestFunds"  width="130" class="table_td" label="请款">
+        <el-table-column prop="avgCost"  width="90" class="table_td" label="平均成本"></el-table-column>
+        <el-table-column prop="requestFunds"  width="130" class="table_td tablerequestFunds" label="请款">
           <template scope="scope">
             <span v-if="!scope.row.select">{{ scope.row.requestFunds }}</span>
             <el-input v-else v-model='scope.row.requestFunds'></el-input>
           </template>
         </el-table-column>
-         <el-table-column prop="remark"  width="130" class="table_td" label="请款备注">
+         <el-table-column prop="remark"  width="80" class="table_td" label="请款备注">
           <template scope="scope">
             <div v-if="!scope.row.select" @click.stop="lookRemark(scope.row)">
               <span class="text_css">查看</span>
@@ -1493,4 +1493,10 @@ multiFilter(array, filters) {
   height:100px;
   line-height:100px;
 }
+/deep/.el-table .cell .el-input {
+    padding:10px;
+}
+// /deep/.el-table .cell{
+//   padding:0;
+// }
 </style>