Przeglądaj źródła

Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

achao 2 lat temu
rodzic
commit
f4601bba9e
29 zmienionych plików z 1587 dodań i 1521 usunięć
  1. 0 1
      src/model/material/index.js
  2. 5 0
      src/permission.js
  3. 2 0
      src/router/index.js
  4. 107 107
      src/views/contractManagement/collectionContract.vue
  5. 85 85
      src/views/contractManagement/collectionContractEdit.vue
  6. 114 114
      src/views/contractManagement/collectionContractExamine.vue
  7. 1 4
      src/views/contractManagement/collectionContractRecord.vue
  8. 107 107
      src/views/contractManagement/futuresPurchaseContract.vue
  9. 95 95
      src/views/contractManagement/futuresPurchaseContractAdd.vue
  10. 57 57
      src/views/contractManagement/futuresPurchaseContractEdit.vue
  11. 114 114
      src/views/contractManagement/futuresPurchaseContractExamine.vue
  12. 115 115
      src/views/contractManagement/futuresSalesContract.vue
  13. 92 92
      src/views/contractManagement/futuresSalesContractAdd.vue
  14. 76 76
      src/views/contractManagement/futuresSalesContractEdit.vue
  15. 121 121
      src/views/contractManagement/futuresSalesContractExamine.vue
  16. 84 84
      src/views/contractManagement/priceConfirmationSheet.vue
  17. 20 20
      src/views/contractManagement/priceConfirmationSheetAdd.vue
  18. 110 110
      src/views/contractManagement/purchaseContractExamine.vue
  19. 86 86
      src/views/contractManagement/salesContract.vue
  20. 83 83
      src/views/contractManagement/salesContractAdd.vue
  21. 102 33
      src/views/houseSelfCollect/inspectionManagementNew.vue
  22. 4 7
      src/views/houseSelfCollect/newWeighingManagement.vue
  23. 1 1
      src/views/profitable/cashout.vue
  24. 1 1
      src/views/profitable/cashoutaduit.vue
  25. 1 1
      src/views/profitable/cashoutedit.vue
  26. 3 3
      src/views/profitable/receipt.vue
  27. 0 2
      src/views/taskManagement/supplyofgoods.vue
  28. 0 1
      src/views/taskManagement/tranManagementWarehouseInOutTask.vue
  29. 1 1
      src/views/warehousenew/component/router/index.js

+ 0 - 1
src/model/material/index.js

