From 6c4d410638312376c58860cc2b6de31e1f04067f Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 23 Oct 2023 14:07:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=8F=E9=94=80?=
 =?UTF-8?q?=E5=95=86=E5=A4=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dealer/dealerrecord/dealerrecordAdd.vue   | 32 +++++++++----------
 .../dealer/dealerrecord/dealerrecordInfo.vue  | 18 +++++------
 .../jingxiaoshangFlow/jingxiaoshangDaiBan.vue | 18 +++++------
 .../jingxiaoshangFlow/jingxiaoshangEdit.vue   | 32 +++++++++----------
 .../jingxiaoshangFlow/jingxiaoshangYiBan.vue  | 18 +++++------
 5 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/anrui-base/anrui-base-ui/src/views/dealer/dealerrecord/dealerrecordAdd.vue b/anrui-base/anrui-base-ui/src/views/dealer/dealerrecord/dealerrecordAdd.vue
index a81a28fdc6..3319b38fd5 100644
--- a/anrui-base/anrui-base-ui/src/views/dealer/dealerrecord/dealerrecordAdd.vue
+++ b/anrui-base/anrui-base-ui/src/views/dealer/dealerrecord/dealerrecordAdd.vue
@@ -49,26 +49,26 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8">
-              <div class="span-sty">有效期至</div>
-              <el-form-item><span class="addinputInfo">{{ temp.effectiveDate }}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
+<!--            <el-col :span="8">-->
+<!--              <div class="span-sty">有效期至</div>-->
+<!--              <el-form-item><span class="addinputInfo">{{ temp.effectiveDate }}</span>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+            <el-col :span="24">
               <div class="span-sty">备注</div>
               <el-form-item>
-                <el-input class="addinputInfo" style="width: 50%" v-model="temp.remarks" clearable placeholder=""/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">是否同意</div>
-              <el-form-item>
-                <el-radio-group style="font-size: 1px" class="addinputInfo" v-model="temp.agree">
-                  <el-radio label="1">是</el-radio>
-                  <el-radio label="0">否</el-radio>
-                </el-radio-group>
+                <el-input class="addinputInfo" style="width: 70%" v-model="temp.remarks" clearable placeholder=""/>
               </el-form-item>
             </el-col>
+<!--            <el-col :span="8">-->
+<!--              <div class="span-sty">是否同意</div>-->
+<!--              <el-form-item>-->
+<!--                <el-radio-group style="font-size: 1px" class="addinputInfo" v-model="temp.agree">-->
+<!--                  <el-radio label="1">是</el-radio>-->
+<!--                  <el-radio label="0">否</el-radio>-->
+<!--                </el-radio-group>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
           </el-row>
           <div class="title">基本信息</div>
           <el-row>
