完善反结算管理

yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlement.vue

@@ -31,7 +31,7 @@
                 <span style="padding: 0 8px">至</span>
                 <el-date-picker v-model="listQuery.params.closeDateEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
               </el-form-item>
-              <el-form-item label="维修单编号">
+              <el-form-item label="维修单号">
                 <el-input v-model="listQuery.params.sourceBillNo" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="维修单类型">
@@ -87,7 +87,7 @@
             <el-table-column prop="createByName" label="申请人" align="center" width="120" />
             <el-table-column prop="applyDate" label="申请日期" align="center" width="120" />
             <el-table-column prop="closeDate" label="办结日期" align="center" width="120" />
-            <el-table-column prop="sourceBillNo" label="维修单编号" align="center" width="190" />
+            <el-table-column prop="sourceBillNo" label="维修单号" align="center" width="190" />
             <el-table-column prop="billType" label="维修单类型" align="center" width="130" />
             <el-table-column prop="subject" label="科目" align="center" width="100" />
             <el-table-column prop="customerName" label="客户名称" align="center" width="160" />

yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlementAdd.vue

@@ -91,29 +91,33 @@
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="serviceItem" label="维修项目" align="center" width="200" />
             <el-table-column prop="serviceType" label="工种" align="center" width="150" />
-            <el-table-column prop="repairerName" label="维修人" align="center" width="200" />
-            <el-table-column prop="examineHourPrice" label="工时提成" align="center" width="100" />
             <el-table-column prop="hourPrice" label="工时单价" align="center" width="150" />
             <el-table-column prop="hours" label="工时数" align="center" width="100" />
             <el-table-column prop="price" label="销售价" align="center" width="150" />
+            <el-table-column prop="sitemReceivableAmount" label="应收金额" align="center" width="150" />
             <el-table-column prop="discount" label="折扣" align="center" width="100" />
             <el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
-            <el-table-column prop="amount" label="金额" align="center" width="150" />
+            <el-table-column prop="sitemSettleAmount" label="结算金额" align="center" width="150" />
+            <el-table-column prop="sitemCost" label="成本小计" align="center" width="150" />
+            <el-table-column prop="sitemPrint" label="利润额" align="center" width="150" />
+            <el-table-column prop="repairerName" label="维修技师" align="center" width="200" />
             <el-table-column prop="remarks" label="备注" align="center" min-width="300" />
           </el-table>
           <div class="title">商品</div>
           <el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
+            <el-table-column prop="goodsID" label="商品ID" align="center" width="200" />
             <el-table-column prop="goodsSpuName" label="商品名称" width="100" align="center" />
             <el-table-column prop="goodsSkuCode" label="图号" width="100" align="center" />
-            <el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
+            <el-table-column prop="count" label="数量" align="center" width="100" />
-            <el-table-column prop="unit" label="单位" width="100" align="center" />
-            <el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
             <el-table-column prop="price" label="销售价" align="center" width="150" />
-            <el-table-column prop="count" label="数量" width="100" align="center" />
+            <el-table-column prop="goodsReceivableAmount" label="应收金额" align="center" width="150" />
             <el-table-column prop="discount" label="折扣" align="center" width="100" />
-            <el-table-column prop="discountAmount" label="优惠" width="100" align="center" />
+            <el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
-            <el-table-column prop="amount" label="金额" width="100" align="center" />
+            <el-table-column prop="goodsSettleAmount" label="结算金额" align="center" width="150" />
+            <el-table-column prop="goodsCost" label="成本小计" align="center" width="150" />
+            <el-table-column prop="goodsPrint" label="利润额" align="center" width="150" />
+            <el-table-column prop="partsSellers" label="配件销售人" align="center" min-width="150" />
             <el-table-column prop="remarks" label="备注" align="center" min-width="300" />
           </el-table>
           <div class="title">附加项目</div>
@@ -127,7 +131,16 @@
                 </div>
               </el-form-item>
             </el-col>
-            <el-col :span="16">
+            <el-col :span="8">
+              <div class="span-sty">成本</div>
+              <el-form-item>
+                <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
+                  <el-input class="addinputInfo" style="width: 20%" @keyup.native="formobj.outCost = getNumber(formobj.outCost, 2)" v-model="formobj.outCost" clearable placeholder="" />
+                  <span>利润额：{{ formobj.outPrint }}</span>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
               <div class="span-sty">备注</div>
               <el-form-item><span class="addinputInfo">{{ formobj.outRemarks }}</span></el-form-item>
             </el-col>
