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

src/views/contractManagement/purchaseContractAdd.vue

@@ -46,7 +46,7 @@
         <!--关联合同-->
         <ws-form-item prop="agreementNo" label="关联合同" span="1" v-show="deptBudgetList.agreementType =='补充协议'">
           <ws-select v-model="deptBudgetList.agreementNo" placeholder="请选择编号" @change="selectRelation">
-            <ws-option v-for="item in contractNoList" :key="item.constKey" :label="item.agreementNo"
+            <ws-option v-for="item in contractNoList"  :key="item.id" :label="item.contractNo"
               :value="item.contractNo"></ws-option>
           </ws-select>
         </ws-form-item>
@@ -464,6 +464,8 @@
         agreementType: '',
         deptBudgetList: {
           deliverType: '1',
+          sourceGoods:'',
+          placeDelivery:'',
           agreementType: '采购合同',
           addressUrl: '',
           sellerPhone:'',
@@ -656,6 +658,17 @@
         this.deptBudgetList.totalContractPrice = e * this.deptBudgetList.weight
       },
       returnsales() {
+        this.deptBudgetList = {
+                  deliverType: '1',
+                  agreementType: '采购合同',
+                  finalTradingVolume: 0,
+                  totalContractPrice: 0,
+                  contractGoodsInfo: {
+                    goodsName: '',
+                  },
+                  contractProcessInfo: {},
+                  addressUrl: '',
+                }
         this.$router.push({
           path: 'buyContract'
         })
@@ -718,6 +731,8 @@
           })
       },
       selectRelation(e) {
+        // console.log(this.contractNoList)
+        // debugger
         for (var i = 0; i < this.contractNoList.length; i++) {
           if (this.contractNoList[i].contractNo == e) {
             this.deptBudgetList = this.contractNoList[i]

src/views/contractManagement/salesContractAdd.vue

@@ -35,7 +35,7 @@
           <!--关联合同-->
           <ws-form-item prop="agreementNo" label="关联合同" span="1" v-if="deptBudgetList.agreementType == '补充协议'">
             <ws-select v-model="deptBudgetList.agreementNo" placeholder="请选择编号" @change="selectRelation">
-              <ws-option v-for="item in contractNoList" :key="item.constKey" :label="item.agreementNo"
+              <ws-option v-for="item in contractNoList" :key="item.id" :label="item.contractNo"
                 :value="item.contractNo"></ws-option>
             </ws-select>
           </ws-form-item>
@@ -585,6 +585,17 @@
         this.selectedOptions1 = value
       },
       returnsales() {
+        this.deptBudgetList = {
+                  deliverType: '1',
+                  agreementType: '采购合同',
+                  finalTradingVolume: 0,
+                  totalContractPrice: 0,
+                  contractGoodsInfo: {
+                    goodsName: '',
+                  },
+                  contractProcessInfo: {},
+                  addressUrl: '',
+                }
         this.$router.push({
           path: 'salesContract',
         })

src/views/customerFundManagement/customerFundAdd.vue

@@ -39,7 +39,7 @@
             <ws-input
               v-model="customerList.compName"
               placeholder="请输入公司名称"
-              maxlength="15"
+              maxlength="30"
               size="small"
               :disabled="disabled"
             />
@@ -186,7 +186,7 @@
             <ws-input
               v-model="customerList.payeeName"
               placeholder="请输入收款人姓名"
-              maxlength="15"
+              maxlength="30"
               size="small"
               :disabled="disabled"
             />

src/views/customerFundManagement/customerFundEdit.vue

@@ -39,7 +39,7 @@
             <ws-input
               v-model="customerList.compName"
               placeholder="请输入公司名称"
-              maxlength="15"
+              maxlength="30"
               size="small"
               :disabled="disabled"
             />
@@ -184,7 +184,7 @@
             <ws-input
               v-model="customerList.payeeName"
               placeholder="请输入收款人姓名"
-              maxlength="15"
+              maxlength="30"
               size="small"
               :disabled="disabled"
             />

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -170,7 +170,7 @@ export default {
       for (let i = 0; i < this.warehouseList.length; i++) {
         if (this.warehouseList[i].id == this.selectVal) {
           localStorage.setItem(
-            'houseSelfCollect_house',
+            'houseSelfCollect_house1',
             JSON.stringify(this.warehouseList[i])
           )
           this.warehouseName = this.warehouseList[i].warehouseName
@@ -229,7 +229,7 @@ export default {
           // if(this.userJurisdiction){
           //   this.warehouseList.unshift({warehouseName:response[0].flag})
           // }
-          let _wareHouse = localStorage.getItem('houseSelfCollect_house')
+          let _wareHouse = localStorage.getItem('houseSelfCollect_house1')
           if (_wareHouse) {
             _wareHouse = JSON.parse(_wareHouse)
             this.selectVal = _wareHouse.id
@@ -283,14 +283,14 @@ export default {
       })
         .toPromise()
         .then(response => {
-           let _data = localStorage.getItem('houseSelfCollect_house')
-           _data = JSON.parse(localStorage.getItem('houseSelfCollect_house'))
+           let _data = localStorage.getItem('houseSelfCollect_house1')
+           _data = JSON.parse(localStorage.getItem('houseSelfCollect_house1'))
            if(_data.allowEdit==0){
              _data.allowEdit = 1
            }else{
              _data.allowEdit = 0
            } 
-            localStorage.setItem('houseSelfCollect_house',JSON.stringify(_data))
+            localStorage.setItem('houseSelfCollect_house1',JSON.stringify(_data))
             this.getWarehouseSelf()
           // this.tableData = response.records
         })

src/views/houseSelfCollect/customerManagementAdd.vue

@@ -6,8 +6,14 @@
         <h2 class="bg-left titleup">{{ trader }}粮商</h2>
       </el-col>
       <el-col :span="12" class="bg-right">
-        <el-button class="bg-bottom" type="primary" size="small" @click="cancel"><img width="6" height="10"
-            style="vertical-align: bottom; margin-right: 3px" src="../../../public/img/lujing.png" alt="" />返回
+        <el-button class="bg-bottom" type="primary" size="small" @click="cancel"
+          ><img
+            width="6"
+            height="10"
+            style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回
         </el-button>
       </el-col>
     </el-row>
@@ -17,90 +23,214 @@
           <div style="display: flex; width: 100%; text-align: center">
             <div style="width: 330px; margin: 0 auto">
               <div class="unload-img">上传身份证人像面</div>
-              <el-upload class="avatar-uploader avatar-uploader1" action="https://www.zthymaoyi.com/upload/admin"
-                :show-file-list="false" :on-success="upLoadSuccess1" :disabled="disabled">
-                <img v-if="imageUrl1" :src="imageUrl1" class="avatar">
+              <el-upload
+                class="avatar-uploader avatar-uploader1"
+                action="https://www.zthymaoyi.com/upload/admin"
+                :show-file-list="false"
+                :on-success="upLoadSuccess1"
+                :disabled="disabled"
+              >
+              <!-- :class="avatarshow == true ? 'avatar1' : 'avatar'" -->
+                <img v-if="imageUrl1" :src="imageUrl1" class="avatar" />
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
             </div>
             <div style="width: 330px; margin: 0 auto">
-
               <div class="unload-img">上传身份证国徽面</div>
-              <el-upload class="avatar-uploader avatar-uploader2" action="https://www.zthymaoyi.com/upload/admin"
-                :show-file-list="false" :on-success="upLoadSuccess2" :disabled="disabled">
-                <img v-if="imageUrl2" :src="imageUrl2" class="avatar">
+              <el-upload
+                class="avatar-uploader avatar-uploader2"
+                action="https://www.zthymaoyi.com/upload/admin"
+                :show-file-list="false"
+                :on-success="upLoadSuccess2"
+                :disabled="disabled"
+              >
+                <img v-if="imageUrl2" :src="imageUrl2" class="avatar" />
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
             </div>
           </div>
 
           <div style="display: flex; width: 100%; text-align: center">
-            <div style="width:330px; margin: 0 auto">
+            <div style="width: 330px; margin: 0 auto">
               <div class="unload-img">上传银行卡正面</div>
-              <el-upload class="avatar-uploader avatar-uploader3" action="https://www.zthymaoyi.com/upload/admin"
-                :show-file-list="false" :on-success="bankSuccess1" :disabled="disabled">
-                <img v-if="imageUrl3" :src="imageUrl3" class="avatar">
+              <el-upload
+                class="avatar-uploader avatar-uploader3"
+                action="https://www.zthymaoyi.com/upload/admin"
+                :show-file-list="false"
+                :on-success="bankSuccess1"
+                :disabled="disabled"
+              >
+                <img v-if="imageUrl3" :src="imageUrl3" class="avatar" />
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
             </div>
-            <div style="width:330px; margin: 0 auto">
+            <div style="width: 330px; margin: 0 auto">
               <div class="unload-img">上传银行卡反面</div>
-              <el-upload class="avatar-uploader avatar-uploader4" action="https://www.zthymaoyi.com/upload/admin"
-                :show-file-list="false" :on-success="bankSuccess2" :disabled="disabled">
-                <img v-if="imageUrl4" :src="imageUrl4" class="avatar">
+              <el-upload
+                class="avatar-uploader avatar-uploader4"
+                action="https://www.zthymaoyi.com/upload/admin"
+                :show-file-list="false"
+                :on-success="bankSuccess2"
+                :disabled="disabled"
+              >
+                <img v-if="imageUrl4" :src="imageUrl4" class="avatar" />
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
             </div>
           </div>
-          <ws-form-item label="姓名" span="1" prop="customerName" label-width="80px">
-            <ws-input v-model="customerList.customerName" placeholder="请输入姓名" maxlength="15" size="small"
-              :disabled="disabled" />
+          <ws-form-item
+            label="姓名"
+            span="1"
+            prop="customerName"
+            label-width="80px"
+          >
+            <ws-input
+              v-model="customerList.customerName"
+              placeholder="请输入姓名"
+              maxlength="15"
+              size="small"
+              :disabled="disabled"
+            />
           </ws-form-item>
           <ws-form-item label="身份证号" span="1" prop="customerNumberCard">
-            <ws-input v-model="customerList.customerNumberCard" placeholder="请输入身份证号" maxlength="18" size="small"
+            <ws-input
+              v-model="customerList.customerNumberCard"
+              placeholder="请输入身份证号"
+              maxlength="18"
+              size="small"
+              :disabled="disabled"
+            />
+          </ws-form-item>
+           <ws-form-item label="所属供应商" span="1" prop="supplier" label-width="80px">
+            <ws-input v-model="customerList.supplier" placeholder="请输入供应商姓名" maxlength="15" size="small"
               :disabled="disabled" />
           </ws-form-item>
-          <ws-form-item label="银行卡号" span="1" prop="bankCard">
-            <ws-input type="number" @mousewheel.native.prevent v-model="customerList.bankCard" placeholder="请输入银行卡号" maxlength="19" size="small"
+           <ws-form-item label="供应商电话 " span="1" prop="supplierPhone" label-width="80px">
+            <ws-input v-model="customerList.supplierPhone" placeholder="请输入供应商电话" maxlength="15" size="small"
               :disabled="disabled" />
           </ws-form-item>
+          <ws-form-item label="银行卡号" span="1" prop="bankCard">
+            <ws-input
+              type="number"
+              @mousewheel.native.prevent
+              v-model="customerList.bankCard"
+              placeholder="请输入银行卡号"
+              maxlength="19"
+              size="small"
+              :disabled="disabled"
+            />
+          </ws-form-item>
           <ws-form-item label="开户行" span="1" prop="bankDeposit">
-            <ws-input v-model="customerList.bankDeposit" placeholder="请输入开户行" maxlength="100" size="small"
-              :disabled="disabled" />
+            <ws-input
+              v-model="customerList.bankDeposit"
+              placeholder="请输入开户行"
+              maxlength="100"
+              size="small"
+              :disabled="disabled"
+            />
           </ws-form-item>
           <ws-form-item label="开户支行" span="1" prop="bankDepositBranch">
-            <ws-input v-if="bankInput" v-model="customerList.bankDepositBranch" placeholder="请输入开户支行" maxlength="100" size="small"
-              :disabled="disabled" />
-            <ws-select v-else v-model="customerList.bankDepositBranch" placeholder="请输入开户支行" :disabled="disabled">
-              <ws-option v-for="item in bankList" :key="item" :label="item" :value="item" />
+            <ws-input
+              v-if="bankInput"
+              v-model="customerList.bankDepositBranch"
+              placeholder="请输入开户支行"
+              maxlength="100"
+              size="small"
+              :disabled="disabled"
+            />
+            <ws-select
+              v-else
+              v-model="customerList.bankDepositBranch"
+              placeholder="请输入开户支行"
+              :disabled="disabled"
+            >
+              <ws-option
+                v-for="item in bankList"
+                :key="item"
+                :label="item"
+                :value="item"
+              />
             </ws-select>
-            <el-button type="primary" @click="bankInputChange" v-if="switchType != 2">{{bankText}}</el-button>
+            <el-button
+              type="primary"
+              @click="bankInputChange"
+              v-if="switchType != 2"
+              >{{ bankText }}</el-button
+            >
           </ws-form-item>
           <ws-form-item label="收款人姓名" span="1" prop="payeeName">
-            <ws-input v-model="customerList.payeeName" placeholder="请输入收款人姓名" maxlength="15" size="small"
-              :disabled="disabled" />
+            <ws-input
+              v-model="customerList.payeeName"
+              placeholder="请输入收款人姓名"
+              maxlength="15"
+              size="small"
+              :disabled="disabled"
+            />
           </ws-form-item>
           <ws-form-item label="收款人身份证号" span="1" prop="payeeNumberCard">
-            <ws-input v-model="customerList.payeeNumberCard" placeholder="请输入收款人身份证号" maxlength="18" size="small"
-              :disabled="disabled" />
+            <ws-input
+              v-model="customerList.payeeNumberCard"
+              placeholder="请输入收款人身份证号"
+              maxlength="18"
+              size="small"
+              :disabled="disabled"
+            />
           </ws-form-item>
           <ws-form-item label="手机号" span="1" prop="customerPhone">
-            <ws-input type="number" @mousewheel.native.prevent v-model="customerList.customerPhone" placeholder="请输入手机号" maxlength="11" size="small"
-              :disabled="disabled" />
+            <ws-input
+              type="number"
+              @mousewheel.native.prevent
+              v-model="customerList.customerPhone"
+              placeholder="请输入手机号"
+              maxlength="11"
+              size="small"
+              :disabled="disabled"
+            />
           </ws-form-item>
           <ws-form-item label="联系地址" span="1" prop="compAddress">
-            <ws-input v-model="customerList.compAddress" placeholder="请输入联系地址" maxlength="100" size="small"
-              :disabled="disabled" />
+            <ws-input
+              v-model="customerList.compAddress"
+              placeholder="请输入联系地址"
+              maxlength="100"
+              size="small"
+              :disabled="disabled"
+            />
           </ws-form-item>
-          <div v-if="this.switchType == 1 || this.switchType == 3" class = "jiaoYan">
-              <el-button type="primary" class="veriCode" @click="toSend()" v-if="!sendDisabled">获取验证码</el-button>
-            <el-button type="warning" class="veriCode" v-if="sendDisabled">{{sendText}}</el-button>
-            <ws-input type="number" @mousewheel.native.prevent v-model="verifyCode" placeholder="请输入验证码" maxlength="100" size="small" :disabled="disabled" />
+          <div
+            v-if="this.switchType == 1 || this.switchType == 3"
+            class="jiaoYan"
+          >
+            <el-button
+              type="primary"
+              class="veriCode"
+              @click="toSend()"
+              v-if="!sendDisabled"
+              >获取验证码</el-button
+            >
+            <el-button type="warning" class="veriCode" v-if="sendDisabled">{{
+              sendText
+            }}</el-button>
+            <ws-input
+              type="number"
+              @mousewheel.native.prevent
+              v-model="verifyCode"
+              placeholder="请输入验证码"
+              maxlength="100"
+              size="small"
+              :disabled="disabled"
+            />
           </div>
         </ws-info-table>
         <div class="but">
-          <el-button type="primary" @click="commit" v-if="switchType == 1 || switchType == 3">提交</el-button>
-          <el-button type="primary" @click="cancel" v-if="switchType == 2">关闭</el-button>
+          <el-button
+            type="primary"
+            @click="commit"
+            v-if="switchType == 1 || switchType == 3"
+            >提交</el-button
+          >
+          <el-button type="primary" @click="cancel" v-if="switchType == 2"
+            >关闭</el-button
+          >
         </div>
       </ws-form>
     </div>
@@ -162,7 +292,8 @@
         verifyCode: '',
         bankList:[],
         bankInput:false,
-        bankText:'手动填写'
+        bankText:'手动填写',
+        avatarshow:false,
       }
     },
     activated() {
@@ -274,6 +405,20 @@
           path: 'customerManagement'
         })
       },
+      obtainWH(e,index){
+          //获取图片宽高
+          var img_url = e.url;//图片URL地址
+             var imgObj = new Image();//创建对象
+             imgObj.src = img_url;//改变图片地址
+             imgObj.onload = function(){
+               if(Number(imgObj.width) < Number(imgObj.height)){
+                 let i = document.getElementsByClassName("avatar");
+                 i[index].style.width='auto'
+                  let j = document.getElementsByClassName("avatar-uploader" + (index+1))
+                  j[0].style.background = "#e7e3e3"
+               }
+            }
+      },
       upLoadSuccess1(e) {
         this.identityUp = 'up'
         this.identity[0] = e.url
@@ -295,7 +440,9 @@
               this.$set( this.customerList,'compAddress',response.recPersonAddr)
             }
           })
+           this.obtainWH(e,0)
       },
