Merge remote-tracking branch 'origin/dev' into dev

README.md

 捷道项目管理后台-前端
+
+后台：
+本地运行：npm run dev
+测试环境：npm run build:dev
+生产环境：npm run build:prod
\ No newline at end of file

src/views/ecw/financial/creatPayment.vue

@@ -460,7 +460,8 @@ export default {
     if (that.$route.query.payableId && that.$route.query.payableId !== '0') {
       this.payableId = this.$route.query.payableId;
       getPayableInfoByIds({ id: this.payableId }).then(res => {
-        this.list = [{...res.data}]
+        this.handleSelectionChange([res.data])
+        this.list = this.multipleSelection
         this.$set(this.form, 'supplierId', res.data.supplierId)
       })
     }

src/views/ecw/financial/voucher.vue

@@ -193,13 +193,13 @@
           >
           <el-button v-if="scope.row.state == 1 || scope.row.state == 2 || scope.row.state == 3" size="mini" type="text" @click="verificationCancelClick(scope.row)">{{ $t('收款') }}</el-button>
           <el-button v-if="scope.row.state == 0 || scope.row.state == 1" size="mini" type="text" @click="deleteClick(scope.row)">{{ $t('删除') }}</el-button>
-          <!-- <el-button
+          <el-button
             v-if="scope.row.state != 0"
             size="mini"
             type="text"
             @click="toprint(scope.row.id)"
             >{{ $t('打印') }}</el-button
-          > -->
+          >
           <el-button
             v-if="scope.row.state != 0"
             size="mini"

src/views/ecw/order/warehousing/index.vue

@@ -140,7 +140,7 @@
     </el-form>
 
     <warehouse-area-dialog ref="area" :visible.sync="areaVisible" v-model="form.orderLocationCreateReqVOList"
-                           :order-id="orderId" :city-id="cityId"></warehouse-area-dialog>
+                           :order-id="orderId" :warehouse-id="warehouseId"></warehouse-area-dialog>
 
     <edit-dialog :title="title" :order-id="order.orderId" :visible.sync="warehousingVisible" :warehousing="warehousing" :edit="isEdit"></edit-dialog>
 
@@ -431,8 +431,8 @@ export default {
       })
       return result
     },
-    cityId(){
-      return  this.order?.departureVO?.departureId
+    warehouseId(){
+      return this.order?.logisticsInfoDto?.startWarehouseId
     }
   }
 }