收款条件设置调整

src/HDrpManagement/collectionRule/components/add.vue

@@ -101,7 +101,8 @@ export default {
             "days":item.days,
             "amountrate":(item.amountrate/100).toFixed(4),
             "isused":"1",
-            "point":"订单审核"
+            "point":"订单审核",
+            "iswarranty":item.iswarranty
           }
         })
       }else {
@@ -113,7 +114,8 @@ export default {
             "days":item.days,
             "amountrate":(item.amountrate/100).toFixed(4),
             "isused":"1",
-            "point":"订单出货"
+            "point":"订单出货",
+            "iswarranty":item.iswarranty
           }
         })
       }else {
@@ -125,7 +127,8 @@ export default {
             "days":item.days,
             "amountrate":(item.amountrate/100).toFixed(4),
             "isused":"1",
-            "point":"订单开票"
+            "point":"订单开票",
+            "iswarranty":item.iswarranty
           }
         })
       }else {
@@ -164,17 +167,20 @@ export default {
           this.$refs.audit.list = [{
             days:'',
             amountrate:'',
+            iswarranty:'0'
           }]
         }
       }else if (value === '出货'){
         this.$refs.shipment.list = [{
           days:'',
           amountrate:'',
+          iswarranty:'0'
         }]
       }else if (value === '开票'){
         this.$refs.invoice.list = [{
           days:'',
           amountrate:'',
+          iswarranty:'0'
         }]
       }
     },

src/HDrpManagement/collectionRule/components/edit.vue

@@ -146,7 +146,8 @@ export default {
             "days":item.days,
             "amountrate":(item.amountrate/100).toFixed(4),
             "isused":"1",
-            "point":"订单审核"
+            "point":"订单审核",
+            "iswarranty":item.iswarranty
           }
         })
       }else {
@@ -158,7 +159,8 @@ export default {
             "days":item.days,
             "amountrate":(item.amountrate/100).toFixed(4),
             "isused":"1",
-            "point":"订单出货"
+            "point":"订单出货",
+            "iswarranty":item.iswarranty
           }
         })
       }else {
@@ -170,7 +172,8 @@ export default {
             "days":item.days,
             "amountrate":(item.amountrate/100).toFixed(4),
             "isused":"1",
-            "point":"订单开票"
+            "point":"订单开票",
+            "iswarranty":item.iswarranty
           }
         })
       }else {
@@ -208,17 +211,20 @@ export default {
           this.$refs.audit.list = [{
             days:'',
             amountrate:'',
+            iswarranty:'0'
           }]
         }
       }else if (value === '出货'){
         this.$refs.shipment.list = [{
           days:'',
           amountrate:'',
+          iswarranty:'0'
         }]
       }else if (value === '开票'){
         this.$refs.invoice.list = [{
           days:'',
           amountrate:'',
+          iswarranty:'0'
         }]
       }
     },

src/HDrpManagement/collectionRule/components/indexNew.vue

@@ -1,8 +1,14 @@
 <template>
   <div>
     <div v-if="data.length > 0">
-      <div v-if="data[0].isused == '1'" style="color: red">是</div>
-      <div v-else>--</div>
+      <div v-if="name === 'isused'">
+        <div v-if="data[0].isused == '1'" style="color: red">是</div>
+        <div v-else>--</div>
+      </div>
+      <div v-else-if="name === 'iswarranty'">
+        <div v-if="data[0].iswarranty == '1'" style="color: red">是</div>
+        <div v-else>否</div>
+      </div>
     </div>
     <div v-else>--</div>
   </div>
@@ -11,7 +17,7 @@
 <script>
 export default {
   name: "indexNew",
-  props:['data']
+  props:['data','name']
 }
 </script>
 

src/HDrpManagement/collectionRule/components/setInfo.vue

@@ -7,10 +7,10 @@
       <span style="margin-left: 50px">立账额度：</span>
       <el-input type="number" style="width: 100px" v-model="item.amountrate" placeholder="请输入" :class="{ 'is-error': isErrorInvoiceapply }"  @change="checkAmountrate()"></el-input>
       <span style="margin-left: 5px">%</span>
