Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/components/WsUpload/index.vue

@@ -39,11 +39,14 @@
       </template>
       <template v-slot:file="{ file }">
         <div class="thumbnail-group">
-          <img
+          <img 
+          v-if='getFileClass(file)=="ext png"'
           :src='file.url'
             class="el-upload-list__item-thumbnail"
             :class="getFileClass(file)"
           />
+          <div v-else class="el-upload-list__item-thumbnail"
+            :class="getFileClass(file)"></div>
         </div>
         <div class="fileName" v-if="showName" :title="file.name">
           {{ file.name }}

src/views/contractManagement/collectionContractEdit.vue

@@ -293,7 +293,7 @@
         <!--备注信息-->
         <ws-input v-model="deptBudgetList.remarks" type="textarea" row="3" placeholder="请输入备注信息，不超过200字"
           maxlength="200" />
-        <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :editable="false" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" v-hasPermission="
+        <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :editable="true" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" v-hasPermission="
             `contractManagement.salesContract.salesContractInfo.appl`"/>
       </ws-form>
     </div>

src/views/contractManagement/futuresSalesContractEdit.vue

@@ -305,7 +305,7 @@
       <ws-input v-model="deptBudgetList.remarks" type="textarea" row="3" placeholder="请输入备注信息，不超过200字"
         maxlength="200" />
 
-      <ws-upload ref="upload" :comp-id="compId" :editable="false" :appendix-ids="deptBudgetList.addressUrl"  accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+      <ws-upload ref="upload" :comp-id="compId" :editable="true" :appendix-ids="deptBudgetList.addressUrl"  accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
     </ws-form>
     <div v-if="dialogVisible" class="map">
       <map-drag @marker="marker" :isShowaddress="true" v-on:addressListen="getAddress" :type="type">

src/views/contractManagement/priceConfirmationSheetAdd.vue

