Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6

src/views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue

@@ -208,9 +208,9 @@
           <el-form-item :label="$t('放入箱数')+'：'">
             {{shopForm.putNum||0}}
           </el-form-item>
-          <el-form-item :label="$t('放入数量(个)')+'：'" prop="putQuantity" v-show="isQuantity">
+          <!-- <el-form-item :label="$t('放入数量(个)')+'：'" prop="putQuantity" v-show="isQuantity">
             <el-input-number v-model="shopForm.putQuantity" controls-position="right" :min="0"></el-input-number>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item :label="$t('备注信息')+'：'">
             <el-input v-model="shopForm.remarks"></el-input>
           </el-form-item>

src/views/ecw/customer/query.vue

@@ -125,7 +125,7 @@
             <el-table-column label="银行代码" prop="bankCode"></el-table-column>
             <el-table-column label="账户类型">
               <template v-slot="{row}">
-                {{row.accountType === 1 ? $t('公账') : $t('私账')}}
+                {{Number(row.accountType) === 1 ? $t('公账') : $t('私账')}}
               </template>
             </el-table-column>
             <el-table-column label="状态">

src/views/ecw/financial/commission-requestFunds.vue

@@ -19,21 +19,21 @@
               :rules="{ required: true, trigger: ['blur', 'change'],message:$t('客户不能为空')}"
               :error="$t('客户不能为空')"
             >
-<!--               <customer-selector v-model="form.customerId" @change="consignor = $event" />-->
-              <el-select
-                v-model="form.customerId"
-                :placeholder="$t('请选择客户')"
-                filterable
-                @change="selectChange(form.customerId)"
-                :filter-method="getUserList"
-              >
-                <el-option
-                  v-for="supplier in allSupplier"
-                  :key="supplier.id"
-                  :label="supplier.name"
-                  :value="supplier.id"
-                ></el-option>
-              </el-select>
+               <customer-selector v-model="form.customerId" @change="consignor = $event" />
+<!--              <el-select-->
+<!--                v-model="form.customerId"-->
+<!--                :placeholder="$t('请选择客户')"-->
+<!--                filterable-->
+<!--                @change="selectChange(form.customerId)"-->
+<!--                :filter-method="getUserList"-->
+<!--              >-->
+<!--                <el-option-->
+<!--                  v-for="supplier in allSupplier"-->
+<!--                  :key="supplier.id"-->
+<!--                  :label="supplier.name"-->
+<!--                  :value="supplier.id"-->
+<!--                ></el-option>-->
+<!--              </el-select>-->
             </el-form-item>
           </el-descriptions-item>
           <el-descriptions-item :label="$t('部门')">
@@ -127,8 +127,8 @@
           <el-descriptions-item :label="$t('账户类型')" >
             <el-form-item label-width="0">
             <el-select v-model="form.customerAccountType">
-              <el-option value="0" label="停用"></el-option>
-              <el-option value="1" label="正常"></el-option>
+              <el-option :value="1" label="公账"></el-option>
+              <el-option :value="2" label="私帐"></el-option>
             </el-select>
             </el-form-item>
           </el-descriptions-item>
@@ -193,7 +193,7 @@
         >
       </el-col>
       <el-table v-loading="loadings" :data="list" border :show-summary="!!list.length" :summary-method="getSummaries">
-        <el-table-column :label="$t('自编号')" align="center" prop="payableNo"/>
+        <el-table-column :label="$t('订单编号')" align="center" prop="orderNo"/>
         <el-table-column :label="$t('佣金类型')" align="center" prop="feeType">
           <template v-slot="{row}">
             <dict-tag
@@ -701,7 +701,7 @@ export default {
       console.log(val,'valbank')
       let {accountName,bankAccount,bankAddress,bankName,bankCode,accountType} = val
         // this.form.customerAccountType = baType; //账户类型
-        this.$set(this.form, 'customerAccountType', accountType)
+        this.$set(this.form, 'customerAccountType', Number(accountType))
         // this.form.customerBank = baBankName; //客户银行
       this.$set(this.form, 'customerBank', bankName)
         // this.form.customerBankAccount = baAccountNum; //	客户银行账号

src/views/ecw/order/components/BoxSplitDetail.vue

@@ -32,28 +32,32 @@
                 <span>{{$t('发往')}}{{item.dstWarehouseName}}</span>
             </div>
             <el-table :data="item.orderSplitItemBackVOList" :key="'items-' + item.orderNo">
-            <el-table-column :label="$t('序号')">
-                <template slot-scope="scope">{{scope.$index+1}}</template>
-            </el-table-column>
-            <el-table-column :label="$t('中文品名')">
-                <template slot-scope="{row}">{{row.prodTitleZh}}</template>
-            </el-table-column>
-            <el-table-column :label="$t('英文品名')">
-                <template slot-scope="{row}">{{row.prodTitleEn}}</template>
-            </el-table-column>
-            <el-table-column :label="$t('品牌')">
-                <template slot-scope="{row}">
-                    <dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType" />
-                </template>
-            </el-table-column>
-            <el-table-column :label="$t('体积')">
-                <template slot-scope="{row}">{{row.volume}} m³</template>
-            </el-table-column>
-            <el-table-column :label="$t('重量')">
-                <template slot-scope="{row}">{{row.weight}}kg</template>
-            </el-table-column>
-            <el-table-column :label="$t('箱数')">
-                <template slot-scope="{row}">{{row.num}}</template></el-table-column>          
+                <el-table-column :label="$t('序号')">
+                    <template slot-scope="scope">{{scope.$index+1}}</template>
+                </el-table-column>
+                <el-table-column :label="$t('中文品名')">
+                    <template slot-scope="{row}">{{row.prodTitleZh}}</template>
+                </el-table-column>
+                <el-table-column :label="$t('英文品名')">
+                    <template slot-scope="{row}">{{row.prodTitleEn}}</template>
+                </el-table-column>
+                <el-table-column :label="$t('品牌')">
+                    <template slot-scope="{row}">
+                        <dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType" />
+                    </template>
+                </el-table-column>
+                <el-table-column :label="$t('体积')">
+                    <template slot-scope="{row}">{{row.volume}} m³</template>
+                </el-table-column>
+                <el-table-column :label="$t('重量')">
+                    <template slot-scope="{row}">{{row.weight}}kg</template>
+                </el-table-column>
+                <el-table-column :label="$t('箱数')">
+                    <template slot-scope="{row}">{{row.num}}</template>
+                </el-table-column>
+                <el-table-column :label="$t('数量')">
+                    <template slot-scope="{row}">{{row.quantity}}</template>
+                </el-table-column>
             </el-table>
         </template>
     </div>

src/views/ecw/order/components/SplitDetail.vue

@@ -54,7 +54,10 @@
                 </el-table-column>
                 <el-table-column :label="$t('箱数')">
                     <template slot-scope="{row}">{{row.num}}</template>
-                </el-table-column>     
+                </el-table-column>
+                <el-table-column :label="$t('数量')">
+                    <template slot-scope="{row}">{{row.quantity}}</template>
+                </el-table-column> 
                 <el-table-column :label="$t('备注')">
                     <template slot-scope="{row}">{{row.remark}}</template>
                 </el-table-column>