Merge branch 'pre-production'

1 year ago · f6ec6f4151
14 changed files with 80 additions and 61 deletions
--- a/src/api/distribution/distributionStockList.js
+++ b/src/api/distribution/distributionStockList.js
@ -131,7 +131,7 @@ export const update = (row) => {
 */
 export const getInventoryList = (current, size, params) => {
  return request({
-    url: '/api/logpm-distribution/distributionStockList/page',
+    url: '/api/logpm-distribution/distributionStockList/getLnventoryList',
    method: 'get',
    params: {
      ...params,
--- a/src/components/tablecmt/tablecmt.vue
+++ b/src/components/tablecmt/tablecmt.vue
@ -204,10 +204,11 @@ onMounted(() => {
    // return windowHight;
    return document.documentElement.clientHeight;
  }
-  // alert(getWinHight());

  var bodyContent = document.getElementById('bodys');
-  bodyContent.setAttribute('style', 'height.500px');
+  const _height = getWinHight();
+  // 设置列表的高度
+  bodyContent.style.height = _height - bodyContent.getBoundingClientRect().top - 65 + 'px';
 });
 interface TableColumnType {
  /** 表格列的key */
@ -557,7 +558,7 @@ function copyContent(content: string) {
 // }
 .maboxhi {
  width: 100%;
-  min-height: 950px;
+  // min-height: 950px;
  // height: 841px;
  // flex:1;
  // min-height: 100%;
--- a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue
+++ b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue
@ -193,16 +193,16 @@ export default {
              }
            },
          },
-          // {
-          //   label: "姓名",
-          //   prop: "name",
-          //   type: "input",
-          //   search: true,
-          //   labelWidth:'150',
-          //   width:"100px",
-          //   align:'center',
-          //   span:11,
-          // },
+          {
+            label: "姓名",
+            prop: "name",
+            type: "input",
+            search: true,
+            labelWidth:'150',
+            width:"100px",
+            align:'center',
+            span:11,
+          },
          {
            label: '手机号码',
            prop: 'phone',
@ -815,7 +815,7 @@ export default {
 }
 :deep(.avue-form__group--flex){
  justify-content: space-between;
-  
+
 }
 .avue-form__row{
  margin-left:0 !important;
--- a/src/views/distribution/deliverylist/distributionDeliveryList.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue
@ -1198,7 +1198,7 @@ export default {
 }
 .avue-crud__right {
  display: flex;
-  align-items: flex-end;
+  align-items: center;
 }
 .el-form-item__content {
  height: 30px;
@ -1209,4 +1209,9 @@ export default {
    height:30px !important;
  }
 }
+:deep(.avue-crud__header){
+  .avue-crud__left{
+    margin-top:0 !important;
+  }
+}
 </style>
--- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
@ -1243,7 +1243,7 @@ export default {
 }
 .avue-crud__right {
  display: flex;
-  align-items: flex-end;
+  align-items: center;
 }
 .fr-fm {
  width: 100%;
@ -1257,4 +1257,9 @@ export default {
    }
  }
 }
+:deep(.avue-crud__header){
+  .avue-crud__left{
+    margin-top:0 !important;
+  }
+}
 </style>
--- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
@ -1184,7 +1184,7 @@ export default {
  }
 }
 .avue-crud__header {
-  align-items: flex-end !important;
+  // align-items: flex-end !important;  
 }
 // 日期选择框
 .el-times {
@ -1202,9 +1202,14 @@ export default {
 }
 .avue-crud__right{
  display: flex;
-    align-items: flex-end;
+ align-items: center;
 }
 .fr-fo{
  display:flex; 
 }
+:deep(.avue-crud__header){
+  .avue-crud__left{
+    margin-top:0 !important;
+  }
+}
 </style>
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
@ -1531,6 +1531,10 @@ export default {
      );
    },
    handleAdd() {
+      return this.$message({
+        type: "error",
+        message: '功能还在开发中'
+      })
      this.title = '新增';
      this.form = {};
      this.box = true;
--- a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
@ -1413,9 +1413,10 @@ export default {
      );
    },
    handleAdd() {
-      this.title = '新增';
-      this.form = {};
-      this.box = true;
+      return this.$message({
+        type: 'error',
+        message: '功能还在开发中',
+      });
    },
    handleEdit(row) {
      this.title = '编辑';
@ -1598,7 +1599,7 @@ export default {
    height: 30px !important;
  }
 }
-:deep(.el-form-item__label){
-  padding:0;
+:deep(.el-form-item__label) {
+  padding: 0;
 }
 </style>
--- a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
@ -1448,6 +1448,10 @@ export default {
      );
    },
    handleAdd() {
+      return this.$message({
+        type: "error",
+        message: '功能还在开发中'
+      })      
      this.title = '新增';
      this.form = {};
      this.box = true;
--- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
@ -1751,6 +1751,10 @@ export default {
      );
    },
    handleAdd() {
+      return this.$message({
+        type: "error",
+        message: '功能还在开发中'
+      })
      this.title = '新增';
      this.form = {};
      this.box = true;
--- a/src/views/distribution/inventory/delivery/distributionStockArticleWhole.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleWhole.vue
@ -1467,6 +1467,10 @@ export default {
      });
    },
    handleAdd () {
+      return this.$message({
+        type: "error",
+        message: '功能还在开发中'
+      })
      this.title = '新增'
      this.form = {}
      this.box = true
--- a/src/views/distribution/reservation/reservationSubmitFrom.vue
+++ b/src/views/distribution/reservation/reservationSubmitFrom.vue
@ -40,7 +40,6 @@
                                        :value="item.dictKey">{{item.dictValue}}&emsp;
                                </el-radio>
                            </el-radio-group>
-                            <!--                            :label="item.dictValue"-->
                        </el-form-item>
                    </el-col>

@ -83,16 +82,9 @@
                            </el-radio-group>
                        </el-form-item>
                    </el-col>
-
-
                </el-row>

                <el-row>
-                    <!--                    <el-col :span="10">-->
-                    <!--                        <el-form-item label="到付运费:" prop="collectFee" label-width="100px">-->
-                    <!--                            <el-input type="number" v-model="form.collectFee" :disabled="true"/>-->
-                    <!--                        </el-form-item>-->
-                    <!--                    </el-col>-->
                    <el-col :span="10">
                        <el-form-item label="待收货款:" prop="collectionFee" label-width="100px">
                            <el-input type="number" v-model="form.collectionFee"/>
@ -599,6 +591,8 @@
          // ],
        },
        obj:{},
+        // 商场名称, 订单或库存品新增在同一商场下
+        marketName: ''
      };
    },
    created() {
@ -826,11 +820,12 @@
        } else {
          return true;
        }
-        return false;
      },
      handleAddInventory() {
        let page = this.page;
        let params = {};
+        // params.marketName = this.
+        if(this.marketName) params.marketName = this.marketName
        this.query.serviceType = '2';
        getInventoryList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
          const inventoryList = res.data.data;
@ -1389,6 +1384,7 @@
          });
        }
        this.query.orderIds = a.join(',');
