zhongtianhaoyuan 4 years ago
parent
commit
c825d74818

+ 8 - 0
src/views/contractManagement/salesContractAdd.vue

@@ -1157,4 +1157,12 @@ export default {
 /deep/el-date-editor--date {
 /deep/el-date-editor--date {
   width: 200px;
   width: 200px;
 }
 }
+/deep/.el-date-editor.el-input{
+  width: 232px;
+}
+/deep/.el-input--small .el-input__inner {
+    height: 32px;
+    line-height: 32px;
+    width: 232px;
+}
 </style>
 </style>

+ 5 - 0
src/views/contractManagement/salesContractEdit.vue

@@ -965,4 +965,9 @@ font-weight: 400;
 color: #AFB5CB;
 color: #AFB5CB;
 line-height: 14px;
 line-height: 14px;
 }
 }
+/deep/.el-input--small .el-input__inner {
+    height: 32px;
+    line-height: 32px;
+    width: 232px;
+}
 </style>
 </style>

+ 6 - 1
src/views/contractManagement/salesContractExamine.vue

@@ -243,7 +243,7 @@
           >{{ deptBudgetList.contractProcessInfo.imperfectGrain }}
           >{{ deptBudgetList.contractProcessInfo.imperfectGrain }}
         </ws-form-item>
         </ws-form-item>
         <ws-form-item label="双章原件回收情况" span="1" prop="grade"
         <ws-form-item label="双章原件回收情况" span="1" prop="grade"
-          >{{ deptBudgetList.contractProcessInfo.grade }}
+          >{{deptBudgetList.contractProcessInfo.grade}}
 
 
         </ws-form-item>
         </ws-form-item>
       </ws-info-table>
       </ws-info-table>
@@ -576,4 +576,9 @@ export default {
   display: inline-block;
   display: inline-block;
   right: 14px;
   right: 14px;
 }
 }
+/deep/.el-input--small .el-input__inner {
+    height: 32px;
+    line-height: 32px;
+    width: 232px;
+}
 </style>
 </style>

+ 1 - 5
vue.config.js

@@ -142,13 +142,9 @@ module.exports = {
 
 
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
-        target: 'http://localhost:8090/',
+        // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.124:8090/',
         // target: 'http://192.168.1.124:8090/',
-<<<<<<< HEAD
         target: 'http://192.168.1.124:8090/',
         target: 'http://192.168.1.124:8090/',
-=======
-        // target: 'http://192.168.1.110:8090/',
->>>>>>> 4d337447d069e7148c2b82db4ee87f2226e67bb7
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',
         // target: 'http://product-server.winsea.com/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://192.168.24.5:8098',//目标地址