luobang 3 роки тому
батько
коміт
a2f29c9496

+ 1 - 1
build/utils.js

@@ -17,7 +17,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 
 // let devModules = ['all']
-let devModules = ['index','TMS']
+let devModules = ['index','TMS','appoint']
 // let devModules = ['index','inward']
 // let devModules = ['index','SporadicManage','RMS','statisticalReport']
 // let devModules = ['index','inward','statisticalReport']

+ 2 - 2
config/index.js

@@ -64,8 +64,8 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-      target: "http://172.16.33.166:8080",
-    // target: "http://localhost:8080",
+    //  target: "http://172.16.33.166:8080",
+    target: "http://localhost:8081",
     //target: "http://localhost:8019",
     ws: true,
     pathRewrite: {

+ 32 - 14
src/components/DilCommonUI/packages/table/src/table.vue

@@ -7,7 +7,7 @@
       row-key="ROW_ID"
       :stripe="stripe"
       :border="border"
-      :row-class-name="rowClassName"
+      :row-class-name="tableRowClassName"
       :cell-class-name="cellClassName"
       :height="height"
       :highlight-current-row="highlightCurrentRow"
@@ -200,11 +200,11 @@ export default {
       default: true,
     },
     // 行的 className 的回调方法,也可以使用字符串为所有行设置一个固定的 className。
-    rowClassName: {
-      default() {
-        return ({ row, rowIndex }) => "";
-      },
-    },
+    // rowClassName: {
+    //   default() {
+    //     return ({ row, rowIndex }) => "";
+    //   },
+    // },
     // 单元格的 className 的回调方法,也可以使用字符串为所有单元格设置一个固定的 className。
     cellClassName: {
       default() {
@@ -268,18 +268,36 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@media print {
-  .el-pagination {
-    display: none;
+
+.el-table .warning-row {
+    background: #fff ;
+    font-size: 22px;
+    height: 44px;
+    line-height: 46px;
+    font-size: 22px;
+    font-weight: 700;
   }
-  
-}
- /deep/.el-table .success-row {
-    background: #fff !important;
-    color: #f56c6c;
+
+  .el-table .success-row {
+    background: #fff ;
+    font-size: 22px;
     height: 44px;
     line-height: 46px;
     font-size: 22px;
     font-weight: 700;
   }
+@media print {
+  .el-pagination {
+    display: none;
+  }
+  
+}
+//  /deep/.el-table .success-row {
+//     background: #fff !important;
+//     color: #f56c6c;
+//     height: 44px;
+//     line-height: 46px;
+//     font-size: 22px;
+//     font-weight: 700;
+//   }
 </style>

+ 6 - 4
src/views/TMS/components/bmsport/handlingFee.vue

@@ -3,9 +3,6 @@
   <div class="homeworkPath">
     <div class="top">
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
       <el-button type="primary" class="btn" @click="addclick">
         新增
       </el-button>
@@ -91,7 +88,12 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+    .el-input {
+      margin-left: 2.5rem;
+      margin-top: 2.5rem;
+      margin-bottom: 2.5rem;
+      width: 250px;
+    }
   }
 }
 </style>

+ 20 - 9
src/views/appoint/components/purchase/addOtherPrice.vue

@@ -2,20 +2,13 @@
   <!-- 添加其他价格 -->
   <div class="addShipPrice">
     <page-title>新增</page-title>
-    <el-divider content-position="left">添加其他价格</el-divider>
-     <div class="form-box" style="margin-right: 10rem">
+     <div class="form-box">
         <dil-form :formId="221" v-model="form1" ref="from1"></dil-form>
       </div>
     <div class="button-box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
     </div>
-    <!-- <div class="primarybtn">
-      <el-button class="btn" @click="goback">取消</el-button>
-      <el-button type="primary" class="btn" @click="submitclick"
-        >确定</el-button
-      >
-    </div> -->
   </div>
 </template>
 
@@ -62,5 +55,23 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-
+  .form-box {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    .el-form-item {
+      display: flex;
+      .el-form-item__label {
+        width: 170px !important;
+      }
+      .el-input {
+        width: 210px !important;
+      }
+    }
+  }
+  .button-box {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
 </style>

+ 7 - 8
src/views/appoint/components/purchase/otherPrice.vue

@@ -2,15 +2,13 @@
   <!-- 其他单价页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input v-model="input" placeholder="请输入内容"></el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
+      <el-input></el-input>
       <el-button type="primary" @click="btnclick()">
         新增
       </el-button>
     </div>
-    <dilTable v-bind.sync="option">
+    <div>
+      <dilTable v-bind.sync="option">
       <el-table-column fixed="right" label="操作" align="center" width="150">
         <template slot-scope="scope">
           <el-button @click="click(scope.row.priceId)" type="text" size="small"
@@ -25,6 +23,7 @@
         </template>
       </el-table-column>
     </dilTable>
+    </div> 
   </div>
 </template>
 
@@ -45,9 +44,6 @@ export default {
     
   },
   methods: {
-    handleSelect(item) {
-      console.log(item);
-    },
     onclick() {
       console.log(1);
     },
@@ -103,6 +99,9 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
+    .el-input {
+      width: 250px;
+    }
     padding: 1.25rem 1.875rem;
   }
 }

+ 19 - 6
src/views/appoint/components/purchase/updateOtherPrice.vue

@@ -2,10 +2,6 @@
   <!-- 修改其他价格信息 -->
   <div id="contractDetails">
     <page-title>编辑</page-title>
-    <div class="main">
-      <span class="text">修改其他价格信息</span>
-      <span class="a"></span>
-    </div>
     <div class="contractTitle">
       <div class="form-box">
         <div class="form-one">
@@ -13,7 +9,6 @@
         </div>
       </div>
     </div>
-
     <div class="button-box">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
@@ -81,5 +76,23 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-
+    .form-box {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    .el-form-item {
+      display: flex;
+      .el-form-item__label {
+        width: 170px !important;
+      }
+      .el-input {
+        width: 210px !important;
+      }
+    }
+  }
+  .button-box {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
 </style>