+        if(this.marketName) params.mallName = this.marketName
        console.log('-------------->', this.query);
        selectStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
          console.log('res------------>', res);
@ -1427,25 +1423,13 @@
          getStockArticleList(this.orderIds).then(res => {
            console.log(res.data.data);
            const data = res.data.data;
-            let name = '';
-            let phone = '';
-            let address = '';
-            let typeService = '';
-            console.log('>>>>>>>>>>>>>', data);
-            for (let i = 0; i < data.length; i++) {
-              if (i === 0) {
-                name = data[0].customerName;
-                phone = data[0].customerTelephone;
-                address = data[0].customerAddress;
-                typeService = data[0].typeService.toString();
-                // typeName = data[0].typeName;
-              }
-            }
-            this.form.consignee = name;
-            this.form.deliveryPhone = phone;
-            this.form.deliveryType = typeService;
-            this.form.deliveryAddress = address;
+            if (data.length === 0) return
+            this.form.consignee = data[0].customerName || '';
+            this.form.deliveryPhone = data[0].customerTelephone || '';
+            this.form.deliveryType = data[0].typeService.toString() || '';
+            this.form.deliveryAddress = data[0].customerAddress || '';
            this.orderData = data;
+            if (!this.marketName) this.marketName = data[0].mallName
          });
        }
        if (this.reservationId) {
@ -1455,7 +1439,7 @@
            // stockArticleListInfo.forEach(item=>{
            //
            // })
-            console.log('>>>>>>>>', reservation);
+            console.log('reservation >>>>>>>>', reservation);
            this.orderData = reservation.stockArticleList;
            this.inventoryData = reservation.inventoryList;
            this.inventoryData.forEach(item => {
--- a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
+++ b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
@ -1541,13 +1541,14 @@ export default {
      });
    },
    //备货id
-    handleStockUp(row, type) {
-      getListUser().then(res => {
-        //查询当前人信息
-        console.log('res>>>', res.data.data);
-        this.deptId = res.data.data.deptId;
-        this.getStorageArea();
-      });
+    async handleStockUp(row, type) {
+     // const  a = await getListUser().then( res => {
+     //    //查询当前人信息
+     //    console.log('res>>>', res.data.data);
+     //    this.deptId = res.data.data.deptId;
+     //
+     //  });
+      await this.getStorageArea();
      console.log('备货数据！！', row);
      switch (type) {
        case '1':
@ -1576,7 +1577,7 @@ export default {
        department: this.deptId,
      };
      stockUp(params).then(res => {
-        // console.log("res>>>",res.data.data);
+        console.log("备货区res>>>",res.data.data);
        let fo = [];
        res.data.data.forEach(i => {
          let v = {
--- a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
+++ b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
@ -507,7 +507,7 @@ export default {
      optionCodes: [], //客户编号
      rules: {
        sku: [
-          { required: true, message: '请输入SKU', trigger: 'blur' },
+          { requirwarehouseIded: true, message: '请输入SKU', trigger: 'blur' },
          // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
        ],
        productName: [
@ -533,6 +533,7 @@ export default {
        trainNumber: [{ required: true, message: '请填写物流单号', trigger: 'blur' }],
        licensePlate: [{ required: true, message: '请填写入库车牌', trigger: 'change' }],
        warehouseId: [{ required: true, message: '请选择所在仓库', trigger: 'blur' }],
+        orderNumber: [{ required: true, message: '请输入订单自编号', trigger: 'blur' }],
        serviceType: [{ required: true, message: '请选择服务类型', trigger: 'blur' }],
        customerCode: [{ required: true, message: '请选择客户编码', trigger: 'blur' }],
      },