@@ -142,7 +155,16 @@
                 </div>
               </el-form-item>
             </el-col>
-            <el-col :span="16">
+            <el-col :span="8">
+              <div class="span-sty">成本</div>
+              <el-form-item>
+                <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
+                  <el-input class="addinputInfo" style="width: 20%" @keyup.native="formobj.subsidyCost = getNumber(formobj.subsidyCost, 2)" v-model="formobj.subsidyCost" clearable placeholder="" />
+                  <span>利润额：{{ formobj.subsidyPrint }}</span>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
               <div class="span-sty">备注</div>
               <el-form-item><span class="addinputInfo">{{ formobj.subsidyRemarks }}</span></el-form-item>
             </el-col>
@@ -158,10 +180,19 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
+              <div class="span-sty">成本</div>
+              <el-form-item>
+                <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
+                  <el-input class="addinputInfo" style="width: 20%" @keyup.native="formobj.rescueCost = getNumber(formobj.rescueCost, 2)" v-model="formobj.rescueCost" clearable placeholder="" />
+                  <span>利润额：{{ formobj.rescuePrint }}</span>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
               <div class="span-sty">备注</div>
               <el-form-item><span class="addinputInfo">{{ formobj.rescueRemarks }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="4">
               <el-form-item>
                 <div style="display: flex;flex-direction: column;justify-content:flex-start;align-items: flex-start;">
                   <el-button type="text" v-for="(item, index) in formobj.fileName" :key="index" @click="handleOpen(item.url)">{{ item.name }}</el-button>
@@ -172,7 +203,9 @@
           <el-table :key="subjoinKey" :data="formobj.aitemVos" :index="index" border style="width: 100%">
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="aitemName" label="其它附加项目" align="center" width="200" />
-            <el-table-column prop="price" label="销售价" align="center" width="150" />
+            <el-table-column prop="aitemReceivableAmount" label="应收金额" align="center" width="150" />
+            <el-table-column prop="aitemCost" label="成本" align="center" width="150" />
+            <el-table-column prop="aitemPrint" label="利润额" align="center" width="150" />
             <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
           </el-table>
         </el-form>
@@ -237,12 +270,18 @@ export default {
         actualAmount: '',
         outAmount: '',
         outKPAmount: '',
+        outCost: '',
+        outPrint: '',
         outRemarks: '',
         subsidyAmount: '',
         subsidyKPAmount: '',
+        subsidyCost: '',
+        subsidyPrint: '',
         subsidyRemarks: '',
         rescueAmount: '',
         rescueKPAmount: '',
+        rescueCost: '',
+        rescuePrint: '',
         rescueRemarks: '',
         fileName: []
       },
@@ -250,8 +289,26 @@ export default {
     }
   },
   methods: {
+    getNumber(val, limit) {
+      val = val.replace(/[^0-9.]/g, '') // 保留数字
+      val = val.replace(/^00/, '0.') // 开头不能有两个0
+      val = val.replace(/^\./g, '0.') // 开头为小数点转换为0.
+      val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个
+      val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); // 只保留一个小数点
+      /^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0
+      const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
+      const reg = new RegExp(str)
+      if (limit === 0) {
+        // 不需要小数点
+        val = val.replace(reg, '$1')
+      } else {
+        // 通过正则保留小数点后指定的位数
+        val = val.replace(reg, '$1.$2')
+      }
+      return val
+    },
     showAdd(sid) {
-      this.viewTitle = '【新增】反结算申请'
+      this.viewTitle = '【新增】维修单反结算申请'
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
@@ -269,7 +326,7 @@ export default {
       })
     },
     showEdit(row) {
-      this.viewTitle = '【编辑】反结算申请'
+      this.viewTitle = '【编辑】维修单反结算申请'
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
@@ -279,6 +336,9 @@ export default {
         }
       })
     },
+    handleOpen(value) {
+      window.open(value, '_blank')
+    },
     saveOrUpdate() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