+
       upLoadSuccess2(e) {
         this.identityLow = 'low'
         this.identity[1] = e.url
@@ -319,6 +466,7 @@
         //       this.$set( this.customerList,'compAddress',response.recPersonAddr)
         //     }
         //   })
+        this.obtainWH(e,1)
       },
       bankSuccess1(e) {
         this.bankUps = 'bankUp'
@@ -339,6 +487,7 @@
               this.$set(this.customerList,'bankDeposit',response.bankName)
             }
           })
+          this.obtainWH(e,2)
       },
       bankSuccess2(e) {
         this.bankLows = 'bankLow'
@@ -359,6 +508,7 @@
         //       this.$set(this.customerList,'bankDeposit',response.bankName)
         //     }
         //   })
+        this.obtainWH(e,3)
       },
       commit() {
         if (!this.imageUrl1) {
@@ -499,164 +649,166 @@
   }
 </script>
 <style lang="scss" scoped>
-  .avatar-uploader1 {
-    background: url('../../../public/img/identityup.png');
-  }
-
-  .avatar-uploader2 {
-    background: url('../../../public/img/identitylow.png');
-  }
-
-  .avatar-uploader3 {
-    background: url('../../../public/img/bankup.png');
-  }
-
-  .avatar-uploader4 {
-    background: url('../../../public/img/banklow.png');
-  }
-
-  /deep/.el-upload {
-    height: 200px;
-  }
-
-  .avatar-uploader {
-    background-size: 100% 100%;
-  }
-
-  .avatar-uploader .el-upload {
-    border: 1px dashed #d9d9d9;
-    border-radius: 6px;
-    cursor: pointer;
-    position: relative;
-    overflow: hidden;
-  }
-
-  .avatar-uploader .el-upload:hover {
-    border-color: #409EFF;
-  }
-
-  .avatar-uploader-icon {
-    font-size: 28px;
-    color: #8c939d;
-    width: 178px;
-    height: 178px;
-    line-height: 178px;
-    text-align: center;
-  }
-
-  .avatar {
-    width: 330px;
-    height: 103%;
-    display: block;
-  }
-
-  .center {
-    background: #f6f7fc;
-  }
-
-  .seach {
+.avatar-uploader1 {
+  background: url('../../../public/img/identityup.png');
+}
+
+.avatar-uploader2 {
+  background: url('../../../public/img/identitylow.png');
+}
+
+.avatar-uploader3 {
+  background: url('../../../public/img/bankup.png');
+}
+
+.avatar-uploader4 {
+  background: url('../../../public/img/banklow.png');
+}
+
+/deep/.el-upload {
+  height: 200px;
+}
+
+.avatar-uploader {
+  background-size: 100% 100%;
+}
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409eff;
+}
+
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+
+.avatar {
+  width: 330px;
+  height: 103%;
+  display: block;
+}
+.avatar1 {
+  height: 103%;
+  display: block;
+}
+.center {
+  background: #f6f7fc;
+}
+
+.seach {
+  display: flex;
+  align-items: center;
+
+  .find {
+    width: 32px;
+  }
+
+  .search-left {
     display: flex;
-    align-items: center;
-
-    .find {
-      width: 32px;
-    }
-
-    .search-left {
-      display: flex;
-    }
-  }
-
-  .ws-info-table {
-    border: none;
-    width: 80%;
-    margin: 0 auto;
-  }
-
-  .ws-info-table .el-form-item {
-    width: 50%;
-    border: none;
-  }
-
-  /deep/.ws-info-table .el-form-item .el-form-item__label {
-    width: 30%;
-    text-align: center;
-    background: #ffffff;
-    font-size: 14px;
-    color: #8890b1;
-  }
-
-  /deep/.ws-info-table .el-form-item .el-form-item__content {
-    border: none;
-  }
-
-  .bg-left {
-    padding-left: 30px;
-  }
-
-  .bg-right {
-    padding-right: 10px;
-    text-align: right;
-  }
-
-  .bg-bottom {
-    margin: 15px 0px;
   }
-
-  .titleup {
-    position: relative;
-  }
-
-  .titleup::before {
-    content: '';
-    display: inline-block;
-    width: 5px;
-    height: 30px;
-    background: #5473e8;
-    position: absolute;
-    left: 0;
-  }
-
-  .unload {
-    background: #ffffff;
-    padding-top: 20px;
-  }
-
-  .but {
-    text-align: center;
-    margin: 20px auto;
-  }
-
-  /deep/.up .el-upload--picture-card {
-    display: none;
-  }
-
-  /deep/.low .el-upload--picture-card {
-    display: none;
-  }
-
-  /deep/.bankUp .el-upload--picture-card {
-    display: none;
-  }
-
-  /deep/.bankLow .el-upload--picture-card {
-    display: none;
-  }
-
-  .unload-img {
-    margin: 20px 0;
-  }
-
-  .veriCode {
-    margin: 0 9px;
-  }
-  .jiaoYan{
-    display: flex;
-    width: 50%;
-    padding: 0 9px;
-  }
-  /deep/.jiaoYan .el-input__inner{
-    width: 100%;
-  }
-
+}
+
+.ws-info-table {
+  border: none;
+  width: 80%;
+  margin: 0 auto;
+}
+
+.ws-info-table .el-form-item {
+  width: 50%;
+  border: none;
+}
+
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 30%;
+  text-align: center;
+  background: #ffffff;
+  font-size: 14px;
+  color: #8890b1;
+}
+
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  border: none;
+}
+
+.bg-left {
+  padding-left: 30px;
+}
+
+.bg-right {
+  padding-right: 10px;
+  text-align: right;
+}
+
+.bg-bottom {
+  margin: 15px 0px;
+}
+
+.titleup {
+  position: relative;
+}
+
+.titleup::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+
+.unload {
+  background: #ffffff;
+  padding-top: 20px;
+}
+
+.but {
+  text-align: center;
+  margin: 20px auto;
+}
+
+/deep/.up .el-upload--picture-card {
+  display: none;
+}
+
+/deep/.low .el-upload--picture-card {
+  display: none;
+}
+
+/deep/.bankUp .el-upload--picture-card {
+  display: none;
+}
+
+/deep/.bankLow .el-upload--picture-card {
+  display: none;
+}
+
+.unload-img {
+  margin: 20px 0;
+}
+
+.veriCode {
+  margin: 0 9px;
+}
+.jiaoYan {
+  display: flex;
+  width: 50%;
+  padding: 0 9px;
+}
+/deep/.jiaoYan .el-input__inner {
+  width: 100%;
+}
 </style>

