Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js

@@ -19,17 +19,17 @@ export default {
       </template>
     </template>
     <template v-else>
-      <template v-if="getInput(schema)==='select'">
+      <template v-if="getInput(schema)==='tabs'&&mode==='query'">
-        <el-select v-model="model[prop]" :placeholder="schema.placeholder??schema.title" :multiple="!!schema.multiple" :clearable="!!schema.clearable">
-          <el-option v-for="item in options" :key="item.key" :label="item.label" :value="item.value" />
-        </el-select>
-      </template>
-      <template v-else-if="getInput(schema)==='tabs'">
         <el-tabs type="card" v-model="model[prop]" style="height:24px;margin:0;" class="form">
           <el-tab-pane label="全部" key="all" :name="''" />
           <el-tab-pane v-for="item in options" :label="item.label" :name="item.value" />
         </el-tabs>
       </template>
+      <template v-else-if="getInput(schema)==='select'||getInput(schema)==='tabs'">
+        <el-select v-model="model[prop]" :placeholder="schema.placeholder??schema.title" :multiple="!!schema.multiple" :clearable="!!schema.clearable">
+          <el-option v-for="item in options" :key="item.key" :label="item.label" :value="item.value" />
+        </el-select>
+      </template>
       <template v-else-if="getInput(schema)==='month'||getInput(schema)==='datetime'||getInput(schema)==='datetimerange'">
         <el-date-picker v-model="model[prop]" :type="schema.input" :value-format="schema.format??'YYYY-MM-DD HH:mm:ss'" :clearable="!!schema.clearable" />
       </template>

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js

@@ -25,7 +25,7 @@ export default {
                 <template v-for="item in filterList.filter(o=>!o.hidden&&o.readOnly)">
                   <template v-if="config.edit.schema.properties[item.column]?.title">
                     <el-form-item :label="item.title??config.edit.schema.properties[item.column].title">
-                      <app-form-input v-model="item" :schema="config.edit.schema.properties[item.column]" prop="value" />
+                      <app-form-input v-model="item" :schema="config.edit.schema.properties[item.column]" prop="value" mode="query" />
                     </el-form-item>
                   </template>
                   <div v-else>{{item.column}}</div>

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js

@@ -87,7 +87,7 @@ export default {
           </el-col>
           <el-col :span="12" style="height:100%;padding:0 0 0 5px;">
             <el-scrollbar>
-              <app-table ref="setup2table2Ref" :data="adjList" :columns="setup2columns" />
+              <app-table ref="setup2table2Ref" :data="adjList2" :columns="setup2columns" />
             </el-scrollbar>
           </el-col>
         </el-row>
@@ -97,16 +97,17 @@ export default {
           <el-col style="height:100%;padding:0 5px 0 0;">
             <el-scrollbar>
               <el-tabs style="height:100%;">
-                <template v-for="item in setup3Model.items">
+                <template v-for="item in setup3Model">
-                  <el-tab-pane :label="item.invbillNum">
+                  <el-tab-pane :label="item.invbillNum??'null'">
                     <el-descriptions border>
                       <el-descriptions-item label="发票号">{{item.invbillNum}}</el-descriptions-item>
                       <el-descriptions-item label="业务类型">{{businessTypes.options.find(o=>o.value===item.businesType)?.label}}</el-descriptions-item>
-                      <el-descriptions-item label="未税金额">{{item.tax}}</el-descriptions-item>
+                      <el-descriptions-item label="未税金额">{{item.amt}}</el-descriptions-item>
-                      <el-descriptions-item label="税额">{{item.businesType}}</el-descriptions-item>
+                      <el-descriptions-item label="税后金额">{{item.taxAmt}}</el-descriptions-item>
-                      <el-descriptions-item label="税率">{{item.businesType}}</el-descriptions-item>
+                      <el-descriptions-item label="税额">{{item.realAmt }}</el-descriptions-item>
+                      <el-descriptions-item label="税率">{{item.tax}}</el-descriptions-item>
                     </el-descriptions>
-                    <app-table v-if="item.detail" :data="item.detail" :columns="setup2columns" />
+                    <app-table :data="item.detail" :columns="setup2columns" />
                   </el-tab-pane>
                 </template>
               </el-tabs>
@@ -188,7 +189,7 @@ export default {
       height: calc(100% - 120px);
     }
     .cell.diff {
-      background: yellow;
+      background: orangered;
     }
   </style>`,
   props: ["modelValue", "row", "data", "isBusiness", "businessType"],
@@ -418,15 +419,14 @@ export default {
     const setupDialogVisable = ref(false);
     const setupRef = ref(1);
     const adjList = ref([]);
+    const adjList2 = ref([]);
     const scrollRef = ref(null);
     const adjListRef = ref(null);
     const addDialogVisible = ref(false);
     const importDialogVisible = ref(false);
     const setup2table1Ref = ref(null);
     const setup2table2Ref = ref(null);
-    const setup3Model = ref({
+    const setup3Model = ref(null);
-      detail: [],
-    });
     const showSetupDialog = () => {
       //重开发票号
       //invBillNum=
@@ -586,9 +586,9 @@ export default {
           // setupRef.value += 1;
           // return; //临时
           //发到服务的校验
-          const result = await request(`settleaccount/adj_service/check-import`, adjList.value, { method: "POST" });
+          const result = await request(`settleaccount/${service}/reissue-invoice-list`, adjList.value, { method: "POST" });
           if (!result.errors) {
-            adjList.value = result.data.data;
+            adjList2.value = result.data.data;
             setupRef.value += 1;
             //处理高亮
             nextTick(() => {
@@ -614,11 +614,11 @@ export default {
           console.log(e);
         }
       } else if (setupRef.value === 2) {
-        const url = `settleaccount/${service}/reissue-invoice-list`;
+        const url = `settleaccount/${service}/reissue-invoice-list-ext`;
         const result = await request(url, adjList.value, { method: "POST" });
         if (!result.errors) {
           //setup3的数据来源
-          setup3Model.value = result.data;
+          setup3Model.value = result.data.data;
           setupRef.value += 1;
         } else if (result.data?.code === 400 && result.data.fileName) {
           window.open(getUrl(`settleaccount/getblobfile/download/${result.data.fileName}`));
@@ -672,6 +672,7 @@ export default {
       setupRef,
       setupDialogVisable,
       adjList,
+      adjList2,
       adjListRef,
       deleteAdj,
       showAddAdjDialog,