diff --git a/anrui-base/anrui-base-ui/src/views/dealer/dealerrecord/dealerrecordInfo.vue b/anrui-base/anrui-base-ui/src/views/dealer/dealerrecord/dealerrecordInfo.vue
index 2ecb08a78e..2d5faf967f 100644
--- a/anrui-base/anrui-base-ui/src/views/dealer/dealerrecord/dealerrecordInfo.vue
+++ b/anrui-base/anrui-base-ui/src/views/dealer/dealerrecord/dealerrecordInfo.vue
@@ -39,18 +39,18 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8">
-              <div class="span-sty">有效期至</div>
-              <el-form-item><span class="addinputInfo">{{ temp.effectiveDate }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
+<!--            <el-col :span="8">-->
+<!--              <div class="span-sty">有效期至</div>-->
+<!--              <el-form-item><span class="addinputInfo">{{ temp.effectiveDate }}</span></el-form-item>-->
+<!--            </el-col>-->
+            <el-col :span="24">
               <div class="span-sty">备注</div>
               <el-form-item><span class="addinputInfo">{{ temp.remarks }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
-              <div class="span-sty">是否同意</div>
-              <el-form-item><span class="addinputInfo">{{ temp.agree == '1' ? '是' : temp.agree == '0' ? '否' : '' }}</span></el-form-item>
-            </el-col>
+<!--            <el-col :span="8">-->
+<!--              <div class="span-sty">是否同意</div>-->
+<!--              <el-form-item><span class="addinputInfo">{{ temp.agree == '1' ? '是' : temp.agree == '0' ? '否' : '' }}</span></el-form-item>-->
+<!--            </el-col>-->
           </el-row>
           <div class="title">基本信息</div>
           <el-row>
diff --git a/anrui-base/anrui-base-ui/src/views/workFlow/jingxiaoshangFlow/jingxiaoshangDaiBan.vue b/anrui-base/anrui-base-ui/src/views/workFlow/jingxiaoshangFlow/jingxiaoshangDaiBan.vue
index e4c19c748a..9e9005e84f 100644
--- a/anrui-base/anrui-base-ui/src/views/workFlow/jingxiaoshangFlow/jingxiaoshangDaiBan.vue
+++ b/anrui-base/anrui-base-ui/src/views/workFlow/jingxiaoshangFlow/jingxiaoshangDaiBan.vue
@@ -42,18 +42,18 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8">
-              <div class="span-sty">有效期至</div>
-              <el-form-item><span class="addinputInfo">{{ temp.effectiveDate }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
+<!--            <el-col :span="8">-->
+<!--              <div class="span-sty">有效期至</div>-->
+<!--              <el-form-item><span class="addinputInfo">{{ temp.effectiveDate }}</span></el-form-item>-->
+<!--            </el-col>-->
+            <el-col :span="24">
               <div class="span-sty">备注</div>
               <el-form-item><span class="addinputInfo">{{ temp.remarks }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
-              <div class="span-sty">是否同意</div>
-              <el-form-item><span class="addinputInfo">{{ temp.agree == '1' ? '是' : temp.agree == '0' ? '否' : '' }}</span></el-form-item>
-            </el-col>
+<!--            <el-col :span="8">-->
+<!--              <div class="span-sty">是否同意</div>-->
+<!--              <el-form-item><span class="addinputInfo">{{ temp.agree == '1' ? '是' : temp.agree == '0' ? '否' : '' }}</span></el-form-item>-->
+<!--            </el-col>-->
           </el-row>
           <div class="title">基本信息</div>
           <el-row>
diff --git a/anrui-base/anrui-base-ui/src/views/workFlow/jingxiaoshangFlow/jingxiaoshangEdit.vue b/anrui-base/anrui-base-ui/src/views/workFlow/jingxiaoshangFlow/jingxiaoshangEdit.vue
index efacff0877..d22ab08719 100644
--- a/anrui-base/anrui-base-ui/src/views/workFlow/jingxiaoshangFlow/jingxiaoshangEdit.vue
+++ b/anrui-base/anrui-base-ui/src/views/workFlow/jingxiaoshangFlow/jingxiaoshangEdit.vue
@@ -47,26 +47,26 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="8">
-            <div class="span-sty">有效期至</div>
-            <el-form-item><span class="addinputInfo">{{ temp.effectiveDate }}</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
+<!--          <el-col :span="8">-->
+<!--            <div class="span-sty">有效期至</div>-->
+<!--            <el-form-item><span class="addinputInfo">{{ temp.effectiveDate }}</span>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+          <el-col :span="24">
             <div class="span-sty">备注</div>
             <el-form-item>
-              <el-input class="addinputInfo" style="width: 50%" v-model="temp.remarks" clearable placeholder=""/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">是否同意</div>
-            <el-form-item>
-              <el-radio-group style="font-size: 1px" class="addinputInfo" v-model="temp.agree">
-                <el-radio label="1">是</el-radio>
-                <el-radio label="0">否</el-radio>
-              </el-radio-group>
+              <el-input class="addinputInfo" style="width: 70%" v-model="temp.remarks" clearable placeholder=""/>
             </el-form-item>
           </el-col>
+<!--          <el-col :span="8">-->
+<!--            <div class="span-sty">是否同意</div>-->
+<!--            <el-form-item>-->
+<!--              <el-radio-group style="font-size: 1px" class="addinputInfo" v-model="temp.agree">-->
+<!--                <el-radio label="1">是</el-radio>-->
+<!--                <el-radio label="0">否</el-radio>-->
+<!--              </el-radio-group>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
         <div class="title">基本信息</div>
         <el-row>
diff --git a/anrui-base/anrui-base-ui/src/views/workFlow/jingxiaoshangFlow/jingxiaoshangYiBan.vue b/anrui-base/anrui-base-ui/src/views/workFlow/jingxiaoshangFlow/jingxiaoshangYiBan.vue
index 06aa4d73ec..e082321a3e 100644
--- a/anrui-base/anrui-base-ui/src/views/workFlow/jingxiaoshangFlow/jingxiaoshangYiBan.vue
+++ b/anrui-base/anrui-base-ui/src/views/workFlow/jingxiaoshangFlow/jingxiaoshangYiBan.vue
@@ -39,18 +39,18 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8">
-              <div class="span-sty">有效期至</div>
-              <el-form-item><span class="addinputInfo">{{ temp.effectiveDate }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
+<!--            <el-col :span="8">-->
+<!--              <div class="span-sty">有效期至</div>-->
+<!--              <el-form-item><span class="addinputInfo">{{ temp.effectiveDate }}</span></el-form-item>-->
+<!--            </el-col>-->
+            <el-col :span="24">
               <div class="span-sty">备注</div>
               <el-form-item><span class="addinputInfo">{{ temp.remarks }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
-              <div class="span-sty">是否同意</div>
-              <el-form-item><span class="addinputInfo">{{ temp.agree == '1' ? '是' : temp.agree == '0' ? '否' : '' }}</span></el-form-item>
-            </el-col>
+<!--            <el-col :span="8">-->
+<!--              <div class="span-sty">是否同意</div>-->
+<!--              <el-form-item><span class="addinputInfo">{{ temp.agree == '1' ? '是' : temp.agree == '0' ? '否' : '' }}</span></el-form-item>-->
+<!--            </el-col>-->
           </el-row>
           <div class="title">基本信息</div>
           <el-row>

From 4f95893a0400a0e2acf02e5b46f49d5738a9a43f Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 23 Oct 2023 14:07:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E5=BC=80=E7=A5=A8=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kaipiaoguanli/qiyekaipiaoxinxi/kaipiaoxinxiguanli.vue    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kaipiaoguanli/qiyekaipiaoxinxi/kaipiaoxinxiguanli.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kaipiaoguanli/qiyekaipiaoxinxi/kaipiaoxinxiguanli.vue
index fd3c8c377a..2f553112fc 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/kaipiaoguanli/qiyekaipiaoxinxi/kaipiaoxinxiguanli.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kaipiaoguanli/qiyekaipiaoxinxi/kaipiaoxinxiguanli.vue
@@ -34,6 +34,11 @@
                 <span>{{ scope.row.useOrgName }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="开票类型" align="center" width="140">
+              <template slot-scope="scope">
+                <span>{{ scope.row.invoiceType }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="开票名称" align="center" width="140">
               <template slot-scope="scope">
                 <span>{{ scope.row.name }}</span>