@@ -351,7 +411,23 @@ export default {
         goodsAmount: '',
         addAmount: '',
         discountAmount: '',
-        actualAmount: ''
+        actualAmount: '',
+        outAmount: '',
+        outKPAmount: '',
+        outCost: '',
+        outPrint: '',
+        outRemarks: '',
+        subsidyAmount: '',
+        subsidyKPAmount: '',
+        subsidyCost: '',
+        subsidyPrint: '',
+        subsidyRemarks: '',
+        rescueAmount: '',
+        rescueKPAmount: '',
+        rescueCost: '',
+        rescuePrint: '',
+        rescueRemarks: '',
+        fileName: []
       }
       this.$emit('doback')
     }

yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlementInfo.vue

@@ -89,29 +89,33 @@
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="serviceItem" label="维修项目" align="center" width="200" />
             <el-table-column prop="serviceType" label="工种" align="center" width="150" />
-            <el-table-column prop="repairerName" label="维修人" align="center" width="200" />
-            <el-table-column prop="examineHourPrice" label="工时提成" align="center" width="100" />
             <el-table-column prop="hourPrice" label="工时单价" align="center" width="150" />
             <el-table-column prop="hours" label="工时数" align="center" width="100" />
             <el-table-column prop="price" label="销售价" align="center" width="150" />
+            <el-table-column prop="sitemReceivableAmount" label="应收金额" align="center" width="150" />
             <el-table-column prop="discount" label="折扣" align="center" width="100" />
             <el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
-            <el-table-column prop="amount" label="金额" align="center" width="150" />
+            <el-table-column prop="sitemSettleAmount" label="结算金额" align="center" width="150" />
+            <el-table-column prop="sitemCost" label="成本小计" align="center" width="150" />
+            <el-table-column prop="sitemPrint" label="利润额" align="center" width="150" />
+            <el-table-column prop="repairerName" label="维修技师" align="center" width="200" />
             <el-table-column prop="remarks" label="备注" align="center" min-width="300" />
           </el-table>
           <div class="title">商品</div>
           <el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
+            <el-table-column prop="goodsID" label="商品ID" align="center" width="200" />
             <el-table-column prop="goodsSpuName" label="商品名称" width="100" align="center" />
             <el-table-column prop="goodsSkuCode" label="图号" width="100" align="center" />
-            <el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
+            <el-table-column prop="count" label="数量" align="center" width="100" />
-            <el-table-column prop="unit" label="单位" width="100" align="center" />
-            <el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
             <el-table-column prop="price" label="销售价" align="center" width="150" />
-            <el-table-column prop="count" label="数量" width="100" align="center" />
+            <el-table-column prop="goodsReceivableAmount" label="应收金额" align="center" width="150" />
             <el-table-column prop="discount" label="折扣" align="center" width="100" />
-            <el-table-column prop="discountAmount" label="优惠" width="100" align="center" />
+            <el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
-            <el-table-column prop="amount" label="金额" width="100" align="center" />
+            <el-table-column prop="goodsSettleAmount" label="结算金额" align="center" width="150" />
+            <el-table-column prop="goodsCost" label="成本小计" align="center" width="150" />
+            <el-table-column prop="goodsPrint" label="利润额" align="center" width="150" />
+            <el-table-column prop="partsSellers" label="配件销售人" align="center" min-width="150" />
             <el-table-column prop="remarks" label="备注" align="center" min-width="300" />
           </el-table>
           <div class="title">附加项目</div>
@@ -125,7 +129,16 @@
                 </div>
               </el-form-item>
             </el-col>
-            <el-col :span="16">
+            <el-col :span="8">
+              <div class="span-sty">成本</div>
+              <el-form-item>
+                <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
+                  <span class="addinputInfo">{{ formobj.outCost }}</span>
+                  <span>利润额：{{ formobj.outPrint }}</span>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
               <div class="span-sty">备注</div>
               <el-form-item><span class="addinputInfo">{{ formobj.outRemarks }}</span></el-form-item>
             </el-col>
@@ -140,7 +153,16 @@
                 </div>
               </el-form-item>
             </el-col>
-            <el-col :span="16">
+            <el-col :span="8">
+              <div class="span-sty">成本</div>
+              <el-form-item>
+                <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
+                  <span class="addinputInfo">{{ formobj.subsidyCost }}</span>
+                  <span>利润额：{{ formobj.subsidyPrint }}</span>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
               <div class="span-sty">备注</div>
               <el-form-item><span class="addinputInfo">{{ formobj.subsidyRemarks }}</span></el-form-item>
             </el-col>