src/views/houseSelfCollect/inspectInfo.vue

@@ -871,8 +871,12 @@
             this.customerList = []
             let customer = response
             for (let i = 0; i < response.length; i++) {
-              customer =
-                response[i].customerName + '(' + response[i].customerPhone + ')'
+              if(response[i].supplier){
+                customer =  response[i].customerName + '(' + response[i].customerPhone + ')'+'-'+response[i].supplier
+              }
+              else{
+                customer = response[i].customerName + '(' + response[i].customerPhone + ')'
+              }
               this.customerList.push({
                 valueKey: i,
                 value: customer,

src/views/houseSelfCollect/inspectionManagement.vue

@@ -211,11 +211,7 @@
 						this.cangid = this.warehouseList[i].id
 						this.allowEdit = this.warehouseList[i].allowEdit
 						this.WAREHOUSE[1].payname = this.warehouseList[i].value
-					}
-				}
-				for (let i = 0; i < this.warehouseList1.length; i++) {
-					if (this.warehouseList1[i].warehouseName == e) {
-						localStorage.setItem('houseSelfCollect_house', JSON.stringify(this.warehouseList[i]))
+						localStorage.setItem('houseSelfCollect_house1', JSON.stringify(this.warehouseList[i]))
 					}
 				}
 				this.getList()
@@ -265,7 +261,7 @@
 					.then((response) => {
 						this.warehouseList1 = response
 						this.warehouseList = []
-						let _wareHouse = localStorage.getItem('houseSelfCollect_house')
+						let _wareHouse = localStorage.getItem('houseSelfCollect_house1')
 						_wareHouse = JSON.parse(_wareHouse)
 						if (_wareHouse) {
 								this.cangid = _wareHouse.id

src/views/houseSelfCollect/paymentManagement.vue

@@ -709,7 +709,7 @@ import download from '../../components/WsDownload/download'
         }
       },
       getWarehouse() {
-        let _wareHouse = localStorage.getItem('houseSelfCollect_house')
+        let _wareHouse = localStorage.getItem('houseSelfCollect_house1')
         _wareHouse = JSON.parse(_wareHouse)
         selectWarehouseSelf({
             compId: localStorage.getItem('ws-pf_compId')
@@ -719,7 +719,7 @@ import download from '../../components/WsDownload/download'
             this.warehouseList = response
             if (_wareHouse) {
               this.warehouseNameKey = _wareHouse.id
-              this.warehouseName = _wareHouse.warehouseName
+              this.warehouseName = _wareHouse.value
             } else {
               this.warehouseNameKey = this.warehouseList[0].id
               if (this.warehouseName) {
@@ -1070,8 +1070,13 @@ import download from '../../components/WsDownload/download'
           if (this.warehouseList[i].id == this.warehouseNameKey) {
             this.warehouseName = this.warehouseList[i].warehouseName
             localStorage.setItem(
-              'houseSelfCollect_house',
-              JSON.stringify(this.warehouseList[i])
+              'houseSelfCollect_house1',
+              JSON.stringify({value:this.warehouseList[i].warehouseName,
+                warehouseId: this.warehouseList[i].id,
+                allowEdit: this.warehouseList[i].allowEdit,
+                monitorUrl1: this.warehouseList[i].monitorUrl1,
+                monitorUrl2: this.warehouseList[i].monitorUrl2,
+                warehouseNo:this.warehouseList[i].commonWarehouseNo})
             )
             this.WAREHOUSE[3].payname = this.warehouseList[i].id
           }

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -12,7 +12,7 @@
       </el-col>
     </el-row>
     <div class="center">
-      <el-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules" label-width="110px">
+      <el-form ref="deptBudgetList" :model="deptBudgetList"  label-width="110px">
         <div class="basicInformation">
           <div class="small-title" style="font-size: 16px">任务详情</div>
           <el-row>
@@ -96,7 +96,7 @@
             <div class="content3-item1">
 
               <div class="">
-                <span style="margin-left: 30px;">司机-{{ index + 1 }}</span>
+                <span style="margin-left: 30px;font-weight: 600;">司机-{{ index + 1 }}</span>
                 <span class="noservice" v-show="item.status == '未装车'">{{
                      item.status
                    }}</span>
@@ -110,7 +110,7 @@
 
               <el-col :span="8">
 
-                <el-form-item label="姓名：" span="1" prop="driverName">
+                <el-form-item label="姓名：" span="1" prop="driverName" label-width="125px">
                   <el-select v-show="!item.temporaryDriverFlag" v-model="item.driver" placeholder="请选择司机"
                     class="row-item" @change="
                              (val) => {
@@ -127,7 +127,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="司机电话：" span="1" prop="impurity">
+                <el-form-item label="司机电话：" span="1" prop="impurity" label-width="125px">
                   <el-select v-show="!item.temporaryDriverFlag" v-model="item.driverPhone" placeholder="请选择司机电话"
                     class="row-item" @change="
                                (val) => {
@@ -144,52 +144,52 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="车牌号：" span="1" prop="carNo">
+                <el-form-item label="车牌号：" span="1" prop="carNo" label-width="125px">
                   <el-input :disabled="readonly" v-model="item.carNo" placeholder="" maxlength="120"
                     size="small" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="派车编号：" span="1" prop="carModel">
+                <el-form-item label="派车编号：" span="1" prop="carModel" label-width="125px">
                   <el-input :disabled="readonly" v-model="item.tranCarNo" maxlength="120" size="small" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="箱号：" span="1" prop="carModel">
+                <el-form-item label="箱号：" span="1" prop="carModel" label-width="125px">
                   <el-input v-if="item.status == '已装车'||item.status == '已送达'" :disabled="readonly" v-model="item.caseNo"
                     maxlength="120" size="small" />
                   <el-input v-else v-model="item.caseNo" placeholder="请输入箱号" maxlength="120" size="small" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="封号：" span="1" prop="carModel">
+                <el-form-item label="封号：" span="1" prop="carModel" label-width="125px">
                   <el-input v-if="item.status == '已装车'||item.status == '已送达'" v-model="item.titleNo" placeholder=""
                     :disabled="readonly" maxlength="120" size="small" />
                   <el-input v-model="item.titleNo" placeholder="请输入封号" v-else maxlength="120" size="small" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="车型：" span="1" prop="carModel">
+                <el-form-item label="车型：" span="1" prop="carModel" label-width="125px">
                   <el-input :disabled="readonly" v-model="item.carModel" placeholder="" maxlength="120"
                     size="small" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
 
-                <el-form-item label="车长：" span="1" prop="carLength">
+                <el-form-item label="车长：" span="1" prop="carLength" label-width="125px">
                   <el-input :disabled="readonly" v-model="item.carLength" placeholder="" maxlength="120"
                     size="small" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="载重(吨):" span="1" prop="loadWeight">
+                <el-form-item label="载重(吨):" span="1" prop="loadWeight" label-width="125px">
                   <el-input :disabled="readonly" v-model="item.loadWeight" placeholder="" maxlength="120"
                     size="small" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="运输单价(元/吨):" span="1" prop="carModel" label-width="150px">
-                  <el-input :disabled="readonly" v-model="item.tranPrice" maxlength="120" size="small" />
+                <el-form-item label="运输单价(元/吨):" span="1" prop="carModel" label-width="125px">
+                  <el-input :disabled="readonly" v-model="item.tranPrice" size="small" />
                 </el-form-item>
               </el-col>
               <span v-if="item.status == '未装车'||item.temporaryDriverFlag!=0" width="22" height="22" class="del"
@@ -259,14 +259,6 @@
         // 提交类型
         readonly: true,
         tranPriceApprove: {},
-        rules: {
-          netWeight: [{
-            required: true,
-            type: 'number',
-            message: '请输入活动名称',
-            trigger: 'blur',
-          }, ],
-        },
         size: 10,
         compId: localStorage.getItem('ws-pf_compId'),
         date: {
@@ -899,7 +891,6 @@
     position: relative;
     padding: 10px;
     font-weight: 600;
-    margin-left: 27px;
   }
 
   //小标题文字
@@ -931,7 +922,7 @@
 
   .myTest {
     display: flex;
-    margin: 20px 0;
+    margin-bottom: 20px;
     // background: green;
     padding-left: 20px;
     align-items: center;
@@ -967,8 +958,8 @@
 
   .del {
     position: absolute;
-    right: 10px;
-    top: 6px;
+    right: 4px;
+    top: 0px;
     cursor: pointer;
     font-size: 20px;
     width: 16px;

src/views/warehouse/costmanagement.vue

@@ -82,14 +82,14 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
+      <!-- <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
       :current-page="currentPage"
       :page-size="pageSize"
       layout="total, sizes, prev, pager, next, jumper"
       :total="deptBudgetTotal"
-    ></el-pagination>
+    ></el-pagination> -->
       <el-dialog :close-on-click-modal='false' title="修改加权成本价格" :visible.sync="editvisible">
         <el-form >
           <el-form-item label="价格（元/吨）" >
@@ -351,16 +351,18 @@ export default {
         .toPromise()
         .then((response) => {
           var arr=[]
-          for (let i = 0; i < response.records.length; i++) {
-            if(response.records[i].storage!=0){
-              response.records[i].value=(response.records[i].cost*response.records[i].storage).toFixed(1)
-              arr.push(response.records[i])
+          for (let i = 0; i < response.length; i++) {
+            if(response[i].storage!=0){
+              response[i].value=(response[i].cost*response[i].storage).toFixed(1)
+              arr.push(response[i])
+            }else{
+              response[i].value=0
+              arr.push(response[i])
             }
             
           }
           this.getSpanArr(arr)
           this.warehouseList = arr
-          this.deptBudgetTotal=response.total
         })
     },
     handleExamine(row) {