莫绍宝 пре 3 година
родитељ
комит
aaa71e6108

+ 1 - 2
src/views/supply/engin/components/home_form.vue

@@ -194,8 +194,7 @@
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.price" size="small" type="number" v-if="!isDealer"></el-input>
-            <div v-else>{{scope.row.price}}</div>
+            <el-input v-model="scope.row.price" size="small" type="number"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="工程登录数量" prop="enginNum" min-width="120" show-overflow-tooltip></el-table-column>

+ 11 - 4
src/views/supply/implement/implement_list.vue

@@ -106,7 +106,8 @@
             <el-table-column align="center" label="规格型号" prop="specification" min-width="200" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="订单未发货数量" prop="refundableQty" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="总数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="right" label="退货数量" prop="retiredQty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="退订数量" prop="retiredQty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="退货数量" prop="refundProductQty" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="订单金额" prop="payAmount" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.payAmount | numToFixed}}
@@ -124,12 +125,18 @@
             </el-table-column>
             <el-table-column align="right" label="发货数量" prop="hasSendQty" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="right" label="退金额" prop="retiredAmount" min-width="100" show-overflow-tooltip>
+            <el-table-column align="right" label="退金额" prop="retiredAmount" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.retiredAmount | numToFixed}}
               </template>
             </el-table-column>
+            <el-table-column align="right" label="退货金额" prop="refundProductAmount" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.refundProductAmount | numToFixed}}
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="归属业务员" prop="newServiceName" min-width="100" show-overflow-tooltip></el-table-column>
           </el-table>
         </div>
       </div>
@@ -247,8 +254,8 @@ export default {
       };
       getList(params).then((res) => {
         res.data.records.forEach(item => {
-          item.sums1 = ['refundableQty', 'qty', 'retiredQty', 'hasSendQty', 'directTransferQty'];
-          item.sums2 = ['payAmount', 'payRebateAmount', 'hasSendAmount', 'retiredAmount'];
+          item.sums1 = ['refundableQty', 'qty', 'retiredQty', 'hasSendQty', 'directTransferQty', 'refundProductQty'];
+          item.sums2 = ['payAmount', 'payRebateAmount', 'hasSendAmount', 'retiredAmount', 'refundProductAmount'];
         })
         this.dataList = res.data.records;
         this.listTotal = res.data.total;