@@ -156,10 +178,19 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
+              <div class="span-sty">成本</div>
+              <el-form-item>
+                <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
+                  <span class="addinputInfo">{{ formobj.rescueCost }}</span>
+                  <span>利润额：{{ formobj.rescuePrint }}</span>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
               <div class="span-sty">备注</div>
               <el-form-item><span class="addinputInfo">{{ formobj.rescueRemarks }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="4">
               <el-form-item>
                 <div style="display: flex;flex-direction: column;justify-content:flex-start;align-items: flex-start;">
                   <el-button type="text" v-for="(item, index) in formobj.fileName" :key="index" @click="handleOpen(item.url)">{{ item.name }}</el-button>
@@ -170,7 +201,9 @@
           <el-table :key="subjoinKey" :data="formobj.aitemVos" :index="index" border style="width: 100%">
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="aitemName" label="其它附加项目" align="center" width="200" />
-            <el-table-column prop="price" label="销售价" align="center" width="150" />
+            <el-table-column prop="aitemReceivableAmount" label="应收金额" align="center" width="150" />
+            <el-table-column prop="aitemCost" label="成本" align="center" width="150" />
+            <el-table-column prop="aitemPrint" label="利润额" align="center" width="150" />
             <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
           </el-table>
         </el-form>
@@ -235,12 +268,18 @@ export default {
         actualAmount: '',
         outAmount: '',
         outKPAmount: '',
+        outCost: '',
+        outPrint: '',
         outRemarks: '',
         subsidyAmount: '',
         subsidyKPAmount: '',
+        subsidyCost: '',
+        subsidyPrint: '',
         subsidyRemarks: '',
         rescueAmount: '',
         rescueKPAmount: '',
+        rescueCost: '',
+        rescuePrint: '',
         rescueRemarks: '',
         fileName: []
       },
@@ -249,7 +288,7 @@ export default {
   },
   methods: {
     showInfo(row) {
-      this.viewTitle = '反结算申请详情'
+      this.viewTitle = '维修单反结算申请详情'
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
@@ -266,6 +305,9 @@ export default {
         }
       })
     },
