Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/router/index.js

@@ -264,6 +264,15 @@ export const constantRoutes = [{
           title: '销售单开票申请管理',
           noCache: true
         }
+      },
+      {
+        path: '/salesSettlement/salesSettlement',
+        component: () => import('@/views/operation/salesSettlement/salesSettlement.vue'),
+        name: 'SalesSettlement',
+        meta: {
+          title: '销售单结算管理',
+          noCache: true
+        }
       }
     ]
   },

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

@@ -26,10 +26,14 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="24">
+            <el-col :span="16">
               <div class="span-sty">反结算原因</div>
               <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.reason" clearable placeholder="" /></el-form-item>
             </el-col>
+            <el-col :span="8">
+              <div class="span-sty">备注</div>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.remarks" clearable placeholder="" /></el-form-item>
+            </el-col>
           </el-row>
           <div class="title titleOne">
             <div>维修单信息</div>
@@ -256,6 +260,7 @@ export default {
         useOrgSid: '',
         useOrgName: '',
         reason: '',
+        remarks: '',
         applyDate: '',
         sourceSid: '',
         amount: '',
@@ -423,6 +428,7 @@ export default {
         useOrgSid: '',
         useOrgName: '',
         reason: '',
+        remarks: '',
         applyDate: '',
         sourceSid: '',
         amount: '',

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

@@ -24,10 +24,14 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="24">
+            <el-col :span="16">
               <div class="span-sty">反结算原因</div>
               <el-form-item><span class="addinputInfo">{{ formobj.reason }}</span></el-form-item>
             </el-col>
+            <el-col :span="8">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
           </el-row>
           <div class="title">维修单信息</div>
           <el-row>
@@ -252,6 +256,7 @@ export default {
         useOrgSid: '',
         useOrgName: '',
         reason: '',
+        remarks: '',
         applyDate: '',
         sourceSid: '',
         amount: '',
@@ -337,6 +342,7 @@ export default {
         useOrgSid: '',
         useOrgName: '',
         reason: '',
+        remarks: '',
         applyDate: '',
         sourceSid: '',
         amount: '',

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

@@ -27,10 +27,14 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="24">
+            <el-col :span="16">
               <div class="span-sty">反结算原因</div>
               <el-form-item><span class="addinputInfo">{{ formobj.reason }}</span></el-form-item>
             </el-col>
+            <el-col :span="8">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
           </el-row>
           <div class="title">维修单信息</div>
           <el-row>
@@ -294,6 +298,7 @@ export default {
         useOrgSid: '',
         useOrgName: '',
         reason: '',
+        remarks: '',
         applyDate: '',
         sourceSid: '',
         amount: '',

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

@@ -25,10 +25,14 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="24">
+            <el-col :span="16">
               <div class="span-sty">反结算原因</div>
               <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.reason" clearable placeholder="" /></el-form-item>
             </el-col>
+            <el-col :span="8">
+              <div class="span-sty">备注</div>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.remarks" clearable placeholder="" /></el-form-item>
+            </el-col>
           </el-row>
           <div class="title titleOne">
             <div>维修单信息</div>
@@ -254,6 +258,7 @@ export default {
         useOrgSid: '',
         useOrgName: '',
         reason: '',
+        remarks: '',
         applyDate: '',
         sourceSid: '',
         amount: '',

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

@@ -24,10 +24,14 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="24">
+            <el-col :span="16">
               <div class="span-sty">反结算原因</div>
               <el-form-item><span class="addinputInfo">{{ formobj.reason }}</span></el-form-item>
             </el-col>
+            <el-col :span="8">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
           </el-row>
           <div class="title">维修单信息</div>
           <el-row>
@@ -252,6 +256,7 @@ export default {
         useOrgSid: '',
         useOrgName: '',
         reason: '',
+        remarks: '',
         applyDate: '',
         sourceSid: '',
         amount: '',