@@ -196,7 +196,6 @@ export const getFileList = appRx.get(API_GET_FILE_LIST, errorCatcher, errorHandl
 export const materielPartInfoInsert = appRx.post(API_POST_MA_INSERT, errorCatcher, errorHandle, filter)
 export const materielPartInfoUpdate = appRx.post(API_POST_MA_SAVE, errorCatcher, errorHandle, filter)
 export const createOrUpdateParameterList = appRx.post(API_POST_MA_CREATE_UPDATE, errorCatcher, errorHandle, filter)
-export const getMaterielType = appRx.get(API_GET_MA_TYPE_INFO, errorCatcher, errorHandle, filter)
 export const selectMaterielPartInfoPage = appRx.get(API_GET_MA_PART_INFO, errorCatcher, errorHandle, filter)
 export const deleteSupplyMaterielInfo = appRx.post(API_POST_MA_PART_DELETE, errorCatcher, errorHandle, filter)
 export const auditSupplyMaterielInfo = appRx.post(API_POST_MA_PART_AUDIT, errorCatcher, errorHandle, filter)

+ 5 - 0
src/permission.js

@@ -18,14 +18,18 @@ router.beforeEach(async (to, _, next) => {
 
   // 用户刷新页面,localStorage还在,但vuex.store里的东西会reset
   const hasToken = getToken();
+  console.log(hasToken)
   if (hasToken) {
     if (whiteList.includes(to.path)) {
+      console.log(222222222222222)
       next({
         path: '/'
       });
       NProgress.done();
     } else {
+      console.log(store.getters.token)
       if (!store.getters.token) {
+        console.log(to)
         // 首次以及用户手动刷新,token都会还原回空字符串
         const accessRoutes = await store.dispatch('permission/generateRoutes');
         router.addRoutes(accessRoutes);
@@ -66,6 +70,7 @@ router.beforeEach(async (to, _, next) => {
         }
         next();
       } else {
+        console.log(22222)
         if (!whiteList.includes(to.path)) {
           checkLoginUser();
         }

+ 2 - 0
src/router/index.js

@@ -143,8 +143,10 @@ export function resetRouter() {
   router.matcher = newRouter.matcher // reset router
 }
 router.beforeEach(async (to, from, next) => {
+  console.log(to,from)
   // const { roles, isTrainDialog, guideInfo } = store.getters
   const { roles } = store.getters
+  console.log(roles)
   if (roles && roles.length && to.path !== '/help') {
     // if (Object.keys(guideInfo).length === 0) {
     //   store.dispatch('user/getTrainInfo')

+ 107 - 107
src/views/contractManagement/collectionContract.vue

@@ -633,33 +633,33 @@
     background: #50cad4;
   }
 
-  .top-grade {
-    background: linear-gradient(90deg, #5678e9, #7993f6);
-    color: #fff;
-    padding: 3px;
-    border-radius: 2px;
-  }
-
-  .second-class {
-    background: linear-gradient(90deg, #50cdd9, #82e2ea);
-    color: #fff;
-    padding: 3px;
-    border-radius: 2px;
-  }
-
-  .third-class {
-    background: linear-gradient(90deg, #ffa735, #ffbf70);
-    color: #fff;
-    padding: 3px;
-    border-radius: 2px;
-  }
-
-  .substandard {
-    background: linear-gradient(90deg, #b2b4bb, #ced0d5);
-    color: #fff;
-    padding: 3px;
-    border-radius: 2px;
-  }
+  // .top-grade {
+  //   background: linear-gradient(90deg, #5678e9, #7993f6);
+  //   color: #fff;
+  //   padding: 3px;
+  //   border-radius: 2px;
+  // }
+
+  // .second-class {
+  //   background: linear-gradient(90deg, #50cdd9, #82e2ea);
+  //   color: #fff;
+  //   padding: 3px;
+  //   border-radius: 2px;
+  // }
+
+  // .third-class {
+  //   background: linear-gradient(90deg, #ffa735, #ffbf70);
+  //   color: #fff;
+  //   padding: 3px;
+  //   border-radius: 2px;
+  // }
+
+  // .substandard {
+  //   background: linear-gradient(90deg, #b2b4bb, #ced0d5);
+  //   color: #fff;
+  //   padding: 3px;
+  //   border-radius: 2px;
+  // }
 
   .wrap {
     width: 400px;
@@ -724,10 +724,10 @@
     width: 500px;
   }
 
-  .padding-xs {
-    padding: 15px;
-    text-align: right;
-  }
+  // .padding-xs {
+  //   padding: 15px;
+  //   text-align: right;
+  // }
 
   .clearfix:after {
     content: '';
@@ -786,41 +786,41 @@
     border-bottom-right-radius: 0px;
   }
 
-  .button-container {
-    display: flex;
-    flex-wrap: nowrap;
-    justify-content: space-between;
-    align-items: center;
-    background-color: #fff;
-    width: 100%;
-    height: 50px;
-    padding: 0 10px;
-
-    &>div {
-      margin-left: 10px;
-      display: flex;
-      flex-wrap: nowrap;
-      flex-direction: row;
-
-      &>span {
-        line-height: 50px;
-      }
-    }
-
-    /deep/.auditFlow-box {
-      position: unset;
-      margin-left: 10px;
-
-      &/deep/.auditFlow-icon {
-        width: auto;
-        padding-right: 30px;
-      }
-
-      &/deep/.auditFlow-main {
-        position: absolute;
-      }
-    }
-  }
+  // .button-container {
+  //   display: flex;
+  //   flex-wrap: nowrap;
+  //   justify-content: space-between;
+  //   align-items: center;
+  //   background-color: #fff;
+  //   width: 100%;
+  //   height: 50px;
+  //   padding: 0 10px;
+
+  //   &>div {
+  //     margin-left: 10px;
+  //     display: flex;
+  //     flex-wrap: nowrap;
+  //     flex-direction: row;
+
+  //     &>span {
+  //       line-height: 50px;
+  //     }
+  //   }
+
+  //   /deep/.auditFlow-box {
+  //     position: unset;
+  //     margin-left: 10px;
+
+  //     &/deep/.auditFlow-icon {
+  //       width: auto;
+  //       padding-right: 30px;
+  //     }
+
+  //     &/deep/.auditFlow-main {
+  //       position: absolute;
+  //     }
+  //   }
+  // }
 
   .box-app {
     display: inline-block;
@@ -855,47 +855,47 @@
   /*}*/
   // 控制select为只读的时候显示样式
 
-  .hide-sel {
-    .el-input__inner {
-      border: 0px;
-    }
-
-    .el-icon-arrow-up {
-      display: none;
-    }
-
-    .el-textarea__inner {
-      background-color: #fff !important;
-      border: 0;
-    }
-
-    .el-date-editor {
-      i {
-        display: none;
-      }
-    }
-
-    .is-disabled {
-      .el-input__inner:hover {
-        background-color: #fff !important;
-        border: 0;
-      }
-
-      color: #606266;
-
-      .el-input__inner {
-        background-color: #fff !important;
-        border: 0;
-        color: #606266;
-      }
-
-      .el-textarea__inner {
-        background-color: #fff !important;
-        border: 0;
-        color: #606266;
-      }
-    }
-  }
+  // .hide-sel {
+  //   .el-input__inner {
+  //     border: 0px;
+  //   }
+
+  //   .el-icon-arrow-up {
+  //     display: none;
+  //   }
+
+  //   .el-textarea__inner {
+  //     background-color: #fff !important;
+  //     border: 0;
+  //   }
+
+  //   .el-date-editor {
+  //     i {
+  //       display: none;
+  //     }
+  //   }
+
+  //   .is-disabled {
+  //     .el-input__inner:hover {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //     }
+
+  //     color: #606266;
+
+  //     .el-input__inner {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //       color: #606266;
+  //     }
+
+  //     .el-textarea__inner {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //       color: #606266;
+  //     }
+  //   }
+  // }
 
   // 控制select为只读的时候显示样式
   /deep/.ws-class-table-col {

+ 85 - 85
src/views/contractManagement/collectionContractEdit.vue

@@ -1317,41 +1317,41 @@
     // border: 1px solid #cdd2dc;
   }
 
-  .button-container {
-    display: flex;
-    flex-wrap: nowrap;
-    justify-content: space-between;
-    align-items: center;
-    background-color: #fff;
-    width: 100%;
-    height: 50px;
-    padding: 0 10px;
-
-    &>div {
-      margin-left: 10px;
-      display: flex;
-      flex-wrap: nowrap;
-      flex-direction: row;
-
-      &>span {
-        line-height: 50px;
-      }
-    }
-
-    /deep/.auditFlow-box {
-      position: unset;
-      margin-left: 10px;
-
-      &/deep/.auditFlow-icon {
-        width: auto;
-        padding-right: 30px;
-      }
-
-      &/deep/.auditFlow-main {
-        position: absolute;
-      }
-    }
-  }
+  // .button-container {
+  //   display: flex;
+  //   flex-wrap: nowrap;
+  //   justify-content: space-between;
+  //   align-items: center;
+  //   background-color: #fff;
+  //   width: 100%;
+  //   height: 50px;
+  //   padding: 0 10px;
+
+  //   &>div {
+  //     margin-left: 10px;
+  //     display: flex;
+  //     flex-wrap: nowrap;
+  //     flex-direction: row;
+
+  //     &>span {
+  //       line-height: 50px;
+  //     }
+  //   }
+
+  //   /deep/.auditFlow-box {
+  //     position: unset;
+  //     margin-left: 10px;
+
+  //     &/deep/.auditFlow-icon {
+  //       width: auto;
+  //       padding-right: 30px;
+  //     }
+
+  //     &/deep/.auditFlow-main {
+  //       position: absolute;
+  //     }
+  //   }
+  // }
 
   .box-app {
     display: inline-block;
@@ -1426,47 +1426,47 @@
   /*}*/
   // 控制select为只读的时候显示样式
 
-  .hide-sel {
-    .el-input__inner {
-      border: 0px;
-    }
-
-    .el-icon-arrow-up {
-      display: none;
-    }
-
-    .el-textarea__inner {
-      background-color: #fff !important;
-      border: 0;
-    }
-
-    .el-date-editor {
-      i {
-        display: none;
-      }
-    }
-
-    .is-disabled {
-      .el-input__inner:hover {
-        background-color: #fff !important;
-        border: 0;
-      }
-
-      color: #606266;
-
-      .el-input__inner {
-        background-color: #fff !important;
-        border: 0;
-        color: #606266;
-      }
-
-      .el-textarea__inner {
-        background-color: #fff !important;
-        border: 0;
-        color: #606266;
-      }
-    }
-  }
+  // .hide-sel {
+  //   .el-input__inner {
+  //     border: 0px;
+  //   }
+
+  //   .el-icon-arrow-up {
+  //     display: none;
+  //   }
+
+  //   .el-textarea__inner {
+  //     background-color: #fff !important;
+  //     border: 0;
+  //   }
+
+  //   .el-date-editor {
+  //     i {
+  //       display: none;
+  //     }
+  //   }
+
+  //   .is-disabled {
+  //     .el-input__inner:hover {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //     }
+
+  //     color: #606266;
+
+  //     .el-input__inner {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //       color: #606266;
+  //     }
+
+  //     .el-textarea__inner {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //       color: #606266;
+  //     }
+  //   }
+  // }
 
   // 控制select为只读的时候显示样式
   /deep/.ws-class-table-col {
@@ -1553,16 +1553,16 @@
     color: #8890b1;
   }
 
-  .addressUrls {
-    width: 100%;
-    display: flex;
-    margin-top: 10px;
-  }
+  // .addressUrls {
+  //   width: 100%;
+  //   display: flex;
+  //   margin-top: 10px;
+  // }
 
-  .addressUrls-item {
-    position: relative;
-    display: flex;
-  }
+  // .addressUrls-item {
+  //   position: relative;
+  //   display: flex;
+  // }
 
   .icon-guanbi {
     position: absolute;

+ 114 - 114
src/views/contractManagement/collectionContractExamine.vue

@@ -330,32 +330,32 @@
   }
 </script>
 <style lang="scss" scoped>
-  .status-orange,
-  .status-bule,
-  .status-green {
-    border: 1px solid;
-    border-radius: 30px;
-    padding: 3px 10px;
-    font-size: 16px;
-  }
-
-  .status-orange {
-    border-color: #ff9f24;
-    color: #ff9f24;
-    background: #ffedd5;
-  }
-
-  .status-bule {
-    border-color: #5473e8;
-    color: #5473e8;
-    background: #f0f3fe;
-  }
-
-  .status-green {
-    border-color: #50cad4;
-    color: #50cad4;
-    background: #ecfeff;
-  }
+  // .status-orange,
+  // .status-bule,
+  // .status-green {
+  //   border: 1px solid;
+  //   border-radius: 30px;
+  //   padding: 3px 10px;
+  //   font-size: 16px;
+  // }
+
+  // .status-orange {
+  //   border-color: #ff9f24;
+  //   color: #ff9f24;
+  //   background: #ffedd5;
+  // }
+
+  // .status-bule {
+  //   border-color: #5473e8;
+  //   color: #5473e8;
+  //   background: #f0f3fe;
+  // }
+
+  // .status-green {
+  //   border-color: #50cad4;
+  //   color: #50cad4;
+  //   background: #ecfeff;
+  // }
 
   .el-form {
     padding: 0 15%;
@@ -366,19 +366,19 @@
     border-bottom: 1px solid #cdd2dc;
   }
 
-  .readonly {
-    position: relative;
-  }
+  // .readonly {
+  //   position: relative;
+  // }
 
-  .readonly:after {
-    content: '*';
-    color: #ff2727;
-    position: absolute;
-    right: 8px;
-    z-index: 10;
-    top: 21%;
-    font-size: 20px;
-  }
+  // .readonly:after {
+  //   content: '*';
+  //   color: #ff2727;
+  //   position: absolute;
+  //   right: 8px;
+  //   z-index: 10;
+  //   top: 21%;
+  //   font-size: 20px;
+  // }
 
   .title {
     position: relative;
@@ -417,41 +417,41 @@
     // border: 1px solid #cdd2dc;
   }
 
-  .button-container {
-    display: flex;
-    flex-wrap: nowrap;
-    justify-content: space-between;
-    align-items: center;
-    background-color: #fff;
-    width: 100%;
-    height: 50px;
-    padding: 0 10px;
-
-    &>div {
-      margin-left: 10px;
-      display: flex;
-      flex-wrap: nowrap;
-      flex-direction: row;
-
-      &>span {
-        line-height: 50px;
-      }
-    }
-
-    /deep/.auditFlow-box {
-      position: unset;
-      margin-left: 10px;
-
-      &/deep/.auditFlow-icon {
-        width: auto;
-        padding-right: 30px;
-      }
-
-      &/deep/.auditFlow-main {
-        position: absolute;
-      }
-    }
-  }
+  // .button-container {
+  //   display: flex;
+  //   flex-wrap: nowrap;
+  //   justify-content: space-between;
+  //   align-items: center;
+  //   background-color: #fff;
+  //   width: 100%;
+  //   height: 50px;
+  //   padding: 0 10px;
+
+  //   &>div {
+  //     margin-left: 10px;
+  //     display: flex;
+  //     flex-wrap: nowrap;
+  //     flex-direction: row;
+
+  //     &>span {
+  //       line-height: 50px;
+  //     }
+  //   }
+
+  //   /deep/.auditFlow-box {
+  //     position: unset;
+  //     margin-left: 10px;
+
+  //     &/deep/.auditFlow-icon {
+  //       width: auto;
+  //       padding-right: 30px;
+  //     }
+
+  //     &/deep/.auditFlow-main {
+  //       position: absolute;
+  //     }
+  //   }
+  // }
 
   .box-app {
     display: inline-block;
@@ -531,47 +531,47 @@
   /*}*/
   // 控制select为只读的时候显示样式
 
-  .hide-sel {
-    .el-input__inner {
-      border: 0px;
-    }
-
-    .el-icon-arrow-up {
-      display: none;
-    }
-
-    .el-textarea__inner {
-      background-color: #fff !important;
-      border: 0;
-    }
-
-    .el-date-editor {
-      i {
-        display: none;
-      }
-    }
-
-    .is-disabled {
-      .el-input__inner:hover {
-        background-color: #fff !important;
-        border: 0;
-      }
-
-      color: #606266;
-
-      .el-input__inner {
-        background-color: #fff !important;
-        border: 0;
-        color: #606266;
-      }
-
-      .el-textarea__inner {
-        background-color: #fff !important;
-        border: 0;
-        color: #606266;
-      }
-    }
-  }
+  // .hide-sel {
+  //   .el-input__inner {
+  //     border: 0px;
+  //   }
+
+  //   .el-icon-arrow-up {
+  //     display: none;
+  //   }
+
+  //   .el-textarea__inner {
+  //     background-color: #fff !important;
+  //     border: 0;
+  //   }
+
+  //   .el-date-editor {
+  //     i {
+  //       display: none;
+  //     }
+  //   }
+
+  //   .is-disabled {
+  //     .el-input__inner:hover {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //     }
+
+  //     color: #606266;
+
+  //     .el-input__inner {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //       color: #606266;
+  //     }
+
+  //     .el-textarea__inner {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //       color: #606266;
+  //     }
+  //   }
+  // }
 
   // 控制select为只读的时候显示样式
   /deep/.ws-class-table-col {

+ 1 - 4
src/views/contractManagement/collectionContractRecord.vue

@@ -288,7 +288,6 @@
   import {
     selectCollectionWarehousingRecordPage,
     insertCollectionWarehousingRecord,
-    selectIdentityByCard,
     editCollectionWarehousingRecord,
     deleteCollectionWarehousingRecord,
     exportCollectionWarehousingRecord,
@@ -297,19 +296,17 @@
     invoicing
   } from '@/model/contarct/index'
   import {
-    selectWarehouseSelf,
     getCustomerManage,
     getCustomerLook,
   } from '@/model/houseSelfCollect/index'
   import {
     posthandle,
-    postqueryhandle
   } from '@/model/purchasingManagement/index'
   import paymentPrint from './component/paymentPrint.vue'
   import {
     getHp
   } from '@/utils/getHasPermission'
-  import download from '../../components/WsDownload/download'
+  // import download from '../../components/WsDownload/download'
   export default {
     components: {
       paymentPrint,

+ 107 - 107
src/views/contractManagement/futuresPurchaseContract.vue

@@ -584,33 +584,33 @@
     background: #50cad4;
   }
 
-  .top-grade {
-    background: linear-gradient(90deg, #5678e9, #7993f6);
-    color: #fff;
-    padding: 3px;
-    border-radius: 2px;
-  }
-
-  .second-class {
-    background: linear-gradient(90deg, #50cdd9, #82e2ea);
-    color: #fff;
-    padding: 3px;
-    border-radius: 2px;
-  }
-
-  .third-class {
-    background: linear-gradient(90deg, #ffa735, #ffbf70);
-    color: #fff;
-    padding: 3px;
-    border-radius: 2px;
-  }
-
-  .substandard {
-    background: linear-gradient(90deg, #b2b4bb, #ced0d5);
-    color: #fff;
-    padding: 3px;
-    border-radius: 2px;
-  }
+  // .top-grade {
+  //   background: linear-gradient(90deg, #5678e9, #7993f6);
+  //   color: #fff;
+  //   padding: 3px;
+  //   border-radius: 2px;
+  // }
+
+  // .second-class {
+  //   background: linear-gradient(90deg, #50cdd9, #82e2ea);
+  //   color: #fff;
+  //   padding: 3px;
+  //   border-radius: 2px;
+  // }
+
+  // .third-class {
+  //   background: linear-gradient(90deg, #ffa735, #ffbf70);
+  //   color: #fff;
+  //   padding: 3px;
+  //   border-radius: 2px;
+  // }
+
+  // .substandard {
+  //   background: linear-gradient(90deg, #b2b4bb, #ced0d5);
+  //   color: #fff;
+  //   padding: 3px;
+  //   border-radius: 2px;
+  // }
 
   .wrap {
     width: 400px;
@@ -675,10 +675,10 @@
     width: 500px;
   }
 
-  .padding-xs {
-    padding: 15px;
-    text-align: right;
-  }
+  // .padding-xs {
+  //   padding: 15px;
+  //   text-align: right;
+  // }
 
   .clearfix:after {
     content: '';
@@ -737,41 +737,41 @@
     border-bottom-right-radius: 0px;
   }
 
-  .button-container {
-    display: flex;
-    flex-wrap: nowrap;
-    justify-content: space-between;
-    align-items: center;
-    background-color: #fff;
-    width: 100%;
-    height: 50px;
-    padding: 0 10px;
-
-    &>div {
-      margin-left: 10px;
-      display: flex;
-      flex-wrap: nowrap;
-      flex-direction: row;
-
-      &>span {
-        line-height: 50px;
-      }
-    }
-
-    /deep/.auditFlow-box {
-      position: unset;
-      margin-left: 10px;
-
-      &/deep/.auditFlow-icon {
-        width: auto;
-        padding-right: 30px;
-      }
-
-      &/deep/.auditFlow-main {
-        position: absolute;
-      }
-    }
-  }
+  // .button-container {
+  //   display: flex;
+  //   flex-wrap: nowrap;
+  //   justify-content: space-between;
+  //   align-items: center;
+  //   background-color: #fff;
+  //   width: 100%;
+  //   height: 50px;
+  //   padding: 0 10px;
+
+  //   &>div {
+  //     margin-left: 10px;
+  //     display: flex;
+  //     flex-wrap: nowrap;
+  //     flex-direction: row;
+
+  //     &>span {
+  //       line-height: 50px;
+  //     }
+  //   }
+
+  //   /deep/.auditFlow-box {
+  //     position: unset;
+  //     margin-left: 10px;
+
+  //     &/deep/.auditFlow-icon {
+  //       width: auto;
+  //       padding-right: 30px;
+  //     }
+
+  //     &/deep/.auditFlow-main {
+  //       position: absolute;
+  //     }
+  //   }
+  // }
 
   .box-app {
     display: inline-block;
@@ -806,47 +806,47 @@
   /*}*/
   // 控制select为只读的时候显示样式
 
-  .hide-sel {
-    .el-input__inner {
-      border: 0px;
-    }
-
-    .el-icon-arrow-up {
-      display: none;
-    }
-
-    .el-textarea__inner {
-      background-color: #fff !important;
-      border: 0;
-    }
-
-    .el-date-editor {
-      i {
-        display: none;
-      }
-    }
-
-    .is-disabled {
-      .el-input__inner:hover {
-        background-color: #fff !important;
-        border: 0;
-      }
-
-      color: #606266;
-
-      .el-input__inner {
-        background-color: #fff !important;
-        border: 0;
-        color: #606266;
-      }
-
-      .el-textarea__inner {
-        background-color: #fff !important;
-        border: 0;
-        color: #606266;
-      }
-    }
-  }
+  // .hide-sel {
+  //   .el-input__inner {
+  //     border: 0px;
+  //   }
+
+  //   .el-icon-arrow-up {
+  //     display: none;
+  //   }
+
+  //   .el-textarea__inner {
+  //     background-color: #fff !important;
+  //     border: 0;
+  //   }
+
+  //   .el-date-editor {
+  //     i {
+  //       display: none;
+  //     }
+  //   }
+
+  //   .is-disabled {
+  //     .el-input__inner:hover {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //     }
+
+  //     color: #606266;
+
+  //     .el-input__inner {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //       color: #606266;
+  //     }
+
+  //     .el-textarea__inner {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //       color: #606266;
+  //     }
+  //   }
+  // }
 
   // 控制select为只读的时候显示样式
   /deep/.ws-class-table-col {

+ 95 - 95
src/views/contractManagement/futuresPurchaseContractAdd.vue

@@ -1587,9 +1587,9 @@
     font-size: 20px;
   }
 
-  .upload-demo {
-    margin-top: 10px;
-  }
+  // .upload-demo {
+  //   margin-top: 10px;
+  // }
 
   .title {
     position: relative;
@@ -1627,48 +1627,48 @@
     // border: 1px solid #cdd2dc;
   }
 
-  .button-container {
-    display: flex;
-    flex-wrap: nowrap;
-    justify-content: space-between;
-    align-items: center;
-    background-color: #fff;
-    width: 100%;
-    height: 50px;
-    padding: 0 10px;
-
-    &>div {
-      margin-left: 10px;
-      display: flex;
-      flex-wrap: nowrap;
-      flex-direction: row;
-
-      &>span {
-        line-height: 50px;
-      }
-    }
-
-    /deep/.auditFlow-box {
-      position: unset;
-      margin-left: 10px;
-
-      &/deep/.auditFlow-icon {
-        width: auto;
-        padding-right: 30px;
-      }
-
-      &/deep/.auditFlow-main {
-        position: absolute;
-      }
-    }
-  }
-
-  .box-app {
-    display: inline-block;
-    float: left;
-    margin-left: 30px;
-    line-height: 50px;
-  }
+  // .button-container {
+  //   display: flex;
+  //   flex-wrap: nowrap;
+  //   justify-content: space-between;
+  //   align-items: center;
+  //   background-color: #fff;
+  //   width: 100%;
+  //   height: 50px;
+  //   padding: 0 10px;
+
+  //   &>div {
+  //     margin-left: 10px;
+  //     display: flex;
+  //     flex-wrap: nowrap;
+  //     flex-direction: row;
+
+  //     &>span {
+  //       line-height: 50px;
+  //     }
+  //   }
+
+  //   /deep/.auditFlow-box {
+  //     position: unset;
+  //     margin-left: 10px;
+
+  //     &/deep/.auditFlow-icon {
+  //       width: auto;
+  //       padding-right: 30px;
+  //     }
+
+  //     &/deep/.auditFlow-main {
+  //       position: absolute;
+  //     }
+  //   }
+  // }
+
+  // .box-app {
+  //   display: inline-block;
+  //   float: left;
+  //   margin-left: 30px;
+  //   line-height: 50px;
+  // }
 
   /deep/.el-dialog {
     .el-form-item {
@@ -1736,47 +1736,47 @@
   /*}*/
   // 控制select为只读的时候显示样式
 
-  .hide-sel {
-    .el-input__inner {
-      border: 0px;
-    }
-
-    .el-icon-arrow-up {
-      display: none;
-    }
-
-    .el-textarea__inner {
-      background-color: #fff !important;
-      border: 0;
-    }
-
-    .el-date-editor {
-      i {
-        display: none;
-      }
-    }
-
-    .is-disabled {
-      .el-input__inner:hover {
-        background-color: #fff !important;
-        border: 0;
-      }
-
-      color: #606266;
-
-      .el-input__inner {
-        background-color: #fff !important;
-        border: 0;
-        color: #606266;
-      }
-
-      .el-textarea__inner {
-        background-color: #fff !important;
-        border: 0;
-        color: #606266;
-      }
-    }
-  }
+  // .hide-sel {
+  //   .el-input__inner {
+  //     border: 0px;
+  //   }
+
+  //   .el-icon-arrow-up {
+  //     display: none;
+  //   }
+
+  //   .el-textarea__inner {
+  //     background-color: #fff !important;
+  //     border: 0;
+  //   }
+
+  //   .el-date-editor {
+  //     i {
+  //       display: none;
+  //     }
+  //   }
+
+  //   .is-disabled {
+  //     .el-input__inner:hover {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //     }
+
+  //     color: #606266;
+
+  //     .el-input__inner {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //       color: #606266;
+  //     }
+
+  //     .el-textarea__inner {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //       color: #606266;
+  //     }
+  //   }
+  // }
 
   // 控制select为只读的时候显示样式
   /deep/.ws-class-table-col {
@@ -1821,16 +1821,16 @@
     width: 101%;
   }
 
-  .addressUrls {
-    width: 100%;
-    display: flex;
-    margin-top: 10px;
-  }
+  // .addressUrls {
+  //   width: 100%;
+  //   display: flex;
+  //   margin-top: 10px;
+  // }
 
-  .addressUrls-item {
-    position: relative;
-    display: flex;
-  }
+  // .addressUrls-item {
+  //   position: relative;
+  //   display: flex;
+  // }
 
   .icon-guanbi {
     position: absolute;

+ 57 - 57
src/views/contractManagement/futuresPurchaseContractEdit.vue

@@ -1775,10 +1775,10 @@ export default {
 .collapse-bottom {
   margin-bottom: 20px;
 }
-.input-main .textarea .el-textarea__inner {
-  width: 100%;
-  z-index: 1;
-}
+// .input-main .textarea .el-textarea__inner {
+//   width: 100%;
+//   z-index: 1;
+// }
 .bg-left {
   padding-left: 30px;
 }
@@ -1819,40 +1819,40 @@ export default {
 /*}*/
 // 控制select为只读的时候显示样式
 
-.hide-sel {
-  .el-input__inner {
-    border: 0px;
-  }
-  .el-icon-arrow-up {
-    display: none;
-  }
-  .el-textarea__inner {
-    background-color: #fff !important;
-    border: 0;
-  }
-  .el-date-editor {
-    i {
-      display: none;
-    }
-  }
-  .is-disabled {
-    .el-input__inner:hover {
-      background-color: #fff !important;
-      border: 0;
-    }
-    color: #606266;
-    .el-input__inner {
-      background-color: #fff !important;
-      border: 0;
-      color: #606266;
-    }
-    .el-textarea__inner {
-      background-color: #fff !important;
-      border: 0;
-      color: #606266;
-    }
-  }
-}
+// .hide-sel {
+//   .el-input__inner {
+//     border: 0px;
+//   }
+//   .el-icon-arrow-up {
+//     display: none;
+//   }
+//   .el-textarea__inner {
+//     background-color: #fff !important;
+//     border: 0;
+//   }
+//   .el-date-editor {
+//     i {
+//       display: none;
+//     }
+//   }
+//   .is-disabled {
+//     .el-input__inner:hover {
+//       background-color: #fff !important;
+//       border: 0;
+//     }
+//     color: #606266;
+//     .el-input__inner {
+//       background-color: #fff !important;
+//       border: 0;
+//       color: #606266;
+//     }
+//     .el-textarea__inner {
+//       background-color: #fff !important;
+//       border: 0;
+//       color: #606266;
+//     }
+//   }
+// }
 
 // 控制select为只读的时候显示样式
 /deep/.ws-class-table-col {
@@ -1889,25 +1889,25 @@ export default {
 .el-textarea {
   width: 101%;
 }
-/deep/.iconclose:before {
-  display: none;
-}
-/deep/.winsea-card .card__header {
-  font-size: 14px;
-  color: #409eff;
-  padding: 0 0 20px 10px;
-  position: relative;
-  display: none;
-}
-.addressUrls {
-  width: 100%;
-  display: flex;
-  margin-top: 10px;
-}
-.addressUrls-item {
-  position: relative;
-  display: flex;
-}
+// /deep/.iconclose:before {
+//   display: none;
+// }
+// /deep/.winsea-card .card__header {
+//   font-size: 14px;
+//   color: #409eff;
+//   padding: 0 0 20px 10px;
+//   position: relative;
+//   display: none;
+// }
+// .addressUrls {
+//   width: 100%;
+//   display: flex;
+//   margin-top: 10px;
+// }
+// .addressUrls-item {
+//   position: relative;
+//   display: flex;
+// }
 .icon-guanbi {
   position: absolute;
   right: 8px;

+ 114 - 114
src/views/contractManagement/futuresPurchaseContractExamine.vue

@@ -366,32 +366,32 @@
   }
 </script>
 <style lang="scss" scoped>
-  .status-orange,
-  .status-bule,
-  .status-green {
-    border: 1px solid;
-    border-radius: 30px;
-    padding: 3px 10px;
-    font-size: 16px;
-  }
-
-  .status-orange {
-    border-color: #ff9f24;
-    color: #ff9f24;
-    background: #ffedd5;
-  }
-
-  .status-bule {
-    border-color: #5473e8;
-    color: #5473e8;
-    background: #f0f3fe;
-  }
-
-  .status-green {
-    border-color: #50cad4;
-    color: #50cad4;
-    background: #ecfeff;
-  }
+  // .status-orange,
+  // .status-bule,
+  // .status-green {
+  //   border: 1px solid;
+  //   border-radius: 30px;
+  //   padding: 3px 10px;
+  //   font-size: 16px;
+  // }
+
+  // .status-orange {
+  //   border-color: #ff9f24;
+  //   color: #ff9f24;
+  //   background: #ffedd5;
+  // }
+
+  // .status-bule {
+  //   border-color: #5473e8;
+  //   color: #5473e8;
+  //   background: #f0f3fe;
+  // }
+
+  // .status-green {
+  //   border-color: #50cad4;
+  //   color: #50cad4;
+  //   background: #ecfeff;
+  // }
 
   .el-form {
     padding: 0 15%;
@@ -402,19 +402,19 @@
     border-bottom: 1px solid #cdd2dc;
   }
 
-  .readonly {
-    position: relative;
-  }
+  // .readonly {
+  //   position: relative;
+  // }
 
-  .readonly:after {
-    content: '*';
-    color: #ff2727;
-    position: absolute;
-    right: 8px;
-    z-index: 10;
-    top: 21%;
-    font-size: 20px;
-  }
+  // .readonly:after {
+  //   content: '*';
+  //   color: #ff2727;
+  //   position: absolute;
+  //   right: 8px;
+  //   z-index: 10;
+  //   top: 21%;
+  //   font-size: 20px;
+  // }
 
   .title {
     position: relative;
@@ -453,41 +453,41 @@
     // border: 1px solid #cdd2dc;
   }
 
-  .button-container {
-    display: flex;
-    flex-wrap: nowrap;
-    justify-content: space-between;
-    align-items: center;
-    background-color: #fff;
-    width: 100%;
-    height: 50px;
-    padding: 0 10px;
-
-    &>div {
-      margin-left: 10px;
-      display: flex;
-      flex-wrap: nowrap;
-      flex-direction: row;
-
-      &>span {
-        line-height: 50px;
-      }
-    }
-
-    /deep/.auditFlow-box {
-      position: unset;
-      margin-left: 10px;
-
-      &/deep/.auditFlow-icon {
-        width: auto;
-        padding-right: 30px;
-      }
-
-      &/deep/.auditFlow-main {
-        position: absolute;
-      }
-    }
-  }
+  // .button-container {
+  //   display: flex;
+  //   flex-wrap: nowrap;
+  //   justify-content: space-between;
+  //   align-items: center;
+  //   background-color: #fff;
+  //   width: 100%;
+  //   height: 50px;
+  //   padding: 0 10px;
+
+  //   &>div {
+  //     margin-left: 10px;
+  //     display: flex;
+  //     flex-wrap: nowrap;
+  //     flex-direction: row;
+
+  //     &>span {
+  //       line-height: 50px;
+  //     }
+  //   }
+
+  //   /deep/.auditFlow-box {
+  //     position: unset;
+  //     margin-left: 10px;
+
+  //     &/deep/.auditFlow-icon {
+  //       width: auto;
+  //       padding-right: 30px;
+  //     }
+
+  //     &/deep/.auditFlow-main {
+  //       position: absolute;
+  //     }
+  //   }
+  // }
 
   .box-app {
     display: inline-block;
@@ -567,47 +567,47 @@
   /*}*/
   // 控制select为只读的时候显示样式
 
-  .hide-sel {
-    .el-input__inner {
-      border: 0px;
-    }
-
-    .el-icon-arrow-up {
-      display: none;
-    }
-
-    .el-textarea__inner {
-      background-color: #fff !important;
-      border: 0;
-    }
-
-    .el-date-editor {
-      i {
-        display: none;
-      }
-    }
-
-    .is-disabled {
-      .el-input__inner:hover {
-        background-color: #fff !important;
-        border: 0;
-      }
-
-      color: #606266;
-
-      .el-input__inner {
-        background-color: #fff !important;
-        border: 0;
-        color: #606266;
-      }
-
-      .el-textarea__inner {
-        background-color: #fff !important;
-        border: 0;
-        color: #606266;
-      }
-    }
-  }
+  // .hide-sel {
+  //   .el-input__inner {
+  //     border: 0px;
+  //   }
+
+  //   .el-icon-arrow-up {
+  //     display: none;
+  //   }
+
+  //   .el-textarea__inner {
+  //     background-color: #fff !important;
+  //     border: 0;
+  //   }
+
+  //   .el-date-editor {
+  //     i {
+  //       display: none;
+  //     }
+  //   }
+
+  //   .is-disabled {
+  //     .el-input__inner:hover {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //     }
+
+  //     color: #606266;
+
+  //     .el-input__inner {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //       color: #606266;
+  //     }
+
+  //     .el-textarea__inner {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //       color: #606266;
+  //     }
+  //   }
+  // }
 
   // 控制select为只读的时候显示样式
   /deep/.ws-class-table-col {

+ 115 - 115
src/views/contractManagement/futuresSalesContract.vue

@@ -567,11 +567,11 @@
     color: #5473e8;
   }
 
-  .warning {
-    width: 100%;
-    height: 2px;
-    background: red;
-  }
+  // .warning {
+  //   width: 100%;
+  //   height: 2px;
+  //   background: red;
+  // }
 
   .executory,
   .inExecution,
@@ -596,33 +596,33 @@
     background: #50cad4;
   }
 
-  .top-grade {
-    background: linear-gradient(90deg, #5678e9, #7993f6);
-    color: #fff;
-    padding: 3px;
-    border-radius: 2px;
-  }
-
-  .second-class {
-    background: linear-gradient(90deg, #50cdd9, #82e2ea);
-    color: #fff;
-    padding: 3px;
-    border-radius: 2px;
-  }
-
-  .third-class {
-    background: linear-gradient(90deg, #ffa735, #ffbf70);
-    color: #fff;
-    padding: 3px;
-    border-radius: 2px;
-  }
-
-  .substandard {
-    background: linear-gradient(90deg, #b2b4bb, #ced0d5);
-    color: #fff;
-    padding: 3px;
-    border-radius: 2px;
-  }
+  // .top-grade {
+  //   background: linear-gradient(90deg, #5678e9, #7993f6);
+  //   color: #fff;
+  //   padding: 3px;
+  //   border-radius: 2px;
+  // }
+
+  // .second-class {
+  //   background: linear-gradient(90deg, #50cdd9, #82e2ea);
+  //   color: #fff;
+  //   padding: 3px;
+  //   border-radius: 2px;
+  // }
+
+  // .third-class {
+  //   background: linear-gradient(90deg, #ffa735, #ffbf70);
+  //   color: #fff;
+  //   padding: 3px;
+  //   border-radius: 2px;
+  // }
+
+  // .substandard {
+  //   background: linear-gradient(90deg, #b2b4bb, #ced0d5);
+  //   color: #fff;
+  //   padding: 3px;
+  //   border-radius: 2px;
+  // }
 
   .wrap {
     width: 400px;
@@ -749,48 +749,48 @@
     border-bottom-right-radius: 0px;
   }
 
-  .button-container {
-    display: flex;
-    flex-wrap: nowrap;
-    justify-content: space-between;
-    align-items: center;
-    background-color: #fff;
-    width: 100%;
-    height: 50px;
-    padding: 0 10px;
-
-    &>div {
-      margin-left: 10px;
-      display: flex;
-      flex-wrap: nowrap;
-      flex-direction: row;
-
-      &>span {
-        line-height: 50px;
-      }
-    }
-
-    /deep/.auditFlow-box {
-      position: unset;
-      margin-left: 10px;
-
-      &/deep/.auditFlow-icon {
-        width: auto;
-        padding-right: 30px;
-      }
-
-      &/deep/.auditFlow-main {
-        position: absolute;
-      }
-    }
-  }
-
-  .box-app {
-    display: inline-block;
-    float: left;
-    margin-left: 30px;
-    line-height: 50px;
-  }
+  // .button-container {
+  //   display: flex;
+  //   flex-wrap: nowrap;
+  //   justify-content: space-between;
+  //   align-items: center;
+  //   background-color: #fff;
+  //   width: 100%;
+  //   height: 50px;
+  //   padding: 0 10px;
+
+  //   &>div {
+  //     margin-left: 10px;
+  //     display: flex;
+  //     flex-wrap: nowrap;
+  //     flex-direction: row;
+
+  //     &>span {
+  //       line-height: 50px;
+  //     }
+  //   }
+
+  //   /deep/.auditFlow-box {
+  //     position: unset;
+  //     margin-left: 10px;
+
+  //     &/deep/.auditFlow-icon {
+  //       width: auto;
+  //       padding-right: 30px;
+  //     }
+
+  //     &/deep/.auditFlow-main {
+  //       position: absolute;
+  //     }
+  //   }
+  // }
+
+  // .box-app {
+  //   display: inline-block;
+  //   float: left;
+  //   margin-left: 30px;
+  //   line-height: 50px;
+  // }
 
   /deep/.el-dialog {
     .el-form-item {
@@ -818,47 +818,47 @@
   /*}*/
   // 控制select为只读的时候显示样式
 
-  .hide-sel {
-    .el-input__inner {
-      border: 0px;
-    }
-
-    .el-icon-arrow-up {
-      display: none;
-    }
-
-    .el-textarea__inner {
-      background-color: #fff !important;
-      border: 0;
-    }
-
-    .el-date-editor {
-      i {
-        display: none;
-      }
-    }
-
-    .is-disabled {
-      .el-input__inner:hover {
-        background-color: #fff !important;
-        border: 0;
-      }
-
-      color: #606266;
-
-      .el-input__inner {
-        background-color: #fff !important;
-        border: 0;
-        color: #606266;
-      }
-
-      .el-textarea__inner {
-        background-color: #fff !important;
-        border: 0;
-        color: #606266;
-      }
-    }
-  }
+  // .hide-sel {
+  //   .el-input__inner {
+  //     border: 0px;
+  //   }
+
+  //   .el-icon-arrow-up {
+  //     display: none;
+  //   }
+
+  //   .el-textarea__inner {
+  //     background-color: #fff !important;
+  //     border: 0;
+  //   }
+
+  //   .el-date-editor {
+  //     i {
+  //       display: none;
+  //     }
+  //   }
+
+  //   .is-disabled {
+  //     .el-input__inner:hover {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //     }
+
+  //     color: #606266;
+
+  //     .el-input__inner {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //       color: #606266;
+  //     }
+
+  //     .el-textarea__inner {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //       color: #606266;
+  //     }
+  //   }
+  // }
 
   // 控制select为只读的时候显示样式
   /deep/.ws-class-table-col {

+ 92 - 92
src/views/contractManagement/futuresSalesContractAdd.vue

@@ -1583,48 +1583,48 @@
     // border: 1px solid #cdd2dc;
   }
 
-  .button-container {
-    display: flex;
-    flex-wrap: nowrap;
-    justify-content: space-between;
-    align-items: center;
-    background-color: #fff;
-    width: 100%;
-    height: 50px;
-    padding: 0 10px;
-
-    &>div {
-      margin-left: 10px;
-      display: flex;
-      flex-wrap: nowrap;
-      flex-direction: row;
-
-      &>span {
-        line-height: 50px;
-      }
-    }
-
-    /deep/.auditFlow-box {
-      position: unset;
-      margin-left: 10px;
-
-      &/deep/.auditFlow-icon {
-        width: auto;
-        padding-right: 30px;
-      }
-
-      &/deep/.auditFlow-main {
-        position: absolute;
-      }
-    }
-  }
-
-  .box-app {
-    display: inline-block;
-    float: left;
-    margin-left: 30px;
-    line-height: 50px;
-  }
+  // .button-container {
+  //   display: flex;
+  //   flex-wrap: nowrap;
+  //   justify-content: space-between;
+  //   align-items: center;
+  //   background-color: #fff;
+  //   width: 100%;
+  //   height: 50px;
+  //   padding: 0 10px;
+
+  //   &>div {
+  //     margin-left: 10px;
+  //     display: flex;
+  //     flex-wrap: nowrap;
+  //     flex-direction: row;
+
+  //     &>span {
+  //       line-height: 50px;
+  //     }
+  //   }
+
+  //   /deep/.auditFlow-box {
+  //     position: unset;
+  //     margin-left: 10px;
+
+  //     &/deep/.auditFlow-icon {
+  //       width: auto;
+  //       padding-right: 30px;
+  //     }
+
+  //     &/deep/.auditFlow-main {
+  //       position: absolute;
+  //     }
+  //   }
+  // }
+
+  // .box-app {
+  //   display: inline-block;
+  //   float: left;
+  //   margin-left: 30px;
+  //   line-height: 50px;
+  // }
 
   /deep/.el-dialog {
     .el-form-item {
@@ -1692,47 +1692,47 @@
   /*}*/
   // 控制select为只读的时候显示样式
 
-  .hide-sel {
-    .el-input__inner {
-      border: 0px;
-    }
-
-    .el-icon-arrow-up {
-      display: none;
-    }
-
-    .el-textarea__inner {
-      background-color: #fff !important;
-      border: 0;
-    }
-
-    .el-date-editor {
-      i {
-        display: none;
-      }
-    }
-
-    .is-disabled {
-      .el-input__inner:hover {
-        background-color: #fff !important;
-        border: 0;
-      }
-
-      color: #606266;
-
-      .el-input__inner {
-        background-color: #fff !important;
-        border: 0;
-        color: #606266;
-      }
-
-      .el-textarea__inner {
-        background-color: #fff !important;
-        border: 0;
-        color: #606266;
-      }
-    }
-  }
+  // .hide-sel {
+  //   .el-input__inner {
+  //     border: 0px;
+  //   }
+
+  //   .el-icon-arrow-up {
+  //     display: none;
+  //   }
+
+  //   .el-textarea__inner {
+  //     background-color: #fff !important;
+  //     border: 0;
+  //   }
+
+  //   .el-date-editor {
+  //     i {
+  //       display: none;
+  //     }
+  //   }
+
+  //   .is-disabled {
+  //     .el-input__inner:hover {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //     }
+
+  //     color: #606266;
+
+  //     .el-input__inner {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //       color: #606266;
+  //     }
+
+  //     .el-textarea__inner {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //       color: #606266;
+  //     }
+  //   }
+  // }
 
   // 控制select为只读的时候显示样式
   /deep/.ws-class-table-col {
@@ -1777,16 +1777,16 @@
     width: 101%;
   }
 
-  .addressUrls {
-    width: 100%;
-    display: flex;
-    margin-top: 10px;
-  }
+  // .addressUrls {
+  //   width: 100%;
+  //   display: flex;
+  //   margin-top: 10px;
+  // }
 
-  .addressUrls-item {
-    position: relative;
-    display: flex;
-  }
+  // .addressUrls-item {
+  //   position: relative;
+  //   display: flex;
+  // }
 
   .icon-guanbi {
     position: absolute;

+ 76 - 76
src/views/contractManagement/futuresSalesContractEdit.vue

@@ -1437,41 +1437,41 @@
     // border: 1px solid #cdd2dc;
   }
 
-  .button-container {
-    display: flex;
-    flex-wrap: nowrap;
-    justify-content: space-between;
-    align-items: center;
-    background-color: #fff;
-    width: 100%;
-    height: 50px;
-    padding: 0 10px;
-
-    &>div {
-      margin-left: 10px;
-      display: flex;
-      flex-wrap: nowrap;
-      flex-direction: row;
-
-      &>span {
-        line-height: 50px;
-      }
-    }
-
-    /deep/.auditFlow-box {
-      position: unset;
-      margin-left: 10px;
-
-      &/deep/.auditFlow-icon {
-        width: auto;
-        padding-right: 30px;
-      }
-
-      &/deep/.auditFlow-main {
-        position: absolute;
-      }
-    }
-  }
+  // .button-container {
+  //   display: flex;
+  //   flex-wrap: nowrap;
+  //   justify-content: space-between;
+  //   align-items: center;
+  //   background-color: #fff;
+  //   width: 100%;
+  //   height: 50px;
+  //   padding: 0 10px;
+
+  //   &>div {
+  //     margin-left: 10px;
+  //     display: flex;
+  //     flex-wrap: nowrap;
+  //     flex-direction: row;
+
+  //     &>span {
+  //       line-height: 50px;
+  //     }
+  //   }
+
+  //   /deep/.auditFlow-box {
+  //     position: unset;
+  //     margin-left: 10px;
+
+  //     &/deep/.auditFlow-icon {
+  //       width: auto;
+  //       padding-right: 30px;
+  //     }
+
+  //     &/deep/.auditFlow-main {
+  //       position: absolute;
+  //     }
+  //   }
+  // }
 
   .box-app {
     display: inline-block;
@@ -1551,47 +1551,47 @@
   /*}*/
   // 控制select为只读的时候显示样式
 
-  .hide-sel {
-    .el-input__inner {
-      border: 0px;
-    }
-
-    .el-icon-arrow-up {
-      display: none;
-    }
-
-    .el-textarea__inner {
-      background-color: #fff !important;
-      border: 0;
-    }
-
-    .el-date-editor {
-      i {
-        display: none;
-      }
-    }
-
-    .is-disabled {
-      .el-input__inner:hover {
-        background-color: #fff !important;
-        border: 0;
-      }
-
-      color: #606266;
-
-      .el-input__inner {
-        background-color: #fff !important;
-        border: 0;
-        color: #606266;
-      }
-
-      .el-textarea__inner {
-        background-color: #fff !important;
-        border: 0;
-        color: #606266;
-      }
-    }
-  }
+  // .hide-sel {
+  //   .el-input__inner {
+  //     border: 0px;
+  //   }
+
+  //   .el-icon-arrow-up {
+  //     display: none;
+  //   }
+
+  //   .el-textarea__inner {
+  //     background-color: #fff !important;
+  //     border: 0;
+  //   }
+
+  //   .el-date-editor {
+  //     i {
+  //       display: none;
+  //     }
+  //   }
+
+  //   .is-disabled {
+  //     .el-input__inner:hover {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //     }
+
+  //     color: #606266;
+
+  //     .el-input__inner {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //       color: #606266;
+  //     }
+
+  //     .el-textarea__inner {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //       color: #606266;
+  //     }
+  //   }
+  // }
 
   // 控制select为只读的时候显示样式
   /deep/.ws-class-table-col {

+ 121 - 121
src/views/contractManagement/futuresSalesContractExamine.vue

@@ -360,32 +360,32 @@
   }
 </script>
 <style lang="scss" scoped>
-  .status-orange,
-  .status-bule,
-  .status-green {
-    border: 1px solid;
-    border-radius: 30px;
-    padding: 3px 10px;
-    font-size: 16px;
-  }
-
-  .status-orange {
-    border-color: #ff9f24;
-    color: #ff9f24;
-    background: #ffedd5;
-  }
-
-  .status-bule {
-    border-color: #5473e8;
-    color: #5473e8;
-    background: #f0f3fe;
-  }
-
-  .status-green {
-    border-color: #50cad4;
-    color: #50cad4;
-    background: #ecfeff;
-  }
+  // .status-orange,
+  // .status-bule,
+  // .status-green {
+  //   border: 1px solid;
+  //   border-radius: 30px;
+  //   padding: 3px 10px;
+  //   font-size: 16px;
+  // }
+
+  // .status-orange {
+  //   border-color: #ff9f24;
+  //   color: #ff9f24;
+  //   background: #ffedd5;
+  // }
+
+  // .status-bule {
+  //   border-color: #5473e8;
+  //   color: #5473e8;
+  //   background: #f0f3fe;
+  // }
+
+  // .status-green {
+  //   border-color: #50cad4;
+  //   color: #50cad4;
+  //   background: #ecfeff;
+  // }
 
   .el-form {
     padding: 0 15%;
@@ -396,19 +396,19 @@
     border-bottom: 1px solid #cdd2dc;
   }
 
-  .readonly {
-    position: relative;
-  }
+  // .readonly {
+  //   position: relative;
+  // }
 
-  .readonly:after {
-    content: '*';
-    color: #ff2727;
-    position: absolute;
-    right: 8px;
-    z-index: 10;
-    top: 21%;
-    font-size: 20px;
-  }
+  // .readonly:after {
+  //   content: '*';
+  //   color: #ff2727;
+  //   position: absolute;
+  //   right: 8px;
+  //   z-index: 10;
+  //   top: 21%;
+  //   font-size: 20px;
+  // }
 
   .title {
     position: relative;
@@ -447,48 +447,48 @@
     // border: 1px solid #cdd2dc;
   }
 
-  .button-container {
-    display: flex;
-    flex-wrap: nowrap;
-    justify-content: space-between;
-    align-items: center;
-    background-color: #fff;
-    width: 100%;
-    height: 50px;
-    padding: 0 10px;
-
-    &>div {
-      margin-left: 10px;
-      display: flex;
-      flex-wrap: nowrap;
-      flex-direction: row;
-
-      &>span {
-        line-height: 50px;
-      }
-    }
-
-    /deep/.auditFlow-box {
-      position: unset;
-      margin-left: 10px;
-
-      &/deep/.auditFlow-icon {
-        width: auto;
-        padding-right: 30px;
-      }
-
-      &/deep/.auditFlow-main {
-        position: absolute;
-      }
-    }
-  }
-
-  .box-app {
-    display: inline-block;
-    float: left;
-    margin-left: 30px;
-    line-height: 50px;
-  }
+  // .button-container {
+  //   display: flex;
+  //   flex-wrap: nowrap;
+  //   justify-content: space-between;
+  //   align-items: center;
+  //   background-color: #fff;
+  //   width: 100%;
+  //   height: 50px;
+  //   padding: 0 10px;
+
+  //   &>div {
+  //     margin-left: 10px;
+  //     display: flex;
+  //     flex-wrap: nowrap;
+  //     flex-direction: row;
+
+  //     &>span {
+  //       line-height: 50px;
+  //     }
+  //   }
+
+  //   /deep/.auditFlow-box {
+  //     position: unset;
+  //     margin-left: 10px;
+
+  //     &/deep/.auditFlow-icon {
+  //       width: auto;
+  //       padding-right: 30px;
+  //     }
+
+  //     &/deep/.auditFlow-main {
+  //       position: absolute;
+  //     }
+  //   }
+  // }
+
+  // .box-app {
+  //   display: inline-block;
+  //   float: left;
+  //   margin-left: 30px;
+  //   line-height: 50px;
+  // }
 
   /deep/.el-dialog {
     .el-form-item {
@@ -561,47 +561,47 @@
   /*}*/
   // 控制select为只读的时候显示样式
 
-  .hide-sel {
-    .el-input__inner {
-      border: 0px;
-    }
-
-    .el-icon-arrow-up {
-      display: none;
-    }
-
-    .el-textarea__inner {
-      background-color: #fff !important;
-      border: 0;
-    }
-
-    .el-date-editor {
-      i {
-        display: none;
-      }
-    }
-
-    .is-disabled {
-      .el-input__inner:hover {
-        background-color: #fff !important;
-        border: 0;
-      }
-
-      color: #606266;
-
-      .el-input__inner {
-        background-color: #fff !important;
-        border: 0;
-        color: #606266;
-      }
-
-      .el-textarea__inner {
-        background-color: #fff !important;
-        border: 0;
-        color: #606266;
-      }
-    }
-  }
+  // .hide-sel {
+  //   .el-input__inner {
+  //     border: 0px;
+  //   }
+
+  //   .el-icon-arrow-up {
+  //     display: none;
+  //   }
+
+  //   .el-textarea__inner {
+  //     background-color: #fff !important;
+  //     border: 0;
+  //   }
+
+  //   .el-date-editor {
+  //     i {
+  //       display: none;
+  //     }
+  //   }
+
+  //   .is-disabled {
+  //     .el-input__inner:hover {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //     }
+
+  //     color: #606266;
+
+  //     .el-input__inner {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //       color: #606266;
+  //     }
+
+  //     .el-textarea__inner {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //       color: #606266;
+  //     }
+  //   }
+  // }
 
   // 控制select为只读的时候显示样式
   /deep/.ws-class-table-col {

+ 84 - 84
src/views/contractManagement/priceConfirmationSheet.vue

@@ -363,43 +363,43 @@ export default {
   background: #f0f2f6;
   // border: 1px solid #cdd2dc;
 }
-.button-container {
-  display: flex;
-  flex-wrap: nowrap;
-  justify-content: space-between;
-  align-items: center;
-  background-color: #fff;
-  width: 100%;
-  height: 50px;
-  padding: 0 10px;
-  & > div {
-    margin-left: 10px;
-    display: flex;
-    flex-wrap: nowrap;
-    flex-direction: row;
-    & > span {
-      line-height: 50px;
-    }
-  }
+// .button-container {
+//   display: flex;
+//   flex-wrap: nowrap;
+//   justify-content: space-between;
+//   align-items: center;
+//   background-color: #fff;
+//   width: 100%;
+//   height: 50px;
+//   padding: 0 10px;
+//   & > div {
+//     margin-left: 10px;
+//     display: flex;
+//     flex-wrap: nowrap;
+//     flex-direction: row;
+//     & > span {
+//       line-height: 50px;
+//     }
+//   }
 
-  /deep/.auditFlow-box {
-    position: unset;
-    margin-left: 10px;
-    &/deep/.auditFlow-icon {
-      width: auto;
-      padding-right: 30px;
-    }
-    &/deep/.auditFlow-main {
-      position: absolute;
-    }
-  }
-}
-.box-app {
-  display: inline-block;
-  float: left;
-  margin-left: 30px;
-  line-height: 50px;
-}
+//   /deep/.auditFlow-box {
+//     position: unset;
+//     margin-left: 10px;
+//     &/deep/.auditFlow-icon {
+//       width: auto;
+//       padding-right: 30px;
+//     }
+//     &/deep/.auditFlow-main {
+//       position: absolute;
+//     }
+//   }
+// }
+// .box-app {
+//   display: inline-block;
+//   float: left;
+//   margin-left: 30px;
+//   line-height: 50px;
+// }
 /deep/.el-dialog {
   .el-form-item {
     margin-bottom: 0 !important;
@@ -483,45 +483,45 @@ export default {
 /*}*/
 // 控制select为只读的时候显示样式
 
-.hide-sel {
-  .el-input__inner {
-    border: 0px;
-  }
-  .el-icon-arrow-up {
-    display: none;
-  }
-  .el-textarea__inner {
-    background-color: #fff !important;
-    border: 0;
-  }
-  .el-date-editor {
-    i {
-      display: none;
-    }
-  }
-  .is-disabled {
-    .el-input__inner:hover {
-      background-color: #fff !important;
-      border: 0;
-    }
-    color: #606266;
-    .el-input__inner {
-      background-color: #fff !important;
-      border: 0;
-      color: #606266;
-    }
-    .el-textarea__inner {
-      background-color: #fff !important;
-      border: 0;
-      color: #606266;
-    }
-  }
-}
-.shangchuan {
-  margin-left: 100px;
-  margin-top: -27px;
-  margin-bottom: 30px;
-}
+// .hide-sel {
+//   .el-input__inner {
+//     border: 0px;
+//   }
+//   .el-icon-arrow-up {
+//     display: none;
+//   }
+//   .el-textarea__inner {
+//     background-color: #fff !important;
+//     border: 0;
+//   }
+//   .el-date-editor {
+//     i {
+//       display: none;
+//     }
+//   }
+//   .is-disabled {
+//     .el-input__inner:hover {
+//       background-color: #fff !important;
+//       border: 0;
+//     }
+//     color: #606266;
+//     .el-input__inner {
+//       background-color: #fff !important;
+//       border: 0;
+//       color: #606266;
+//     }
+//     .el-textarea__inner {
+//       background-color: #fff !important;
+//       border: 0;
+//       color: #606266;
+//     }
+//   }
+// }
+// .shangchuan {
+//   margin-left: 100px;
+//   margin-top: -27px;
+//   margin-bottom: 30px;
+// }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   width: 148px;
 }
@@ -583,15 +583,15 @@ export default {
   overflow: scroll;
   height: 93vh;
 }
-.addressUrls {
-  width: 100%;
-  display: flex;
-  margin-top: 10px;
-}
-.addressUrls-item {
-  position: relative;
-  display: flex;
-}
+// .addressUrls {
+//   width: 100%;
+//   display: flex;
+//   margin-top: 10px;
+// }
+// .addressUrls-item {
+//   position: relative;
+//   display: flex;
+// }
 .icon-guanbi {
   position: absolute;
   right: 8px;

+ 20 - 20
src/views/contractManagement/priceConfirmationSheetAdd.vue

@@ -738,17 +738,17 @@
     width: 200px;
   }
 
-  .unchanged {
-    position: absolute;
-    left: 37px;
-    width: 102px;
-    height: 14px;
-    font-size: 14px;
-    font-family: PingFangSC-Regular, PingFang SC;
-    font-weight: 400;
-    color: #afb5cb;
-    line-height: 14px;
-  }
+  // .unchanged {
+  //   position: absolute;
+  //   left: 37px;
+  //   width: 102px;
+  //   height: 14px;
+  //   font-size: 14px;
+  //   font-family: PingFangSC-Regular, PingFang SC;
+  //   font-weight: 400;
+  //   color: #afb5cb;
+  //   line-height: 14px;
+  // }
 
   /deep/.el-input--small .el-input__inner {
     height: 32px;
@@ -790,16 +790,16 @@
     height: 93vh;
   }
 
-  .addressUrls {
-    width: 100%;
-    display: flex;
-    margin-top: 10px;
-  }
+  // .addressUrls {
+  //   width: 100%;
+  //   display: flex;
+  //   margin-top: 10px;
+  // }
 
-  .addressUrls-item {
-    position: relative;
-    display: flex;
-  }
+  // .addressUrls-item {
+  //   position: relative;
+  //   display: flex;
+  // }
 
   .icon-guanbi {
     position: absolute;

+ 110 - 110
src/views/contractManagement/purchaseContractExamine.vue

@@ -187,7 +187,7 @@
       <div class="remark">
         <h3>备注信息</h3>
       </div>
-      <div style=" color: #afb5cb;margin-left: 20px;">
+    <div style=" color: #afb5cb;margin-left: 20px;">
         {{ deptBudgetList.remarks }}
       </div>
       <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :editable="false"
@@ -374,32 +374,32 @@
   }
 </script>
 <style lang="scss" scoped>
-  .status-orange,
-  .status-bule,
-  .status-green {
-    border: 1px solid;
-    border-radius: 30px;
-    padding: 3px 10px;
-    font-size: 16px;
-  }
-
-  .status-orange {
-    border-color: #ff9f24;
-    color: #ff9f24;
-    background: #ffedd5;
-  }
-
-  .status-bule {
-    border-color: #5473e8;
-    color: #5473e8;
-    background: #f0f3fe;
-  }
-
-  .status-green {
-    border-color: #50cad4;
-    color: #50cad4;
-    background: #ecfeff;
-  }
+  // .status-orange,
+  // .status-bule,
+  // .status-green {
+  //   border: 1px solid;
+  //   border-radius: 30px;
+  //   padding: 3px 10px;
+  //   font-size: 16px;
+  // }
+
+  // .status-orange {
+  //   border-color: #ff9f24;
+  //   color: #ff9f24;
+  //   background: #ffedd5;
+  // }
+
+  // .status-bule {
+  //   border-color: #5473e8;
+  //   color: #5473e8;
+  //   background: #f0f3fe;
+  // }
+
+  // .status-green {
+  //   border-color: #50cad4;
+  //   color: #50cad4;
+  //   background: #ecfeff;
+  // }
 
   .el-form {
     padding: 0 15%;
@@ -461,48 +461,48 @@
     // border: 1px solid #cdd2dc;
   }
 
-  .button-container {
-    display: flex;
-    flex-wrap: nowrap;
-    justify-content: space-between;
-    align-items: center;
-    background-color: #fff;
-    width: 100%;
-    height: 50px;
-    padding: 0 10px;
-
-    &>div {
-      margin-left: 10px;
-      display: flex;
-      flex-wrap: nowrap;
-      flex-direction: row;
-
-      &>span {
-        line-height: 50px;
-      }
-    }
-
-    /deep/.auditFlow-box {
-      position: unset;
-      margin-left: 10px;
-
-      &/deep/.auditFlow-icon {
-        width: auto;
-        padding-right: 30px;
-      }
-
-      &/deep/.auditFlow-main {
-        position: absolute;
-      }
-    }
-  }
-
-  .box-app {
-    display: inline-block;
-    float: left;
-    margin-left: 30px;
-    line-height: 50px;
-  }
+  // .button-container {
+  //   display: flex;
+  //   flex-wrap: nowrap;
+  //   justify-content: space-between;
+  //   align-items: center;
+  //   background-color: #fff;
+  //   width: 100%;
+  //   height: 50px;
+  //   padding: 0 10px;
+
+  //   &>div {
+  //     margin-left: 10px;
+  //     display: flex;
+  //     flex-wrap: nowrap;
+  //     flex-direction: row;
+
+  //     &>span {
+  //       line-height: 50px;
+  //     }
+  //   }
+
+  //   /deep/.auditFlow-box {
+  //     position: unset;
+  //     margin-left: 10px;
+
+  //     &/deep/.auditFlow-icon {
+  //       width: auto;
+  //       padding-right: 30px;
+  //     }
+
+  //     &/deep/.auditFlow-main {
+  //       position: absolute;
+  //     }
+  //   }
+  // }
+
+  // .box-app {
+  //   display: inline-block;
+  //   float: left;
+  //   margin-left: 30px;
+  //   line-height: 50px;
+  // }
 
   /deep/.el-dialog {
     .el-form-item {
@@ -575,47 +575,47 @@
   /*}*/
   // 控制select为只读的时候显示样式
 
-  .hide-sel {
-    .el-input__inner {
-      border: 0px;
-    }
-
-    .el-icon-arrow-up {
-      display: none;
-    }
-
-    .el-textarea__inner {
-      background-color: #fff !important;
-      border: 0;
-    }
-
-    .el-date-editor {
-      i {
-        display: none;
-      }
-    }
-
-    .is-disabled {
-      .el-input__inner:hover {
-        background-color: #fff !important;
-        border: 0;
-      }
-
-      color: #606266;
-
-      .el-input__inner {
-        background-color: #fff !important;
-        border: 0;
-        color: #606266;
-      }
-
-      .el-textarea__inner {
-        background-color: #fff !important;
-        border: 0;
-        color: #606266;
-      }
-    }
-  }
+  // .hide-sel {
+  //   .el-input__inner {
+  //     border: 0px;
+  //   }
+
+  //   .el-icon-arrow-up {
+  //     display: none;
+  //   }
+
+  //   .el-textarea__inner {
+  //     background-color: #fff !important;
+  //     border: 0;
+  //   }
+
+  //   .el-date-editor {
+  //     i {
+  //       display: none;
+  //     }
+  //   }
+
+  //   .is-disabled {
+  //     .el-input__inner:hover {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //     }
+
+  //     color: #606266;
+
+  //     .el-input__inner {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //       color: #606266;
+  //     }
+
+  //     .el-textarea__inner {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //       color: #606266;
+  //     }
+  //   }
+  // }
 
   // 控制select为只读的时候显示样式
   /deep/.ws-class-table-col {

+ 86 - 86
src/views/contractManagement/salesContract.vue

@@ -865,10 +865,10 @@
     width: 500px;
   }
 
-  .padding-xs {
-    padding: 15px;
-    text-align: right;
-  }
+  // .padding-xs {
+  //   padding: 15px;
+  //   text-align: right;
+  // }
 
   .clearfix:after {
     content: '';
@@ -927,48 +927,48 @@
     border-bottom-right-radius: 0px;
   }
 
-  .button-container {
-    display: flex;
-    flex-wrap: nowrap;
-    justify-content: space-between;
-    align-items: center;
-    background-color: #fff;
-    width: 100%;
-    height: 50px;
-    padding: 0 10px;
-
-    &>div {
-      margin-left: 10px;
-      display: flex;
-      flex-wrap: nowrap;
-      flex-direction: row;
-
-      &>span {
-        line-height: 50px;
-      }
-    }
-
-    /deep/.auditFlow-box {
-      position: unset;
-      margin-left: 10px;
-
-      &/deep/.auditFlow-icon {
-        width: auto;
-        padding-right: 30px;
-      }
-
-      &/deep/.auditFlow-main {
-        position: absolute;
-      }
-    }
-  }
+  // .button-container {
+  //   display: flex;
+  //   flex-wrap: nowrap;
+  //   justify-content: space-between;
+  //   align-items: center;
+  //   background-color: #fff;
+  //   width: 100%;
+  //   height: 50px;
+  //   padding: 0 10px;
+
+  //   &>div {
+  //     margin-left: 10px;
+  //     display: flex;
+  //     flex-wrap: nowrap;
+  //     flex-direction: row;
+
+  //     &>span {
+  //       line-height: 50px;
+  //     }
+  //   }
+
+  //   /deep/.auditFlow-box {
+  //     position: unset;
+  //     margin-left: 10px;
+
+  //     &/deep/.auditFlow-icon {
+  //       width: auto;
+  //       padding-right: 30px;
+  //     }
+
+  //     &/deep/.auditFlow-main {
+  //       position: absolute;
+  //     }
+  //   }
+  // }
 
-  .box-app {
-    display: inline-block;
-    float: left;
-    margin-left: 30px;
-    line-height: 50px;
-  }
+  // .box-app {
+  //   display: inline-block;
+  //   float: left;
+  //   margin-left: 30px;
+  //   line-height: 50px;
+  // }
 
   /deep/.el-dialog {
     .el-form-item {
@@ -996,47 +996,47 @@
   /*}*/
   // 控制select为只读的时候显示样式
 
-  .hide-sel {
-    .el-input__inner {
-      border: 0px;
-    }
-
-    .el-icon-arrow-up {
-      display: none;
-    }
-
-    .el-textarea__inner {
-      background-color: #fff !important;
-      border: 0;
-    }
-
-    .el-date-editor {
-      i {
-        display: none;
-      }
-    }
-
-    .is-disabled {
-      .el-input__inner:hover {
-        background-color: #fff !important;
-        border: 0;
-      }
-
-      color: #606266;
-
-      .el-input__inner {
-        background-color: #fff !important;
-        border: 0;
-        color: #606266;
-      }
-
-      .el-textarea__inner {
-        background-color: #fff !important;
-        border: 0;
-        color: #606266;
-      }
-    }
-  }
+  // .hide-sel {
+  //   .el-input__inner {
+  //     border: 0px;
+  //   }
+
+  //   .el-icon-arrow-up {
+  //     display: none;
+  //   }
+
+  //   .el-textarea__inner {
+  //     background-color: #fff !important;
+  //     border: 0;
+  //   }
+
+  //   .el-date-editor {
+  //     i {
+  //       display: none;
+  //     }
+  //   }
+
+  //   .is-disabled {
+  //     .el-input__inner:hover {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //     }
+
+  //     color: #606266;
+
+  //     .el-input__inner {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //       color: #606266;
+  //     }
+
+  //     .el-textarea__inner {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //       color: #606266;
+  //     }
+  //   }
+  // }
 
   // 控制select为只读的时候显示样式
   /deep/.ws-class-table-col {

+ 83 - 83
src/views/contractManagement/salesContractAdd.vue

@@ -1711,48 +1711,48 @@
     // border: 1px solid #cdd2dc;
   }
 
-  .button-container {
-    display: flex;
-    flex-wrap: nowrap;
-    justify-content: space-between;
-    align-items: center;
-    background-color: #fff;
-    width: 100%;
-    height: 50px;
-    padding: 0 10px;
-
-    &>div {
-      margin-left: 10px;
-      display: flex;
-      flex-wrap: nowrap;
-      flex-direction: row;
-
-      &>span {
-        line-height: 50px;
-      }
-    }
-
-    /deep/.auditFlow-box {
-      position: unset;
-      margin-left: 10px;
-
-      &/deep/.auditFlow-icon {
-        width: auto;
-        padding-right: 30px;
-      }
-
-      &/deep/.auditFlow-main {
-        position: absolute;
-      }
-    }
-  }
-
-  .box-app {
-    display: inline-block;
-    float: left;
-    margin-left: 30px;
-    line-height: 50px;
-  }
+  // .button-container {
+  //   display: flex;
+  //   flex-wrap: nowrap;
+  //   justify-content: space-between;
+  //   align-items: center;
+  //   background-color: #fff;
+  //   width: 100%;
+  //   height: 50px;
+  //   padding: 0 10px;
+
+  //   &>div {
+  //     margin-left: 10px;
+  //     display: flex;
+  //     flex-wrap: nowrap;
+  //     flex-direction: row;
+
+  //     &>span {
+  //       line-height: 50px;
+  //     }
+  //   }
+
+  //   /deep/.auditFlow-box {
+  //     position: unset;
+  //     margin-left: 10px;
+
+  //     &/deep/.auditFlow-icon {
+  //       width: auto;
+  //       padding-right: 30px;
+  //     }
+
+  //     &/deep/.auditFlow-main {
+  //       position: absolute;
+  //     }
+  //   }
+  // }
+
+  // .box-app {
+  //   display: inline-block;
+  //   float: left;
+  //   margin-left: 30px;
+  //   line-height: 50px;
+  // }
 
   /deep/.el-dialog {
     .el-form-item {
@@ -1825,47 +1825,47 @@
   /*}*/
   // 控制select为只读的时候显示样式
 
-  .hide-sel {
-    .el-input__inner {
-      border: 0px;
-    }
-
-    .el-icon-arrow-up {
-      display: none;
-    }
-
-    .el-textarea__inner {
-      background-color: #fff !important;
-      border: 0;
-    }
-
-    .el-date-editor {
-      i {
-        display: none;
-      }
-    }
-
-    .is-disabled {
-      .el-input__inner:hover {
-        background-color: #fff !important;
-        border: 0;
-      }
-
-      color: #606266;
-
-      .el-input__inner {
-        background-color: #fff !important;
-        border: 0;
-        color: #606266;
-      }
-
-      .el-textarea__inner {
-        background-color: #fff !important;
-        border: 0;
-        color: #606266;
-      }
-    }
-  }
+  // .hide-sel {
+  //   .el-input__inner {
+  //     border: 0px;
+  //   }
+
+  //   .el-icon-arrow-up {
+  //     display: none;
+  //   }
+
+  //   .el-textarea__inner {
+  //     background-color: #fff !important;
+  //     border: 0;
+  //   }
+
+  //   .el-date-editor {
+  //     i {
+  //       display: none;
+  //     }
+  //   }
+
+  //   .is-disabled {
+  //     .el-input__inner:hover {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //     }
+
+  //     color: #606266;
+
+  //     .el-input__inner {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //       color: #606266;
+  //     }
+
+  //     .el-textarea__inner {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //       color: #606266;
+  //     }
+  //   }
+  // }
 
   /deep/.ws-info-table .el-form-item .el-form-item__label {
     width: 130px;

+ 102 - 33
src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -24,8 +24,8 @@
         </el-col>
         <el-col :span="8">
           <div style='text-align:center;'>
-            <el-button @click='add' type="primary" v-if="qyJurisdiction || serviceManagementType == 1">新增</el-button>
-            <el-button @click='deletelist' type="danger" v-if="qyJurisdiction || serviceManagementType == 1">删除
+            <el-button @click='add' type="primary" v-if="qyJurisdiction&&statusTypetext == '初检' || serviceManagementType == 1">新增</el-button>
+            <el-button @click='deletelist' type="danger" v-if="qyJurisdiction&&statusTypetext == '初检' || serviceManagementType == 1">删除
             </el-button>
           </div>
         </el-col>
@@ -46,7 +46,7 @@
             <div style="margin: 0 auto">
               <div class="title">
                 基本信息
-                <el-checkbox v-if="statusTypetext == '初检' && !qyJurisdiction" v-model="directselling">原箱直销
+                <el-checkbox v-if="statusTypetext == '初检' && zjJurisdiction" v-model="directselling">原箱直销
                   <el-tooltip class="item" effect="dark" content="集装箱入库不开箱直接销售" placement="top-start">
                     <i class="el-icon-question"></i>
                   </el-tooltip>
@@ -64,7 +64,7 @@
                   <ws-input v-model="deptBudgetList.qualityNo" placeholder="自动获取,不可编辑" maxlength="100" disabled
                     size="small" />
                 </ws-form-item> -->
-                <ws-form-item v-if='serviceManagementType == 3 && !qyJurisdiction' label="购粮性质" span="1"
+                <ws-form-item v-if='serviceManagementType == 3 && zjJurisdiction&&statusTypetext == "初检"||serviceManagementType == 3 && statusTypetext != "初检"' label="购粮性质" span="1"
                   prop="natureOfGrainPurchase">
                   <ws-input v-model="deptBudgetList.natureOfGrainPurchase" placeholder="请输入购粮性质" maxlength="10"
                     size="small" :disabled="disabled" />
@@ -77,7 +77,7 @@
                   </el-select>
                 </ws-form-item>
 
-                <ws-form-item v-if='serviceManagementType == 3 && qyJurisdiction' label="货名" span="1"
+                <ws-form-item v-if='serviceManagementType == 3 && qyJurisdiction&&statusTypetext == "初检"||serviceManagementType == 3 && statusTypetext != "初检"' label="货名" span="1"
                   prop="inOutTaskNo">
                   <el-select :disabled='disablednotarize || goodsdisabled' v-model="deptBudgetList.goodsName" clearable
                     filterable placeholder="请选择" class="typeselect" @change="goodsNameChange">
@@ -85,13 +85,13 @@
                       :value="item.goodsName" />
                   </el-select>
                 </ws-form-item>
-                <ws-form-item label="类型" span="1" prop="type" v-if="!qyJurisdiction">
+                <ws-form-item label="类型" span="1" prop="type" v-if="zjJurisdiction && statusTypetext == '初检'||statusTypetext != '初检'">
                   <ws-select v-model="deptBudgetList.type">
                     <ws-option v-for="item in typeList" :key="'leixin' + item" :label="item" :value="item" />
                   </ws-select>
                 </ws-form-item>
 
-                <ws-form-item v-if='serviceManagementType == 3 && !qyJurisdiction' label="仓位号" span="1"
+                <ws-form-item v-if='serviceManagementType == 3 && zjJurisdiction && statusTypetext == "初检"||serviceManagementType == 3 && statusTypetext != "初检"' label="仓位号" span="1"
                   prop="inOutTaskNo">
                   <el-select :disabled='recheck' filterable clearable v-model="deptBudgetList.binNumber"
                     placeholder="请选择仓位号" class="typeselect" @change="binNumberChange">
@@ -99,23 +99,23 @@
                       :value="item.binNumber" />
                   </el-select>
                 </ws-form-item>
-                <ws-form-item label="箱号-1" span="1" prop="boxNo" v-if="serviceManagementType == 3 && qyJurisdiction">
+                <ws-form-item label="箱号-1" span="1" prop="boxNo" v-if="serviceManagementType == 3 && qyJurisdiction && statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检'">
                   <ws-input :disabled='recheck' v-model="deptBudgetList.boxNo" placeholder="请输入箱号" maxlength="20"
                     size="small" />
                 </ws-form-item>
 
 
-                <ws-form-item v-if='serviceManagementType == 3 && !qyJurisdiction' label="囤位号" span="1"
+                <ws-form-item v-if='serviceManagementType == 3 && zjJurisdiction && statusTypetext == "初检"||serviceManagementType == 3 && statusTypetext != "初检"' label="囤位号" span="1"
                   prop="storageTagNo">
                   <ws-input :disabled='recheck' v-model="deptBudgetList.storageTagNo" placeholder="选填,1-10个字符"
                     maxlength="10" size="small" />
                 </ws-form-item>
-                <ws-form-item label="封号-1" span="1" prop="titleNo" v-if="serviceManagementType == 3 && qyJurisdiction">
+                <ws-form-item label="封号-1" span="1" prop="titleNo" v-if="serviceManagementType == 3 && qyJurisdiction&&statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检'">
                   <ws-input :disabled='recheck' v-model="deptBudgetList.titleNo" placeholder="请输入封号" maxlength="20"
                     size="small" />
                 </ws-form-item>
 
-                <ws-form-item v-if='serviceManagementType == 3 && qyJurisdiction' label="运输方式" span="1" prop="outType">
+                <ws-form-item v-if='serviceManagementType == 3 && qyJurisdiction&&statusTypetext == "初检"||serviceManagementType == 3 && statusTypetext != "初检"' label="运输方式" span="1" prop="outType">
                   <el-select v-if='serviceManagementType == 3' @change='outTypechange' :disabled='recheck'
                     v-model="outType" placeholder="请选择运输方式">
                     <el-option v-for="item in multiSelector1" :key="item.id"
@@ -124,11 +124,11 @@
                   </el-select>
                 </ws-form-item>
                 <ws-form-item label="箱号-2" span="1" prop="boxNoOther"
-                  v-if="serviceManagementType == 3 && qyJurisdiction">
+                  v-if="serviceManagementType == 3 && qyJurisdiction&&statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检'">
                   <ws-input :disabled='recheck' v-model="deptBudgetList.boxNoOther" placeholder="请输入箱号" maxlength="20"
                     size="small" />
                 </ws-form-item>
-                <ws-form-item v-if='serviceManagementType == 3 && qyJurisdiction' label="客户" span="1"
+                <ws-form-item v-if='serviceManagementType == 3 && qyJurisdiction&&statusTypetext == "初检"||serviceManagementType == 3 && statusTypetext != "初检"' label="客户" span="1"
                   prop="customerName">
                   <el-select v-model="deptBudgetList.customerName" clearable filterable placeholder="请选择"
                     class="typeselect" @change="customerChange" :disabled="disabled1">
@@ -137,11 +137,11 @@
                   </el-select>
                 </ws-form-item>
                 <ws-form-item label="封号-2" span="1" prop="titleNoOther"
-                  v-if="serviceManagementType == 3 && qyJurisdiction">
+                  v-if="serviceManagementType == 3 && qyJurisdiction&&statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检'">
                   <ws-input :disabled='recheck' v-model="deptBudgetList.titleNoOther" placeholder="请输入封号" maxlength="20"
                     size="small" />
                 </ws-form-item>
-                <ws-form-item v-if="serviceManagementType == 3 && qyJurisdiction" label="车牌号" span="1" prop="carNo">
+                <ws-form-item v-if="serviceManagementType == 3 && qyJurisdiction&&statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检'" label="车牌号" span="1" prop="carNo">
                   <ws-input :disabled="disabled2"
                     v-if="options2.length == 0 && serviceManagementType == 1 || serviceManagementType == 3 && carNumberList.length == 0"
                     v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
@@ -319,10 +319,10 @@
 
               </ws-info-table>
 
-              <div class="title" v-if="!qyJurisdiction || serviceManagementType == 1">质检数据 <span class="bulu">补录:</span>
+              <div class="title" v-if="serviceManagementType == 3 &zjJurisdiction&&statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检' || serviceManagementType == 1">质检数据 <span class="bulu">补录:</span>
                 <el-switch v-model="value1"></el-switch>
               </div>
-              <ws-info-table v-if="!qyJurisdiction || serviceManagementType == 1">
+              <ws-info-table v-if="serviceManagementType == 3 &zjJurisdiction&&statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检' || serviceManagementType == 1">
                 <ws-form-item label="等级" span="1" prop="outType">
                   <ws-select style="margin-right:10px;" v-if='statusTypetext != "复检"' v-model="deptBudgetList.grade"
                     placeholder class="typeselect" @change="selectpackingMethod">
@@ -387,7 +387,7 @@
                     placeholder="请输入不完善粒占比" maxlength="40" size="small" />
                 </ws-form-item>
               </ws-info-table>
-              <ws-info-table v-if="!qyJurisdiction">
+              <ws-info-table v-if="zjJurisdiction&&statusTypetext == '初检'||statusTypetext != '初检'">
                 <ws-form-item label="净重单价(元/公斤)" span="1" prop="tidalGrainPrice"
                   v-if="deptBudgetList.type == '潮粮' && serviceManagementType == 3">
                   <ws-input type="number" @mousewheel.native.prevent v-model="deptBudgetList.tidalGrainPrice"
@@ -421,7 +421,7 @@
           <el-table highlight-current-row @cell-click='listclick' :data="inspect" style="width: 100%; margin-top: 20px"
             ref="inspect" border>
             <el-table-column prop="qualityNo" width="100" label="业务编号"></el-table-column>
-            <el-table-column prop="carNumber" label="车牌号"></el-table-column>
+            <el-table-column v-if='serviceManagementType == 1||serviceManagementType == 3&&statusTypetext == "初检"&&qyJurisdiction||serviceManagementType == 3&&statusTypetext != "初检"' prop="carNumber" label="车牌号"></el-table-column>
             <el-table-column prop="status" label="状态">
               <template slot-scope="scope">
                 <span v-if='scope.row.confirm == "1"'>
@@ -533,7 +533,7 @@ export default {
       //分页
       currentPage: 1,
       cost: '',
-      pageSize: 50,
+      pageSize: 10,
       isShowPrint: false,
       typeList: ['干粮', '潮粮'],
       disablednotarize: false,
@@ -660,16 +660,18 @@ export default {
       isQy: false,
       isZj: false,
       qyJurisdiction: false,
+      zjJurisdiction: false,
     }
   },
   mounted() {
-    debugger
+    // debugger
     // const roleName = localStorage.getItem('ws-pf_roleName');
     // if(roleName=='钎样员'){
     //   this.isQy= true
     // }
     //获取钎样员权限
     this.qyJurisdiction = getHp('acquisitionManagement.acquisitionQuality.qview')
+    this.zjJurisdiction= getHp('acquisitionManagement.acquisitionQuality.initial')
     console.log(111111111)
     console.log(this.qyJurisdiction)
     //获取质检员权限
@@ -724,6 +726,8 @@ export default {
       if (type == 1) {
         if (this.serviceManagementType == 3 && this.qyJurisdiction) {
           this.statusType = 0
+        }else{
+          this.statusType=1
         }
         getinspectList({
           compId: localStorage.getItem('ws-pf_compId'),
@@ -751,6 +755,8 @@ export default {
             that.refresh = 60
             if (this.serviceManagementType == 3 && this.qyJurisdiction) {
               this.statusType = 0
+            }else{
+              this.statusType=1
             }
             getinspectList({
               compId: localStorage.getItem('ws-pf_compId'),
@@ -764,7 +770,7 @@ export default {
             })
               .toPromise()
               .then((response) => {
-                debugger
+                // debugger
                 that.inspect = response.records
                 that.deptBudgetTotal = response.total
 
@@ -887,7 +893,7 @@ export default {
               this.$set(this.deptBudgetList, 'dryGrainPrice', response)
             })
         }
-        debugger
+        // debugger
         //客户
         getcustomer({
           warehouseId: this.cangid,
@@ -1196,7 +1202,7 @@ export default {
       })
         .toPromise()
         .then((response) => {
-          debugger
+          // debugger
           console.log(response)
           this.deptBudgetList = response
           if (this.statusTypetext == '复检') {
@@ -1367,10 +1373,12 @@ export default {
       // }
     },
     statustypechangelist(status) {
-      debugger
+      // debugger
       this.statusType = status
       if (this.serviceManagementType == 3 && this.qyJurisdiction) {
         this.statusType = 0
+      }else{
+        this.statusType=1
       }
       getinspectList({
         compId: localStorage.getItem('ws-pf_compId'),
@@ -1913,11 +1921,12 @@ export default {
       this.getList()
     },
     submit() {
-      debugger
       if (this.reader) {
         this.reader.cancel()
       }
-      if (!this.qyJurisdiction) {
+      if (this.serviceManagementType==3&&this.zjJurisdiction&&this.statusTypetext=='初检'
+      ||this.serviceManagementType==3&&this.statusTypetext!='初检'
+      ||this.serviceManagementType==1) {
         if (!this.deptBudgetList.binNumber) {
           this.$message({
             message: '请选择仓位号',
@@ -2398,7 +2407,9 @@ export default {
 
 
       }
-
+       if (this.serviceManagementType==3&&this.qyJurisdiction&&this.statusTypetext=='初检'
+      ||this.serviceManagementType==3&&this.statusTypetext!='初检'
+      ||this.serviceManagementType==1) {
       if (!this.deptBudgetList.goodsName) {
         this.$message({
           message: '货名不能为空',
@@ -2421,7 +2432,7 @@ export default {
       //   })
       //   return
       // }
-
+  
       if (this.serviceManagementType == 3) {
 
         if (!this.deptBudgetList.customerName) {
@@ -2522,7 +2533,7 @@ export default {
         })
         return
       }
-
+      }
 
 
       // if (
@@ -2575,13 +2586,17 @@ export default {
               this.deptBudgetList.inOutFlag = 2
               this.deptBudgetList.pcFlag = 1
               this.deptBudgetList.statusFlag = 1
-              this.deptBudgetList.brazer = this.qyJurisdiction ? 1 : 0
+              if (this.serviceManagementType==3&&this.statusTypetext=='初检') {
+                this.deptBudgetList.brazer = this.qyJurisdiction ? 1 : 0
+              }
+              
               if (this.statusTypetext == '初检') {
                 addstorageputList(this.deptBudgetList)
                   .toPromise()
                   .then((response) => {
                     this.deptBudgetList.warehouseInOutId = response
-                    inspectAdd(this.deptBudgetList)
+                    if(!this.deptBudgetList.id){
+                      inspectAdd(this.deptBudgetList)
                       .toPromise()
                       .then((response1) => {
                         if (this.reader) {
@@ -2629,6 +2644,58 @@ export default {
                         console.log(response)
                         // this.$message.warning(response)
                       })
+                    }else{
+                      getinspectEdit(this.deptBudgetList)
+                      .toPromise()
+                      .then((response) => {
+                        if (this.reader) {
+                          this.reader.cancel()
+                        }
+                        if (this.serviceManagementType == 3) {
+                          this.warehouseCount += 1
+                        } else {
+                          this.warehouseTradeCount = Number(this.warehouseTradeCount) + 1
+                          this.warehouseTradeCount1 = Number(this.warehouseTradeCount1) + 1
+                        }
+
+                        this.$message.success('编辑成功')
+                        this.getList()
+                        this.selectWarehouse()
+                        // this.$router.push({
+                        //   path: 'warehouseManagementList',
+                        // })
+                        getinspectLook({
+                          id: this.deptBudgetList.id
+                        })
+                          .toPromise()
+                          .then((response2) => {
+                            //  let printString = localStorage.getItem('ws-pf_compId') + "," + row.qualityNo + "," + this.cangid
+                            //       getQRcode({printString}).toPromise()
+                            //             .then((res) => {
+                            this.deptBudgetList = response2
+                            if (!this.qyJurisdiction) {
+                              this.isShowPrint = true
+                              this.printData = response2
+                              // this.printData.qrCodeUrl = res
+                              // })
+                            }
+
+                            if (this.serviceManagementType == 1) {
+                              this.deptBudgetList.customerName = this.customerName
+                              this.deptBudgetList.customerPhone = this.customerPhone
+                            }
+                            if (response.compName == '黑龙江秋收有限公司') {
+                              this.deptBudgetList.compName = '黑龙江中天昊元贸易有限公司'
+                            }
+                          })
+                          .catch((response) => {
+                            console.log(response)
+                            // this.$message.warning(response)
+                          })
+
+                      })
+                    }
+                    
 
                     // this.$message.success('保存成功')
 
@@ -3235,6 +3302,8 @@ export default {
 
       if (this.serviceManagementType == 3 && this.qyJurisdiction) {
         this.statusType = 0
+      }else{
+        this.statusType = 1
       }
       getinspectList({
         compId: localStorage.getItem('ws-pf_compId'),
@@ -3247,7 +3316,7 @@ export default {
       })
         .toPromise()
         .then((response) => {
-          debugger
+          // debugger
           this.inspect = response.records
           this.deptBudgetTotal = response.total
           // this.$forceUpdate();

+ 4 - 7
src/views/houseSelfCollect/newWeighingManagement.vue

@@ -422,8 +422,8 @@
         types: 1,
         information: '',
         weighingList: {
-          grossWeight: 0,
-          tare: 0,
+          grossWeight: '',
+          tare: '',
           buckleMiscellaneous: 0,
           netWeight: 0,
           
@@ -579,7 +579,7 @@
           }
           if (this.tpyeNo == 1) {
             this.information = '毛重'
-            this.weighingList.tare = 0
+            this.weighingList.tare = ''
           } else if (this.tpyeNo == 2) {
             this.information = '皮重'
           }
@@ -1357,10 +1357,7 @@
           })
           return
         }
-        if (
-          this.weighingList.grossWeight < 1 ||
-          this.weighingList.grossWeight > 200000
-        ) {
+        if (this.weighingList.grossWeight < 1 ||this.weighingList.grossWeight > 200000) {
           this.$message({
             message: '毛重输入错误',
             type: 'warning',

+ 1 - 1
src/views/profitable/cashout.vue

@@ -45,7 +45,7 @@
           <el-form-item label-width='100px' label="费用名称" span="1" prop="settlementMethod">
             <el-input class='input50 input_css' placeholder="输入费用名称,1-15个字" v-model="deptBudgetList.expenseName"></el-input>
           </el-form-item>
-          <el-form-item label-width='100px' label="金额" span="1" prop="contractNo" class="readonly">
+          <el-form-item label-width='100px' label="金额(元)" span="1" prop="contractNo" class="readonly">
             <el-input class='input50 input_css' placeholder="输入请款金额" v-model="deptBudgetList.amountMoney"></el-input>
           </el-form-item>
           <el-form-item label-width='100px' label="备注" span="1" prop="settlementMethod">

+ 1 - 1
src/views/profitable/cashoutaduit.vue

@@ -38,7 +38,7 @@
           <el-form-item label-width='100px' label="费用名称" span="1" prop="settlementMethod">
             {{deptBudgetList.expenseName}}
           </el-form-item>
-          <el-form-item label-width='100px' label="金额" span="1" prop="contractNo" class="readonly">
+          <el-form-item label-width='100px' label="金额(元)" span="1" prop="contractNo" class="readonly">
             {{deptBudgetList.amountMoney}}
           </el-form-item>
           <el-form-item label-width='100px' label="备注" span="1" prop="settlementMethod">

+ 1 - 1
src/views/profitable/cashoutedit.vue

@@ -45,7 +45,7 @@
           <el-form-item label-width='100px' label="费用名称" span="1" prop="settlementMethod">
             <el-input class='input50 input_css' placeholder="输入费用名称,1-15个字" v-model="deptBudgetList.expenseName"></el-input>
           </el-form-item>
-          <el-form-item label-width='100px' label="金额" span="1" prop="contractNo" class="readonly">
+          <el-form-item label-width='100px' label="金额(元)" span="1" prop="contractNo" class="readonly">
             <el-input class='input50 input_css' placeholder="输入请款金额" v-model="deptBudgetList.amountMoney"></el-input>
           </el-form-item>
           <el-form-item label-width='100px' label="备注" span="1" prop="settlementMethod">

+ 3 - 3
src/views/profitable/receipt.vue

@@ -14,11 +14,11 @@
         <el-form label-position='left'><div style='margin:20px -30px;font-weight:bold'>基本信息</div>
           <el-form-item  label-width='100px' label="用途" span="1" prop="contractNo" class="readonly">
             <ws-select v-model="deptBudgetList.purpose" placeholder="" class="typeselect" >
-              <ws-option label="合同费用" value="1"
+              <ws-option label="合同费用" value="合同费用"
                 style="color: #8890b1" />
-                <ws-option label="库点费用" value="2"
+                <ws-option label="库点费用" value="库点费用"
                 style="color: #8890b1" />
-                <ws-option label="经营性费用" value="3"
+                <ws-option label="经营性费用" value="经营性费用"
                 style="color: #8890b1" />
             </ws-select>
           </el-form-item>

+ 0 - 2
src/views/taskManagement/supplyofgoods.vue

@@ -243,8 +243,6 @@
           this.value2=[start, end.split(' ')[0]]
         this.getList()
           })
-      
-      
     },
       preview(){
         this.gainList=this.multipleSelection

+ 0 - 1
src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -88,7 +88,6 @@
           <template slot-scope="scope">
             <span class="corles" @click="nocomplete(scope.row)" v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.View`
-
               ">查看</span>
             <span v-hasPermission="`warehouseManagement.warehouse.warehouseInfoTask.audit`">
               <el-divider direction="vertical" v-if="scope.row.taskStatus == '待审核'"></el-divider>

+ 1 - 1
src/views/warehousenew/component/router/index.js

@@ -446,7 +446,7 @@ const warehouseManagementRouter = {
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
       },
-    },        
+    },
   ],
 };
 export default warehouseManagementRouter;