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

src/views/houseSelfCollect/customerManagementAdd.vue

@@ -268,6 +268,8 @@
 
       },
       cancel() {
+        this.customerList = {}
+        this.verifyCode = ""
         this.$router.push({
           path: 'customerManagement'
         })
@@ -360,13 +362,6 @@
           })
           return
         }
-        //   if (!this.imageUrl2) {
-        //   this.$message({
-        //     message: '请上传身份证反面',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
           if (!this.imageUrl3) {
           this.$message({
             message: '请上传银行卡正面',
@@ -374,13 +369,6 @@
           })
           return
         }
-        //   if (!this.imageUrl4) {
-        //   this.$message({
-        //     message: '请上传银行卡反面',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
         if (!this.customerList.customerName) {
           this.$message({
             message: '请输入姓名',
@@ -409,20 +397,6 @@
           })
           return
         }
-        //  if (!this.customerList.payeeName) {
-        //   this.$message({
-        //     message: '请输入收款人姓名',
-        //     type: 'warning',
-        //   })
-        //   return
-        // } 
-        //  if (!this.customerList.payeeNumberCard) {
-        //   this.$message({
-        //     message: '请输入收款人身份证号',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
          if (this.customerList.payeeNumberCard.length != 18) {
           this.$message({
             message: '收款人身份证号输入有误，请重新输入',
@@ -444,13 +418,6 @@
           })
           return
         }
-        // if (!this.customerList.compAddress) {
-        //   this.$message({
-        //     message: '请输入联系地址',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
         // 验证码校验
         GetCustomerCodeJY({
             phone: this.customerList.customerPhone,
@@ -473,13 +440,9 @@
                   customerAdd(this.customerList)
                     .toPromise()
                     .then((response) => {
-                      // this.customerList.id = response
-                      // customerIdentity(this.customerList)
-                      //   .toPromise()
-                      //   .then((response) => {
-                      //     this.$message.success('添加成功')
-                      //     this.$router.push({ path: 'customerManagement' })
-                      //   })
+                      this.$message.success('添加成功')
+                      this.customerList = {}
+                      this.verifyCode = ""
                       this.$router.go(-1)
                     })
                 })
@@ -497,6 +460,8 @@
                     .toPromise()
                     .then((response) => {
                       this.$message.success('修改成功')
+                         this.customerList = {}
+                         this.verifyCode = ""
                       this.$router.push({
                         path: 'customerManagement'
                       })
@@ -517,11 +482,7 @@
           .then((response) => {
             this.customerList = response
             this.identity = this.customerList.cardAddressUrl.split(',')
-            // this.identityImgUp[0].url = this.identity[0]
-            // this.identityImgLow[0].url = this.identity[1]
             this.bank = this.customerList.payeeAddressUrl.split(',')
-            // this.bankImgUp[0].url = this.bank[0]
-            // this.bankImgLow[0].url = this.bank[1]
             this.imageUrl1 = this.identity[0]
             this.imageUrl2 = this.identity[1]
             this.imageUrl3 = this.bank[0]

src/views/houseSelfCollect/weighingManagement.vue

@@ -255,7 +255,7 @@ export default {
               allowEdit:response[i].allowEdit
             })
           }
-                this.warehouseName =  this.warehouseList[0].value
+          this.warehouseName =  this.warehouseList[0].value
              if (this.warehouseId) {
             this.warehouseName = this.WAREHOUSE[2].payname
           } else {
@@ -270,7 +270,7 @@ export default {
         })
     },
     getList() {
-          getweighingList({
+        getweighingList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,

src/views/outboundManagement/collectionManagement.vue

@@ -543,6 +543,7 @@ export default {
             response.records[i].contractPrice =  response.records[i].contractPrice*1000
           }
            this.collectList = response.records
+           this.deptBudgetTotal = response.total
         })
       contractList({
         compId: sessionStorage.getItem('ws-pf_compId'),

src/views/purchasingManagement/procurementPlanAdd.vue

@@ -874,8 +874,8 @@ export default {
               this.dataList.receivePrivate =  CodeToText[this.selectedOptions[0]]
               this.dataList.receiveCity = CodeToText[this.selectedOptions[1]]
               this.dataList.receiveArea = CodeToText[this.selectedOptions[2]]
-              this.dataList.outputPrivate =
-                CodeToText[this.selectedOptions1[0]]
+              this.dataList.outputPrivate = CodeToText[this.selectedOptions1[0]]
+               this.dataList.outputCity = CodeToText[this.selectedOptions1[1]]
               // this.dataList.outputCity = CodeToText[this.selectedOptions1[1]]
               // if(this.dataList.procurementPlanType=='期货'){
               //   this.dataList.basisPrice='-'+Math.abs(this.dataList.basisPrice)

src/views/purchasingManagement/procurementPlanEdit.vue

@@ -642,6 +642,7 @@ export default {
           this.selectedOptions = tmp
           var tmp1 = []
           tmp1[0] = TextToCode[this.dataList.outputPrivate].code
+          tmp1[1] = TextToCode[this.dataList.outputPrivate][this.dataList.outputCity].code
           // tmp1[1] = TextToCode[this.dataList.outputPrivate][this.dataList.outputCity].code
           this.selectedOptions1 = tmp1
         })
@@ -910,6 +911,7 @@ export default {
               this.dataList.receiveCity = CodeToText[this.selectedOptions[1]]
               this.dataList.receiveArea = CodeToText[this.selectedOptions[2]]
               this.dataList.outputPrivate = CodeToText[this.selectedOptions1[0]]
+              this.dataList.outputCity = CodeToText[this.selectedOptions1[1]]
               // this.dataList.outputCity = CodeToText[this.selectedOptions1[1]]
               // if(this.dataList.procurementPlanType=='期货'){
               //   this.dataList.basisPrice='-'+Math.abs(this.dataList.basisPrice)

src/views/taskManagement/moveWarehouseTask.vue

@@ -146,14 +146,14 @@
                 </div>
               </div>
             </el-popover>
-            <img
+            <!-- <img
               width="17"
               height="18"
               style="vertical-align: text-top; position: relative; top: -1px"
               src="../../../public/img/edit.png"
               @click="editClick(scope.row)"
               alt=""
-            />
+            /> -->
           </template>
         </el-table-column>
         <el-table-column prop="establishDate" label="发布时间" width="150">