-      <!--    <i class="el-icon-plus" size="mini" style="margin-left: 10px;color: #3874f6"></i>-->
       <el-button v-if="index === list.length -1" type="text" icon="el-icon-plus" style="margin-left: 10px" @click="addList"></el-button>
       <el-button v-if="list.length !== 1" type="text" icon="el-icon-delete" style="margin-left: 10px;color: red;" @click="delList(index)"></el-button>
       <p v-if="isErrorInvoiceapply" style="color: red;font-size: 12px">立账额度范围(0-100)</p>
+      <el-checkbox v-model="item.iswarranty" true-label="1" false-label="0" >质保金</el-checkbox>
     </div>
   </div>
 </template>

src/HDrpManagement/collectionRule/components/tableColumn.vue

@@ -4,13 +4,17 @@
       <div v-for="(item,index) in data" :key="index">
         <div v-if="name === 'amountrate'">
           <span>{{Math.round((item.amountrate * 100)*100)/100}}%</span>
-          <!--        <el-divider v-if="index !== data.length -1"></el-divider>-->
           <div class="remarks-style-line" v-if="index !== data.length -1"></div>
         </div>
         <div v-else-if="name === 'days'">
           <span>{{item.days}}</span>
           <div class="remarks-style-line" v-if="index !== data.length -1"></div>
         </div>
+        <div v-else-if="name === 'iswarranty'">
+          <div v-if="item.iswarranty == '1'" style="color: red">是</div>
+          <div v-else>否</div>
+          <div class="remarks-style-line" v-if="index !== data.length -1"></div>
+        </div>
       </div>
     </div>
     <div v-else>--</div>

src/HDrpManagement/collectionRule/modules/table.vue

@@ -28,7 +28,7 @@
             <template slot-scope="scope">
               <div v-if="scope.row.accountingnodes">
                 <div v-if="scope.row.accountingnodes.ordercheck">
-                  <indexNew :data="scope.row.accountingnodes.ordercheck"></indexNew>
+                  <indexNew :data="scope.row.accountingnodes.ordercheck" name="isused"></indexNew>
                 </div>
                 <div v-else>--</div>
               </div>
@@ -64,6 +64,20 @@
               <div v-else>--</div>
             </template>
           </el-table-column>
+          <el-table-column
+              prop="iswarranty"
+              label="是否质保金"
+              width="50">
+            <template slot-scope="scope">
+              <div v-if="scope.row.accountingnodes">
+                <div v-if="scope.row.accountingnodes.ordercheck">
+                  <tableColumn :data="scope.row.accountingnodes.ordercheck" name="iswarranty"></tableColumn>
+                </div>
+                <div v-else>--</div>
+              </div>
+              <div v-else>--</div>
+            </template>
+          </el-table-column>
         </el-table-column>
         <el-table-column
           prop="name"
@@ -111,6 +125,20 @@
               <div v-else>--</div>
             </template>
           </el-table-column>
+          <el-table-column
+              prop="iswarranty"
+              label="是否质保金"
+              width="50">
+            <template slot-scope="scope">
+              <div v-if="scope.row.accountingnodes">
+                <div v-if="scope.row.accountingnodes.logisticscheck">
+                  <tableColumn :data="scope.row.accountingnodes.logisticscheck" name="iswarranty"></tableColumn>
+                </div>
+                <div v-else>--</div>
+              </div>
+              <div v-else>--</div>
+            </template>
+          </el-table-column>
         </el-table-column>
         <el-table-column
           prop="name"
@@ -158,6 +186,20 @@
               <div v-else>--</div>
             </template>
           </el-table-column>
+          <el-table-column
+              prop="iswarranty"
+              label="是否质保金"
+              width="50">
+            <template slot-scope="scope">
+              <div v-if="scope.row.accountingnodes">
+                <div v-if="scope.row.accountingnodes.invoiceapplycheck">
+                  <tableColumn :data="scope.row.accountingnodes.invoiceapplycheck" name="iswarranty"></tableColumn>
+                </div>
+                <div v-else>--</div>
+              </div>
+              <div v-else>--</div>
+            </template>
+          </el-table-column>
         </el-table-column>
       </el-table-column>
       <el-table-column