+    handleOpen(value) {
+      window.open(value, '_blank')
+    },
     handleReturn() {
       this.formobj = {
         sid: '',
@@ -304,7 +346,23 @@ export default {
         goodsAmount: '',
         addAmount: '',
         discountAmount: '',
-        actualAmount: ''
+        actualAmount: '',
+        outAmount: '',
+        outKPAmount: '',
+        outCost: '',
+        outPrint: '',
+        outRemarks: '',
+        subsidyAmount: '',
+        subsidyKPAmount: '',
+        subsidyCost: '',
+        subsidyPrint: '',
+        subsidyRemarks: '',
+        rescueAmount: '',
+        rescueKPAmount: '',
+        rescueCost: '',
+        rescuePrint: '',
+        rescueRemarks: '',
+        fileName: []
       }
       this.$emit('doback')
     }

yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementDaiBan.vue

@@ -92,29 +92,33 @@
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="serviceItem" label="维修项目" align="center" width="200" />
             <el-table-column prop="serviceType" label="工种" align="center" width="150" />
-            <el-table-column prop="repairerName" label="维修人" align="center" width="200" />
-            <el-table-column prop="examineHourPrice" label="工时提成" align="center" width="100" />
             <el-table-column prop="hourPrice" label="工时单价" align="center" width="150" />
             <el-table-column prop="hours" label="工时数" align="center" width="100" />
             <el-table-column prop="price" label="销售价" align="center" width="150" />
+            <el-table-column prop="sitemReceivableAmount" label="应收金额" align="center" width="150" />
             <el-table-column prop="discount" label="折扣" align="center" width="100" />
             <el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
-            <el-table-column prop="amount" label="金额" align="center" width="150" />
+            <el-table-column prop="sitemSettleAmount" label="结算金额" align="center" width="150" />
+            <el-table-column prop="sitemCost" label="成本小计" align="center" width="150" />
+            <el-table-column prop="sitemPrint" label="利润额" align="center" width="150" />
+            <el-table-column prop="repairerName" label="维修技师" align="center" width="200" />
             <el-table-column prop="remarks" label="备注" align="center" min-width="300" />
           </el-table>
           <div class="title">商品</div>
           <el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
+            <el-table-column prop="goodsID" label="商品ID" align="center" width="200" />
             <el-table-column prop="goodsSpuName" label="商品名称" width="100" align="center" />
             <el-table-column prop="goodsSkuCode" label="图号" width="100" align="center" />
-            <el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
+            <el-table-column prop="count" label="数量" align="center" width="100" />
-            <el-table-column prop="unit" label="单位" width="100" align="center" />
-            <el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
             <el-table-column prop="price" label="销售价" align="center" width="150" />
-            <el-table-column prop="count" label="数量" width="100" align="center" />
+            <el-table-column prop="goodsReceivableAmount" label="应收金额" align="center" width="150" />
             <el-table-column prop="discount" label="折扣" align="center" width="100" />
-            <el-table-column prop="discountAmount" label="优惠" width="100" align="center" />
+            <el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
-            <el-table-column prop="amount" label="金额" width="100" align="center" />
+            <el-table-column prop="goodsSettleAmount" label="结算金额" align="center" width="150" />
+            <el-table-column prop="goodsCost" label="成本小计" align="center" width="150" />
+            <el-table-column prop="goodsPrint" label="利润额" align="center" width="150" />
+            <el-table-column prop="partsSellers" label="配件销售人" align="center" min-width="150" />
             <el-table-column prop="remarks" label="备注" align="center" min-width="300" />
           </el-table>
           <div class="title">附加项目</div>
@@ -128,7 +132,16 @@
                 </div>
               </el-form-item>
             </el-col>
-            <el-col :span="16">
+            <el-col :span="8">
+              <div class="span-sty">成本</div>
+              <el-form-item>
+                <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
+                  <span class="addinputInfo">{{ formobj.outCost }}</span>
+                  <span>利润额：{{ formobj.outPrint }}</span>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
               <div class="span-sty">备注</div>
               <el-form-item><span class="addinputInfo">{{ formobj.outRemarks }}</span></el-form-item>
             </el-col>
@@ -143,7 +156,16 @@
                 </div>
               </el-form-item>
             </el-col>
-            <el-col :span="16">
+            <el-col :span="8">
+              <div class="span-sty">成本</div>
+              <el-form-item>
+                <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
+                  <span class="addinputInfo">{{ formobj.subsidyCost }}</span>
+                  <span>利润额：{{ formobj.subsidyPrint }}</span>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
               <div class="span-sty">备注</div>
               <el-form-item><span class="addinputInfo">{{ formobj.subsidyRemarks }}</span></el-form-item>
             </el-col>
@@ -159,10 +181,19 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
+              <div class="span-sty">成本</div>
+              <el-form-item>
+                <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
+                  <span class="addinputInfo">{{ formobj.rescueCost }}</span>
+                  <span>利润额：{{ formobj.rescuePrint }}</span>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
               <div class="span-sty">备注</div>
               <el-form-item><span class="addinputInfo">{{ formobj.rescueRemarks }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="4">
               <el-form-item>
                 <div style="display: flex;flex-direction: column;justify-content:flex-start;align-items: flex-start;">
                   <el-button type="text" v-for="(item, index) in formobj.fileName" :key="index" @click="handleOpen(item.url)">{{ item.name }}</el-button>
@@ -173,7 +204,9 @@
           <el-table :key="subjoinKey" :data="formobj.aitemVos" :index="index" border style="width: 100%">
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="aitemName" label="其它附加项目" align="center" width="200" />
-            <el-table-column prop="price" label="销售价" align="center" width="150" />
+            <el-table-column prop="aitemReceivableAmount" label="应收金额" align="center" width="150" />
+            <el-table-column prop="aitemCost" label="成本" align="center" width="150" />
+            <el-table-column prop="aitemPrint" label="利润额" align="center" width="150" />
             <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
           </el-table>
         </el-form>
@@ -277,12 +310,18 @@ export default {
         actualAmount: '',
         outAmount: '',
         outKPAmount: '',
+        outCost: '',
+        outPrint: '',
         outRemarks: '',
         subsidyAmount: '',
         subsidyKPAmount: '',
+        subsidyCost: '',
+        subsidyPrint: '',
         subsidyRemarks: '',
         rescueAmount: '',
         rescueKPAmount: '',
+        rescueCost: '',
+        rescuePrint: '',
         rescueRemarks: '',
         fileName: []
       },
@@ -355,7 +394,7 @@ export default {
   },
   methods: {
     showInfo(sid) {
-      this.viewTitle = '工单反结算详情'
+      this.viewTitle = '维修单反结算申请详情'
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
@@ -377,6 +416,9 @@ export default {
         }
       })
     },
+    handleOpen(value) {
+      window.open(value, '_blank')
+    },
     // 加签
     openCountersign(val) {
       this.operation = val

yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementEdit.vue

@@ -90,29 +90,33 @@
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="serviceItem" label="维修项目" align="center" width="200" />
             <el-table-column prop="serviceType" label="工种" align="center" width="150" />
-            <el-table-column prop="repairerName" label="维修人" align="center" width="200" />
-            <el-table-column prop="examineHourPrice" label="工时提成" align="center" width="100" />
             <el-table-column prop="hourPrice" label="工时单价" align="center" width="150" />
             <el-table-column prop="hours" label="工时数" align="center" width="100" />
             <el-table-column prop="price" label="销售价" align="center" width="150" />
+            <el-table-column prop="sitemReceivableAmount" label="应收金额" align="center" width="150" />
             <el-table-column prop="discount" label="折扣" align="center" width="100" />
             <el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
-            <el-table-column prop="amount" label="金额" align="center" width="150" />
+            <el-table-column prop="sitemSettleAmount" label="结算金额" align="center" width="150" />
+            <el-table-column prop="sitemCost" label="成本小计" align="center" width="150" />
+            <el-table-column prop="sitemPrint" label="利润额" align="center" width="150" />
+            <el-table-column prop="repairerName" label="维修技师" align="center" width="200" />
             <el-table-column prop="remarks" label="备注" align="center" min-width="300" />
           </el-table>
           <div class="title">商品</div>
           <el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
+            <el-table-column prop="goodsID" label="商品ID" align="center" width="200" />
             <el-table-column prop="goodsSpuName" label="商品名称" width="100" align="center" />
             <el-table-column prop="goodsSkuCode" label="图号" width="100" align="center" />
-            <el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
+            <el-table-column prop="count" label="数量" align="center" width="100" />
-            <el-table-column prop="unit" label="单位" width="100" align="center" />
-            <el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
             <el-table-column prop="price" label="销售价" align="center" width="150" />
-            <el-table-column prop="count" label="数量" width="100" align="center" />
+            <el-table-column prop="goodsReceivableAmount" label="应收金额" align="center" width="150" />
             <el-table-column prop="discount" label="折扣" align="center" width="100" />
-            <el-table-column prop="discountAmount" label="优惠" width="100" align="center" />
+            <el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
-            <el-table-column prop="amount" label="金额" width="100" align="center" />
+            <el-table-column prop="goodsSettleAmount" label="结算金额" align="center" width="150" />
+            <el-table-column prop="goodsCost" label="成本小计" align="center" width="150" />
+            <el-table-column prop="goodsPrint" label="利润额" align="center" width="150" />
+            <el-table-column prop="partsSellers" label="配件销售人" align="center" min-width="150" />
             <el-table-column prop="remarks" label="备注" align="center" min-width="300" />
           </el-table>
           <div class="title">附加项目</div>
@@ -126,7 +130,16 @@
                 </div>
               </el-form-item>
             </el-col>
-            <el-col :span="16">
+            <el-col :span="8">
+              <div class="span-sty">成本</div>
+              <el-form-item>
+                <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
+                  <el-input class="addinputInfo" style="width: 20%" @keyup.native="formobj.outCost = getNumber(formobj.outCost, 2)" v-model="formobj.outCost" clearable placeholder="" />
+                  <span>利润额：{{ formobj.outPrint }}</span>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
               <div class="span-sty">备注</div>
               <el-form-item><span class="addinputInfo">{{ formobj.outRemarks }}</span></el-form-item>
             </el-col>
@@ -141,7 +154,16 @@
                 </div>
               </el-form-item>
             </el-col>
-            <el-col :span="16">
+            <el-col :span="8">
+              <div class="span-sty">成本</div>
+              <el-form-item>
+                <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
+                  <el-input class="addinputInfo" style="width: 20%" @keyup.native="formobj.subsidyCost = getNumber(formobj.subsidyCost, 2)" v-model="formobj.subsidyCost" clearable placeholder="" />
+                  <span>利润额：{{ formobj.subsidyPrint }}</span>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
               <div class="span-sty">备注</div>
               <el-form-item><span class="addinputInfo">{{ formobj.subsidyRemarks }}</span></el-form-item>
             </el-col>
@@ -157,10 +179,19 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
+              <div class="span-sty">成本</div>
+              <el-form-item>
+                <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
+                  <el-input class="addinputInfo" style="width: 20%" @keyup.native="formobj.rescueCost = getNumber(formobj.rescueCost, 2)" v-model="formobj.rescueCost" clearable placeholder="" />
+                  <span>利润额：{{ formobj.rescuePrint }}</span>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
               <div class="span-sty">备注</div>
               <el-form-item><span class="addinputInfo">{{ formobj.rescueRemarks }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="4">
               <el-form-item>
                 <div style="display: flex;flex-direction: column;justify-content:flex-start;align-items: flex-start;">
                   <el-button type="text" v-for="(item, index) in formobj.fileName" :key="index" @click="handleOpen(item.url)">{{ item.name }}</el-button>
@@ -171,7 +202,9 @@
           <el-table :key="subjoinKey" :data="formobj.aitemVos" :index="index" border style="width: 100%">
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="aitemName" label="其它附加项目" align="center" width="200" />
-            <el-table-column prop="price" label="销售价" align="center" width="150" />
+            <el-table-column prop="aitemReceivableAmount" label="应收金额" align="center" width="150" />
+            <el-table-column prop="aitemCost" label="成本" align="center" width="150" />
+            <el-table-column prop="aitemPrint" label="利润额" align="center" width="150" />
             <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
           </el-table>
         </el-form>
@@ -236,12 +269,18 @@ export default {
         actualAmount: '',
         outAmount: '',
         outKPAmount: '',
+        outCost: '',
+        outPrint: '',
         outRemarks: '',
         subsidyAmount: '',
         subsidyKPAmount: '',
+        subsidyCost: '',
+        subsidyPrint: '',
         subsidyRemarks: '',
         rescueAmount: '',
         rescueKPAmount: '',
+        rescueCost: '',
+        rescuePrint: '',
         rescueRemarks: '',
         fileName: []
       },
@@ -267,7 +306,7 @@ export default {
   },
   methods: {
     showInfo(sid) {
-      this.viewTitle = '【编辑】工单反结算'
+      this.viewTitle = '【编辑】维修单反结算申请'
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
@@ -277,6 +316,9 @@ export default {
         }
       })
     },
+    handleOpen(value) {
+      window.open(value, '_blank')
+    },
     saveOrUpdate() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {

yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementYiBan.vue

@@ -89,29 +89,33 @@
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="serviceItem" label="维修项目" align="center" width="200" />
             <el-table-column prop="serviceType" label="工种" align="center" width="150" />
-            <el-table-column prop="repairerName" label="维修人" align="center" width="200" />
-            <el-table-column prop="examineHourPrice" label="工时提成" align="center" width="100" />
             <el-table-column prop="hourPrice" label="工时单价" align="center" width="150" />
             <el-table-column prop="hours" label="工时数" align="center" width="100" />
             <el-table-column prop="price" label="销售价" align="center" width="150" />
+            <el-table-column prop="sitemReceivableAmount" label="应收金额" align="center" width="150" />
             <el-table-column prop="discount" label="折扣" align="center" width="100" />
             <el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
-            <el-table-column prop="amount" label="金额" align="center" width="150" />
+            <el-table-column prop="sitemSettleAmount" label="结算金额" align="center" width="150" />
+            <el-table-column prop="sitemCost" label="成本小计" align="center" width="150" />
+            <el-table-column prop="sitemPrint" label="利润额" align="center" width="150" />
+            <el-table-column prop="repairerName" label="维修技师" align="center" width="200" />
             <el-table-column prop="remarks" label="备注" align="center" min-width="300" />
           </el-table>
           <div class="title">商品</div>
           <el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
+            <el-table-column prop="goodsID" label="商品ID" align="center" width="200" />
             <el-table-column prop="goodsSpuName" label="商品名称" width="100" align="center" />
             <el-table-column prop="goodsSkuCode" label="图号" width="100" align="center" />
-            <el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
+            <el-table-column prop="count" label="数量" align="center" width="100" />
-            <el-table-column prop="unit" label="单位" width="100" align="center" />
-            <el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
             <el-table-column prop="price" label="销售价" align="center" width="150" />
-            <el-table-column prop="count" label="数量" width="100" align="center" />
+            <el-table-column prop="goodsReceivableAmount" label="应收金额" align="center" width="150" />
             <el-table-column prop="discount" label="折扣" align="center" width="100" />
-            <el-table-column prop="discountAmount" label="优惠" width="100" align="center" />
+            <el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
-            <el-table-column prop="amount" label="金额" width="100" align="center" />
+            <el-table-column prop="goodsSettleAmount" label="结算金额" align="center" width="150" />
+            <el-table-column prop="goodsCost" label="成本小计" align="center" width="150" />
+            <el-table-column prop="goodsPrint" label="利润额" align="center" width="150" />
+            <el-table-column prop="partsSellers" label="配件销售人" align="center" min-width="150" />
             <el-table-column prop="remarks" label="备注" align="center" min-width="300" />
           </el-table>
           <div class="title">附加项目</div>
@@ -125,7 +129,16 @@
                 </div>
               </el-form-item>
             </el-col>
-            <el-col :span="16">
+            <el-col :span="8">
+              <div class="span-sty">成本</div>
+              <el-form-item>
+                <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
+                  <span class="addinputInfo">{{ formobj.outCost }}</span>
+                  <span>利润额：{{ formobj.outPrint }}</span>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
               <div class="span-sty">备注</div>
               <el-form-item><span class="addinputInfo">{{ formobj.outRemarks }}</span></el-form-item>
             </el-col>
@@ -140,7 +153,16 @@
                 </div>
               </el-form-item>
             </el-col>
-            <el-col :span="16">
+            <el-col :span="8">
+              <div class="span-sty">成本</div>
+              <el-form-item>
+                <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
+                  <span class="addinputInfo">{{ formobj.subsidyCost }}</span>
+                  <span>利润额：{{ formobj.subsidyPrint }}</span>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
               <div class="span-sty">备注</div>
               <el-form-item><span class="addinputInfo">{{ formobj.subsidyRemarks }}</span></el-form-item>
             </el-col>
@@ -156,10 +178,19 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
+              <div class="span-sty">成本</div>
+              <el-form-item>
+                <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
+                  <span class="addinputInfo">{{ formobj.rescueCost }}</span>
+                  <span>利润额：{{ formobj.rescuePrint }}</span>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
               <div class="span-sty">备注</div>
               <el-form-item><span class="addinputInfo">{{ formobj.rescueRemarks }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="4">
               <el-form-item>
                 <div style="display: flex;flex-direction: column;justify-content:flex-start;align-items: flex-start;">
                   <el-button type="text" v-for="(item, index) in formobj.fileName" :key="index" @click="handleOpen(item.url)">{{ item.name }}</el-button>
@@ -170,7 +201,9 @@
           <el-table :key="subjoinKey" :data="formobj.aitemVos" :index="index" border style="width: 100%">
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="aitemName" label="其它附加项目" align="center" width="200" />
-            <el-table-column prop="price" label="销售价" align="center" width="150" />
+            <el-table-column prop="aitemReceivableAmount" label="应收金额" align="center" width="150" />
+            <el-table-column prop="aitemCost" label="成本" align="center" width="150" />
+            <el-table-column prop="aitemPrint" label="利润额" align="center" width="150" />
             <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
           </el-table>
         </el-form>
@@ -235,12 +268,18 @@ export default {
         actualAmount: '',
         outAmount: '',
         outKPAmount: '',
+        outCost: '',
+        outPrint: '',
         outRemarks: '',
         subsidyAmount: '',
         subsidyKPAmount: '',
+        subsidyCost: '',
+        subsidyPrint: '',
         subsidyRemarks: '',
         rescueAmount: '',
         rescueKPAmount: '',
+        rescueCost: '',
+        rescuePrint: '',
         rescueRemarks: '',
         fileName: []
       },
@@ -284,7 +323,7 @@ export default {
   },
   methods: {
     showInfo(sid) {
-      this.viewTitle = '工单反结算详情'
+      this.viewTitle = '维修单反结算申请详情'
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
@@ -301,6 +340,9 @@ export default {
         }
       })
     },
+    handleOpen(value) {
+      window.open(value, '_blank')
+    },
     /** 确认撤回任务 */
     openRevoke() {
       this.$confirm('是否确认执行撤回操作', '提示', {