build

src/views/report/config/columns.js

@@ -25,15 +25,8 @@ const columns = [
   //   label: "销售数量",
   //   width: "110px",
   // },
-  
   {
-    prop: "good_img",
-    label: "商品主图",
-    width: "110px",
-    _slot_: "good_img"
-  },
-  {
-    prop: "total_fee",
+    prop: "cgd_charge",
     label: "采购价",
     width: "110px",
   },

src/views/report/cpns/baseForm.vue

@@ -65,17 +65,25 @@
 
         <el-col :span="6">
           <el-form-item label="期望服务费比例" prop="expect_service_proportion" label-width="125px">
-            <el-input :disabled="type === 'view'" v-model="ruleForm.expect_service_proportion" placeholder="服务费比例"
+            <!-- <el-input :disabled="type === 'view'" v-model="ruleForm.expect_service_proportion" placeholder="服务费比例"
               @input="handleProportionrChange">
-              <!-- <template #append>%</template> -->
-            </el-input>
+              <template #append>%</template>
+            </el-input> -->
+
+            <digital-input :values="ruleForm.expect_service_proportion" :placeholder="'销售价'" :min="0" :disabled="type === 'view' || is_noble"
+            :max="100000000000" :position="'right'" :precision="2" :size="'mini'" :controls="false" :append="'%'"
+            @reschange="handleProportionrChange" />
           </el-form-item>
         </el-col>
 
         <el-col :span="6">
           <el-form-item label="期望服务费" prop="expect_service" label-width="95px">
-            <el-input :disabled="type === 'view'" v-model="ruleForm.expect_service" placeholder="期望服务费"
-              @input="handleExpectChange" />
+            <!-- <el-input :disabled="type === 'view'" v-model="ruleForm.expect_service" placeholder="期望服务费"
+              @input="handleExpectChange" /> -->
+
+           <digital-input :values="ruleForm.expect_service" :placeholder="'销售价'" :min="0" :disabled="type === 'view' || is_noble"
+            :max="100000000000" :position="'right'" :precision="2" :size="'mini'" :controls="false" :append="'元'"
+            @reschange="handleExpectChange" />
           </el-form-item>
         </el-col>
 
@@ -979,12 +987,12 @@ export default {
 
       //没有期望服务费存在服务费比例 重新计算期望服务费
       if(!Number(expect_service) && Number(expect_service_proportion)){
-        this.handleProportionrChange();
+        this.handleProportionrChange(expect_service_proportion);
       }
       
-      //没有期望服务费存在服务费比例 重新计算服务费比例
-      if(!Number(expect_service_proportion) && Number(expect_service)){
-        this.handleExpectChange();
+      //没有期望服务费存在服务费比例或者两个都存在 以期望服务费计算服务费比例
+      if(!Number(expect_service_proportion) && Number(expect_service) || Number(expect_service_proportion) && Number(expect_service)){
+        this.handleExpectChange(expect_service);
       }
 
       await this.$refs.ruleForm.validate(async (valid) => {
@@ -1047,6 +1055,9 @@ export default {
     },
 
     handleProportionrChange(e) {
+      this.ruleForm.expect_service_proportion = e;
+      this.$refs.ruleForm.validateField("expect_service_proportion");
+
       const { price, cgd_charge, is_determine_price, expect_service_proportion } = this.ruleForm;
       const prop = is_determine_price === '1' ? 'price' : 'cgd_charge';
 
@@ -1064,7 +1075,10 @@ export default {
       this.$forceUpdate()
     },
 
-    handleExpectChange() {
+    handleExpectChange(e) {
+      this.ruleForm.expect_service = e;
+      this.$refs.ruleForm.validateField("expect_service");
+
       const { price, cgd_charge, is_determine_price, expect_service } = this.ruleForm;
       if (!expect_service) return
 
@@ -1080,6 +1094,8 @@ export default {
 
       this.ruleForm.expect_service_proportion = Number(this.ruleForm[prop]) === 0 || !this.ruleForm[prop] ? '0' : accMul(accDiv(expect_service, this.ruleForm[prop]),100)
       this.$refs.ruleForm.validate('expect_service_proportion');
+
+      console.log( this.ruleForm.expect_service_proportion);
       this.$forceUpdate()
     },
 

src/views/report/cpns/shipment-request.vue

@@ -1,34 +1,49 @@
 <template>
-  <el-table size="mini" border :data="list">
-    <el-table-column label="发货申请编号" prop="orderCode" />
-    <el-table-column label="状态" prop="status" />
-    <el-table-column label="发货数量" prop="send_num" />
-    <el-table-column label="联系人" prop="contactor" />
-    <el-table-column label="联系电话" prop="mobile" />
-    <el-table-column label="收货地址" prop="addr" />
-    <el-table-column label="物流公司" prop="post_name" />
-    <el-table-column label="物流单号" prop="post_code" />
-    <el-table-column label="发货时间" prop="updatetime" />
+  <el-table size="mini" border :data="list" max-height="300px" v-loading="loading">
+    <el-table-column label="发货申请编号" width="160px" prop="orderCode" show-overflow-tooltip />
+    <el-table-column label="状态" width="120px" prop="status" show-overflow-tooltip>
+      <template #default="scope">
+        <el-tag>{{statusOptions.find(({value}) => value === String(scope.row.status))?.label}}</el-tag>
+      </template>
+    </el-table-column>
+    <el-table-column label="发货数量" width="80px"  prop="send_num" show-overflow-tooltip />
+    <el-table-column width="90px" label="联系人" prop="contactor" show-overflow-tooltip />
+    <el-table-column width="120px" label="联系电话" prop="mobile" show-overflow-tooltip />
+    <el-table-column label="收货地址" prop="addr" show-overflow-tooltip />
+    <el-table-column label="物流公司" prop="post_name" show-overflow-tooltip />
+    <el-table-column label="物流单号" prop="post_code" show-overflow-tooltip/>
+    <el-table-column label="发货时间" prop="updatetime" show-overflow-tooltip />
   </el-table>
 </template>
 
 
 <script>
 import asyncRequest from "@/apis/report";
-
+import { statusOptions } from "./../config/columns";
 export default {
   props:["orderCode"],
   data(){
     return {
-      list:[]
+      list:[],
+      loading:false,
+      statusOptions:[
+        { value: "0", label: "待发货" },
+        { value: "1", label: "待库管发货" },
+        { value: "2", label: "已发货待收货" },
+        { value: "3", label: "已收货" },
+        { value: "4", label: "已全部退货" }
+      ]
     }
   },
   async mounted(){
     const orderCode = this.orderCode;
-
     if(!orderCode) return
+    this.loading = true;
     const { data, code, message } = await asyncRequest.saleOutList({ orderCode })
-    this.list = data;
+    this.loading = false;
+    if(Number(code) === 0){
+      this.list = data.list;
+    }
   }
 }
 </script>

src/views/report/cpns/wait-transferred.vue

@@ -23,7 +23,7 @@
         <el-table-column label="收货联系电话" prop="mobile">
           <template slot-scope="scope">
             <el-form-item v-if="scope.$index === editIndex" prop="mobile">
-              <el-input size="mini" placeholder="收货联系电话" v-model="editCacheData.mobile" />
+              <el-input size="mini" placeholder="收货联系电话" maxlength="11" v-model="editCacheData.mobile" />
             </el-form-item>
             <span v-else>{{ scope.row.mobile }}</span>
           </template>