@@ -561,48 +561,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 {
@@ -679,47 +679,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;

src/views/contractManagement/priceConfirmationSheetEdit.vue

@@ -534,43 +534,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;
@@ -584,9 +584,9 @@ export default {
 .collapse-bottom {
   margin-bottom: 20px;
 }
-.shangchuan {
-  margin-left: 22px;
-}
+// .shangchuan {
+//   margin-left: 22px;
+// }
 .input-main .textarea .el-textarea__inner {
   width: 100%;
   z-index: 1;
@@ -631,56 +631,56 @@ 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;
+//     }
+//   }
+// }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   width: 130px;
 }
 //*号
-.unchangeable {
-  position: absolute;
-  width: 9px;
-  height: 22px;
-  font-size: 16px;
-  font-family: PingFangSC-Medium, PingFang SC;
-  font-weight: 500;
-  color: #ff2727;
-  line-height: 22px;
-  display: inline-block;
-  right: 14px;
-}
+// .unchangeable {
+//   position: absolute;
+//   width: 9px;
+//   height: 22px;
+//   font-size: 16px;
+//   font-family: PingFangSC-Medium, PingFang SC;
+//   font-weight: 500;
+//   color: #ff2727;
+//   line-height: 22px;
+//   display: inline-block;
+//   right: 14px;
+// }
 /deep/.el-input,
 /deep/.el-date-editor {
   font-size: 13px;
@@ -692,17 +692,17 @@ export default {
 /deep/el-date-editor--date {
   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;
   line-height: 32px;
@@ -736,15 +736,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;

src/views/contractManagement/purchaseContract.vue

@@ -694,11 +694,11 @@
     color: #5473e8;
   }
 
-  .warning {
-    width: 100%;
-    height: 2px;
-    background: red;
-  }
+  // .warning {
+  //   width: 100%;
+  //   height: 2px;
+  //   background: red;
+  // }
 
   .executory,
   .inExecution,
@@ -723,33 +723,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;
@@ -876,48 +876,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 {
@@ -945,47 +945,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 {

src/views/contractManagement/purchaseContractAdd.vue

@@ -1807,41 +1807,41 @@ import { isUndefined } from 'xe-utils/methods'
     // 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;

src/views/contractManagement/purchaseContractEdit.vue

@@ -284,7 +284,7 @@
       </base-card>
     </ws-form>
     <div v-if="dialogVisible" class="map">
-      <map-drag @marker="marker"  :editable="false" :isShowaddress='true' v-on:addressListen='getAddress' :type="type"></map-drag>
+      <map-drag @marker="marker"  :editable="true" :isShowaddress='true' v-on:addressListen='getAddress' :type="type"></map-drag>
     </div>
     <div style="text-align: right; padding: 10px">
       <el-button class="bg-bottom" type="primary" size="small" @click="submit()">提交</el-button>
@@ -1300,48 +1300,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 {
@@ -1414,47 +1414,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 {
@@ -1511,16 +1511,16 @@
     display: none;
   }
 
-  .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;

src/views/contractManagement/salesContract.vue

@@ -774,33 +774,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;

src/views/contractManagement/salesContractEdit.vue

@@ -366,7 +366,7 @@
         <!--备注信息-->
         <ws-input v-model="deptBudgetList.remarks" type="textarea" row="3" placeholder="请输入备注信息，不超过200字"
           maxlength="200" />
-        <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :editable="false" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" v-hasPermission="
+        <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :editable="true" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" v-hasPermission="
             `contractManagement.salesContract.salesContractInfo.appl`"/>
       </ws-form>
     </div>

src/views/contractManagement/storageContractEdit.vue

@@ -312,7 +312,7 @@
         <!--备注信息-->
         <ws-input v-model="deptBudgetList.remarks" type="textarea" row="3" placeholder="请输入备注信息，不超过200字"
           maxlength="200" />
-        <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :editable="false" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" v-hasPermission="
+        <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :editable="true" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" v-hasPermission="
             `contractManagement.salesContract.salesContractInfo.appl`"/>
       </ws-form>
     </div>

src/views/contractManagement/storageContractExamine.vue

@@ -354,32 +354,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%;
@@ -390,19 +390,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;
@@ -441,41 +441,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;
@@ -518,19 +518,19 @@
     margin: 15px 0px;
   }
 
-  .wenzi {
-    width: 900px;
-    margin: 0 auto;
-  }
+  // .wenzi {
+  //   width: 900px;
+  //   margin: 0 auto;
+  // }
 
-  .wenzi h3 {
-    display: inline-block;
-    left: 10px;
-  }
+  // .wenzi h3 {
+  //   display: inline-block;
+  //   left: 10px;
+  // }
 
-  .wenzi p {
-    display: inline-block;
-  }
+  // .wenzi p {
+  //   display: inline-block;
+  // }
 
   .center {
     width: 900px;
@@ -545,57 +545,57 @@
     text-align: center;
   }
 
-  .ce {
-    width: 900px;
-    margin: 0 auto;
-  }
+  // .ce {
+  //   width: 900px;
+  //   margin: 0 auto;
+  // }
 
   /*.crt-main .textarea /deep/ .el-form-item__label {*/
   /*  height: 82px;*/
   /*}*/
   // 控制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 {

src/views/profitable/contractprofits.vue

@@ -103,7 +103,10 @@
           name: "玉米",
           count: 2000,
         }],
+        contracttypelist:[],
         deptBudgetList:{},
+        datalist1:[],
+        datalist2:[6.0, 60.9, 90.0, 23.2, 25.6, 76.7, 135.6, 162.2, -32.6, 20.0],
         makeWordData: {},
         valueData: [{
             date: 10
@@ -117,12 +120,23 @@
     },
     activated() {
       this.makeWordData = this.getData(2)
-      this.initCharts()
+     
       this.getPassYearFormatDate()
       this.getList()
     },
     methods: {
       getList() {
+        for (let i = 0; i < this.datalist2.length; i++) {
+          if(this.datalist2[i]<0){
+            this.datalist1.push({value:Math.abs(this.datalist2[i]),
+          itemStyle: {
+            color: '#FF9F24'
+          }})
+          }else{
+            this.datalist1.push({value:Math.abs(this.datalist2[i])})
+          }
+        }
+         this.initCharts()
         // getceshi({
         //  driverId:'8f1f3c624d7946d79a9d44a4057d969b'
         // })
@@ -177,9 +191,6 @@
             tooltip: {
               trigger: 'axis'
             },
-            legend: {
-              data: ['支出', '收入']
-            },
             toolbox: {
               show: true,
               feature: {
@@ -201,52 +212,38 @@
             },
             calculable: true,
             xAxis: [{
-              name: '种类',
+
               type: 'category',
               // prettier-ignore
-              data: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct']
+              data: this.contracttypelist
             }],
             yAxis: [{
               name: '利润（万元）',
               type: 'value'
             }],
             series: [{
-                name: '支出',
                 type: 'bar',
                 right: 0,
                 // label: {
                 //   show: true,
                 //   position: 'inside'
                 // },
-                 label: {
-                  show: true,
-                  precision: 1,
-                  position: 'top',
-                  valueAnimation: true,
-                  fontFamily: 'monospace'
-                },
-                data: [
-                  6.0, 60.9, 90.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0
-                ],
-                color: ['#5878E8 '],
-                formatter: '{value} 元',
-
-              },
-              {
-                name: '收入',
-                type: 'bar',
-                right: 20,
                 label: {
                   show: true,
                   precision: 1,
                   position: 'top',
                   valueAnimation: true,
-                  fontFamily: 'monospace'
+                  fontFamily: 'monospace',
+                  formatter:  function(params){
+                    return app.datalist2[params.dataIndex]
+                  },
+                  textStyle: { //数值样式
+										color: 'black',
+										fontSize: 14
+                  },
                 },
-                data: [
-                  102.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8
-                ],
-                color: ['#FF9F24'],
+                data: this.datalist1,
+                color: ['#5878E8 '],
                 formatter: '{value} 元',
               }
             ]

src/views/profitable/expensemanagement.vue

@@ -44,24 +44,25 @@
             {{tablelist.contractIn}}
           </ws-form-item>
           <ws-form-item label="库点费用收入（万元）" span="1" prop="settlementMethod">
+            {{tablelist.warehouseIn}}
           </ws-form-item>
           <ws-form-item label="合同费用支出（万元）" span="1" prop="contractNo" class="readonly">
-            
+            {{tablelist.contractOut}}
           </ws-form-item>
           <ws-form-item label="库点费用支出（万元）" span="1" prop="settlementMethod">
-            
+            {{tablelist.warehouseOut}}
           </ws-form-item>
           <ws-form-item label="经营性收入（万元）" span="1" prop="contractNo" class="readonly">
-            
+            {{tablelist.managementIn}}
           </ws-form-item>
           <ws-form-item label="贸易利润（万元）" span="1" prop="settlementMethod">
-            
+            {{tablelist.contractIn}}
           </ws-form-item>
           <ws-form-item label="经营性支出（万元）" span="1" prop="contractNo" class="readonly">
-            
+            {{tablelist.managementOut}}
           </ws-form-item>
           <ws-form-item label="净利润（万元）" span="1" prop="settlementMethod">
-            
+            {{tablelist.contractIn}}
           </ws-form-item>
         </ws-info-table>
         </ws-form>
@@ -235,9 +236,6 @@
             tooltip: {
               trigger: 'axis'
             },
-            legend: {
-              data: ['支出', '收入']
-            },
             toolbox: {
               show: true,
               feature: {
@@ -296,10 +294,14 @@
                   precision: 1,
                   position: 'top',
                   valueAnimation: true,
-                  fontFamily: 'monospace'
+                  fontFamily: 'monospace',
+                  textStyle: { //数值样式
+										color: 'black',
+										fontSize: 14
+                  },
                 },
                 data: this.incomelist,
-                color: ['#FF9F24'],
+                color: ['#5878E8 '],
                 formatter: '{value} 元',
               },{
                 name: '支出',
@@ -310,14 +312,14 @@
                 //   position: 'inside'
                 // },
                  label: {
-                  show: true,
+                  show: false,
                   precision: 1,
                   position: 'top',
                   valueAnimation: true,
                   fontFamily: 'monospace'
                 },
                 data:this.expenditurelist,
-                color: ['#5878E8 '],
+                color: ['#FF9F24'],
                 formatter: '{value} 元',
 
               }

src/views/profitable/warehouseprofits.vue

@@ -102,6 +102,9 @@
           name: "玉米",
           count: 2000,
         }],
+        datalist2:[],
+        datalist1:[],
+        goodstypelist:[],
         deptBudgetList:{},
         makeWordData: {},
         valueData: [{
@@ -115,13 +118,25 @@
       }
     },
     activated() {
+      this.getList()
       this.makeWordData = this.getData(2)
-      this.initCharts()
+      
       this.getPassYearFormatDate()
-      this.getList()
+      
     },
     methods: {
       getList() {
+        
+        for (let i = 0; i < this.datalist2.length; i++) {
+          if(this.datalist2[i]<0){
+            this.datalist1.push({value:Math.abs(this.datalist2[i]),
+          itemStyle: {
+            color: '#a90000'
+          }})
+          }else{
+            this.datalist1.push({value:Math.abs(this.datalist2[i])})
+          }
+        }
         // getceshi({
         //  driverId:'8f1f3c624d7946d79a9d44a4057d969b'
         // })
@@ -130,7 +145,7 @@
         // debugger
         // console.log(response)
         // })
-
+        this.initCharts()
       },
       detail(){
         this.$router.push({name:'warehouseprofitsdetails'})
@@ -176,9 +191,6 @@
             tooltip: {
               trigger: 'axis'
             },
-            legend: {
-              data: ['支出', '收入']
-            },
             toolbox: {
               show: true,
               feature: {
@@ -200,53 +212,40 @@
             },
             calculable: true,
             xAxis: [{
-              name: '种类',
+
               type: 'category',
               // prettier-ignore
-              data: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct']
+              data: this.goodstypelist
             }],
             yAxis: [{
-              name: '储量（吨）',
+              name: '利润（万元）',
               type: 'value'
             }],
             series: [{
-                name: '支出',
                 type: 'bar',
                 right: 0,
                 // label: {
                 //   show: true,
                 //   position: 'inside'
                 // },
-                 label: {
+                label: {
                   show: true,
                   precision: 1,
                   position: 'top',
                   valueAnimation: true,
-                  fontFamily: 'monospace'
+                  fontFamily: 'monospace',
+                  formatter:  function(params){
+                    return app.datalist2[params.dataIndex]
+                  },
+                  textStyle: { //数值样式
+										color: 'black',
+										fontSize: 14
+                  },
                 },
-                data: [
-                  6.0, 60.9, 90.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0
-                ],
+                data: this.datalist1,
                 color: ['#5878E8 '],
                 formatter: '{value} 元',
 
-              },
-              {
-                name: '收入',
-                type: 'bar',
-                right: 20,
-                label: {
-                  show: true,
-                  precision: 1,
-                  position: 'top',
-                  valueAnimation: true,
-                  fontFamily: 'monospace'
-                },
-                data: [
-                  102.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8
-                ],
-                color: ['#FF9F24'],
-                formatter: '{value} 元',
               }
             ]
           },
@@ -395,10 +394,10 @@
 /deep/.ws-info-table{
   border-left: 1px solid #D8DCE6;
   border-top: 1px solid #D8DCE6;
-.el-form-item {
-    border-right: 1px solid #D8DCE6;
-    border-bottom: 1px solid #D8DCE6;
-}
+  .el-form-item {
+      border-right: 1px solid #D8DCE6;
+      border-bottom: 1px solid #D8DCE6;
+  }
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
     background-color: #F6F7FB;

src/views/taskManagement/supplyofgoods.vue

@@ -77,7 +77,7 @@
         <el-table-column prop="goodsName" class="table_td" label="入库单日期"></el-table-column>
         <el-table-column prop="outWeight" class="table_td" label="预计出库重量（吨）">
             <template slot-scope="scope">
-                <el-input v-model="scope.row.outWeight" placeholder="输入本次出库重量"></el-input>
+                <el-input @input='outweightchange' v-model="scope.row.outWeight" placeholder="输入本次出库重量"></el-input>
             </template>
         </el-table-column>
       </el-table>
@@ -187,7 +187,9 @@
         searchKeyWord: '',
         inOutType:'',
         num:0,
+        num2:0,
         content:'',
+        multipleSelection1:[],
         contractType: 2,
         // 提交类型
         submitType: true,
@@ -230,9 +232,24 @@
        handleSelectionChange(val) {
          this.num=0
          this.content=''
+         this.multipleSelection1=[]
          for (let i = 0; i < val.length; i++) {
-          this.num+=val[i].outWeight;
-          this.content=this.content?this.content:''+val[i].goodsName+val[i].outWeight+','
+          this.num+=Number(val[i].outWeight);
+          if(this.multipleSelection1.length>0){
+            console.log(222221)
+            for (let q = 0; q < this.multipleSelection1.length; q++) {
+              if(this.multipleSelection1[q].goodsName==val[i].goodsName){
+                this.multipleSelection1[q].outWeight=Number(this.multipleSelection1[q].outWeight)+Number(val[i].outWeight)
+              }
+              this.content=this.content+this.multipleSelection1[q].goodsName+this.multipleSelection1[q].outWeight+'吨，'
+            }
+          }else{
+            console.log(111111)
+            this.multipleSelection1.push(val[i])
+            for (let q = 0; q < this.multipleSelection1.length; q++) {
+              this.content=this.content+this.multipleSelection1[q].goodsName+this.multipleSelection1[q].outWeight+'吨，'
+            }
+          }
          }
         this.multipleSelection = val;
       },
@@ -255,7 +272,30 @@
           })
       
       },
-      
+      outweightchange(){
+         this.num=0
+         this.content=''
+        this.multipleSelection1=[]
+         for (let i = 0; i < this.multipleSelection.length; i++) {
+          this.num+=Number(this.multipleSelection[i].outWeight);
+          if(this.multipleSelection1.length>0){
+            console.log(222221)
+            for (let q = 0; q < this.multipleSelection1.length; q++) {
+              console.log(this.content)
+              if(this.multipleSelection1[q].goodsName==this.multipleSelection[i].goodsName){
+                this.multipleSelection1[q].outWeight=Number(this.multipleSelection1[q].outWeight)+Number(this.multipleSelection[i].outWeight)
+              }
+              this.content=this.content+this.multipleSelection1[q].goodsName+this.multipleSelection1[q].outWeight+'吨，'
+            }
+          }else{
+            console.log(111111)
+            this.multipleSelection1.push(this.multipleSelection[i])
+            for (let q = 0; q < this.multipleSelection1.length; q++) {
+              this.content=this.content+this.multipleSelection1[q].goodsName+this.multipleSelection1[q].outWeight+'吨，'
+            }
+          }
+         }
+      },
       getList() {
          getwarehousingorder({
             compId: localStorage.getItem('ws-pf_compId'),
@@ -273,6 +313,31 @@
           })
       },
       submit(){
+        for (let i = 0; i < this.multipleSelection.length; i++) {
+          if(!this.multipleSelection[i].outWeight){
+              this.$message({
+              message: '预计出库重量不能为空',
+              type: 'error'
+              });
+              return
+
+          }
+          if(this.multipleSelection[i].outWeight>this.multipleSelection[i].surplusWeight){
+            this.$message({
+              message: '预计出库重量不能超过剩余重量',
+              type: 'error'
+              });
+              return
+          }   
+          if(this.multipleSelection[i].outWeight.indexOf('.')!=-1&&this.multipleSelection[i].outWeight.substring(this.multipleSelection[i].outWeight.indexOf('.')+1, this.multipleSelection[i].outWeight.length).length>3){
+            this.$message({
+              message: '预计出库重量输入错误',
+              type: 'error'
+              });
+              return
+          }
+          
+        }
         var that=this
         this.$confirm(`确定提交货源信息？`, {
             confirmButtonText: '确定',

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -67,14 +67,14 @@
 						</el-input>
 					</el-form-item>
 					<!-- 货名 -->
-					<el-form-item label="货名" class="huom">
-						<el-select :disabled="dataList.taskTypeKey != 3" v-model="dataList.goodsName" placeholder="货名"
+					<!-- <el-form-item label="货源" class="huom">
+						<el-select :disabled="dataList.taskTypeKey != 3" v-model="dataList.goodsName" placeholder="货源"
 							class="huom" @change="selectgoodsName" filterable clearable>
 							<el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"
 								:value="item.constValue"></el-option>
 						</el-select>
 						<el-button class="bg-bottom" type="primary" size="small" @click="supplygoods()">选择货源</el-button>
-					</el-form-item>
+					</el-form-item> -->
 					<!--重量（吨）-->
 					<el-form-item label="重量（吨）">
 						<el-input @input="weightchange1" v-model="dataList.weight" placeholder="请输入重量（吨）"
@@ -171,16 +171,16 @@
 						</el-select>
 					</el-form-item>
 					<!-- 货名 -->
-					<el-form-item label="货源" class="huom">
-						<!-- <el-select :disabled="dataList.taskTypeKey != 3 || dataList.taskTypeKey == 3" filterable clearable
+					<!--<el-form-item label="货源" class="huom">
+						 <el-select :disabled="dataList.taskTypeKey != 3 || dataList.taskTypeKey == 3" filterable clearable
 							v-model="dataList.goodsName" placeholder="货名" class="huom" @change="selectgoodsName1">
 							<el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"
 								:value="item.constValue"></el-option>
-						</el-select> -->
+						</el-select> 
 						<el-input disabled v-model="dataList.sourceId" placeholder="请选择货源"
 							maxlength="120" size="small" class="huom" />
 						<el-button v-if='dataList.taskTypeKey!=3' class="bg-bottom" type="primary" size="small" @click="supplygoods()">选择货源</el-button>
-					</el-form-item>
+					</el-form-item>-->
 					<!--重量（吨）-->
 					<el-form-item label="重量（吨）">
 						<el-input @input="weightchange" v-model="dataList1.weight" placeholder="请输入重量（吨）"
@@ -282,16 +282,16 @@
 						</el-select>
 					</el-form-item>
 					<!-- 货名 -->
-					<el-form-item label="货名" class="huom">
-						<!-- <el-select :disabled="dataList.taskTypeKey != 3" v-model="dataList.goodsName" placeholder="货名"
+					<!-- <el-form-item label="货源" class="huom">
+						<el-select :disabled="dataList.taskTypeKey != 3" v-model="dataList.goodsName" placeholder="货名"
 							class="huom" @change="selectgoodsName " filterable clearable>
 							<el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"
 								:value="item.constValue"></el-option> 
-						</el-select>-->
+						</el-select>
 						<el-input disabled v-model="dataList.sourceId" placeholder="请选择货源"
 							maxlength="120" size="small" class="huom" />
-						<!-- <el-button class="bg-bottom" type="primary" size="small" @click="supplygoods()">选择货源</el-button> -->
-					</el-form-item>
+						<el-button class="bg-bottom" type="primary" size="small" @click="supplygoods()">选择货源</el-button>
+					</el-form-item>-->
 					<!--重量（吨）-->
 					<el-form-item label="重量（吨）">
 						<el-input :disabled="dataList.taskTypeKey == 4" v-model="dataList.weight" placeholder="请输入重量（吨）"
@@ -504,12 +504,14 @@
 		activated() {
 			this.getList()
 			var goods=''
+			var num=0
 			this.sourceId=''
 			if(localStorage.setItem("supplygoods")){
 				var supplygoods=JSON.parse(localStorage.setItem("supplygoods"))
 				for (let i = 0; i < supplygoods.length; i++) {
 					goods+=supplygoods[i].goodsName
 					this.sourceId=this.sourceId+','+supplygoods[i].id
+					num+=supplygoods[i].outWeight
 				}
 			}
 			

src/views/warehousenew/warehousingOrder.vue

@@ -1,4 +1,4 @@
-<!--出入库任务-->
+<!--入库单-->
 <template>
   <div class="container">
     <BaseHeaderLayout :leftSpan="16">
@@ -83,9 +83,10 @@
         <el-table-column prop="deliveryWarehouse" label="发货库" width="80"></el-table-column>
         <el-table-column prop="goodsName" label="货名" width="80">
         </el-table-column>
-        <el-table-column prop="inWarehouseWeight"  width="130" class="table_td" label="入库重量（吨）">
+        <el-table-column prop="inWarehouseWeight"  width="200" class="table_td" label="入库重量（吨）">
           <template scope="scope">
-            <span>{{scope.row.inWarehouseWeight}}</span>
+            <span v-if='!scope.row.weightedit&&scope.row.weightshow'>{{scope.row.inWarehouseWeight}}</span>
+            <el-input style='width:80%;' v-if='scope.row.weightedit&&scope.row.weightshow' v-model='scope.row.inWarehouseWeight'></el-input>
             <i @click="changeWeight(scope.row)" v-if="
                 scope.row.weightedit&&scope.row.weightshow" class="iconfont icon-dui"></i>
             <img v-if="!scope.row.weightedit&&scope.row.weightshow" width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
@@ -116,17 +117,17 @@
             <el-input v-else v-model='scope.row.requestFunds'></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="taskStatus" label="请款状态" width="90">
+        <el-table-column prop="approveStatus" label="请款状态" width="90">
           <template slot-scope="scope">
             <template>
               <span slot="reference">
-                <span v-if="scope.row.taskStatus == '待审核'" class="executory"></span>
-                <span v-if="scope.row.taskStatus == '执行中'" class="inExecution"></span>
-                <span v-if="scope.row.taskStatus == '已完成'" class="done"></span>
-                {{ scope.row.taskStatus }}
+                <span v-if="scope.row.approveStatus == '待审核'" class="executory"></span>
+                <span v-if="scope.row.approveStatus == '执行中'" class="inExecution"></span>
+                <span v-if="scope.row.approveStatus == '已完成'" class="done"></span>
+                {{ scope.row.approveStatus }}
               </span>
             </template>
-            <img v-if="scope.row.taskStatus == '执行中'" width="17" height="18"
+            <img v-if="scope.row.approveStatus == '执行中'" width="17" height="18"
               style="vertical-align: text-top; position: relative; top: -1px" src="../../../public/img/edit.png"
               @click="editClick(scope.row)" alt />
           </template>
@@ -393,13 +394,12 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
           item.payshow=false
           for (let i = 0; i < this.multipleSelection.length; i++) {
             this.multipleSelection[i].select=true
-            
           }
         }else{
-           this.$message({
-          message: '至少选择一条待请款条目',
-          type: 'warning'
-        });
+          this.$message({
+            message: '至少选择一条待请款条目',
+            type: 'warning'
+          });
         }
         
       },
@@ -432,7 +432,8 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
             return false
           }else{
             if(row.amountNotPayable>0){
-              if(row.taskStatus!='请款中'){
+              console.log(row.approveStatus)
+              if(row.approveStatus!='请款中'){
                 return true
               }else{
                 return false
@@ -828,7 +829,9 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
 </script>
 <style lang="scss" scoped>
  
-
+/deep/.el-table .cell .el-input {
+    width: 60%;
+}
   .el-select {
     width: 30%;
     margin-right: 10px;