Merge branch 'dev_pro_河南鹤壁' of http://114.132.189.42:9002/r/product-invento...

gongchunyi

7 小时以前 608b7a717d1ebb8392c3e6d8952d574daaf888e1

Merge branch 'dev_pro_河南鹤壁' of http://114.132.189.42:9002/r/product-inventory-management into dev_pro_河南鹤壁

 src/views/salesManagement/deliveryLedger/index.vue

@@ -22,7 +22,7 @@
            @change="handleQuery"
          />
        </el-form-item>
        <el-form-item label="快递单号：" v-if="false">
        <el-form-item label="快递单号：" >
          <el-input
            v-model="searchForm.expressNumber"
            placeholder="请输入"
@@ -99,13 +99,11 @@
        <el-table-column
          label="快递公司"
          prop="expressCompany"
          v-if="false"
          show-overflow-tooltip
        />
        <el-table-column
          label="快递单号"
          prop="expressNumber"
          v-if="false"
          show-overflow-tooltip
        />
        <el-table-column
@@ -183,7 +181,7 @@
                @change="handleShippingTypeChange"
              >
                <el-option label="货车" value="货车" />
                <el-option label="快递" value="快递" v-if="false" />
                <el-option label="快递" value="快递" />
              </el-select>
            </el-form-item>
          </el-col>
@@ -223,7 +221,7 @@
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30" v-if="false">
        <el-row :gutter="30" >
          <el-col :span="24">
            <el-form-item label="快递单号：" prop="expressNumber">
              <el-input
@@ -286,10 +284,10 @@
          <el-descriptions-item label="发货车牌号">{{
            detailRow.shippingCarNumber || "--"
          }}</el-descriptions-item>
          <el-descriptions-item label="快递公司" v-if="false">{{
          <el-descriptions-item label="快递公司" >{{
            detailRow.expressCompany || "--"
          }}</el-descriptions-item>
          <el-descriptions-item label="快递单号" :span="2" v-if="false">{{
          <el-descriptions-item label="快递单号" :span="2" >{{
            detailRow.expressNumber || "--"
          }}</el-descriptions-item>
          <el-descriptions-item label="出库单号" :span="2">{{

 src/views/salesManagement/salesLedger/index.vue

@@ -123,11 +123,9 @@
              </el-table-column>
              <el-table-column label="快递公司"
                               prop="expressCompany"
                               v-if="false"
                               show-overflow-tooltip />
              <el-table-column label="快递单号"
                               prop="expressNumber"
                               v-if="false"
                               show-overflow-tooltip />
              <el-table-column label="发货车牌"
                               minWidth="100px"
@@ -940,7 +938,6 @@
                <el-option label="货车"
                           value="货车" />
                <el-option label="快递"
                           v-if="false"
                           value="快递" />
              </el-select>
            </el-form-item>
@@ -973,7 +970,7 @@
          </el-col>
        </el-row>
        <el-row :gutter="30"
                v-if="false">
                >
          <el-col :span="24">
            <el-form-item label="快递单号："
                          prop="expressNumber">