From 929e1930ff7aab3d9a2aa6a1e580b98808047719 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 23 Feb 2023 17:44:01 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E8=AE=B0=E5=BD=95--=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=AF=84=E8=AE=BA=E8=AE=B0=E5=BD=95=E7=9A=84=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 anrui-system-ui/src/api/workflow/finished.js  |  6 +-
 .../src/components/flow/flowRecord.vue        | 63 +++++++++++--------
 anrui-system-ui/src/views/flow/doneList.vue   |  2 +-
 anrui-system-ui/src/views/flow/todoList.vue   |  2 +-
 4 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/anrui-system-ui/src/api/workflow/finished.js b/anrui-system-ui/src/api/workflow/finished.js
index d6d23d7d6c..5cb3fddd04 100644
--- a/anrui-system-ui/src/api/workflow/finished.js
+++ b/anrui-system-ui/src/api/workflow/finished.js
@@ -15,7 +15,7 @@ export function finishedList(query) {
 // 任务流转记录
 export function flowRecord(query) {
   return request({
-    url: '/portal/v1/flow/task/flowRecord/' + query.procInsId + "/" + query.deployId,
+    url: '/portal/v1/flow/task/flowRecordAndComment/' + query.procInsId + '/' + query.deployId,
     method: 'get',
     params: query
   })
@@ -23,7 +23,7 @@ export function flowRecord(query) {
 
 // 撤回任务
 export function revokeProcess(data) {
-  const userSid = data.userSid;
+  const userSid = data.userSid
   return request({
     url: '/portal/v1/flow/task/revokeProcess/' + userSid,
     method: 'post',
@@ -39,7 +39,7 @@ export function revokeProcess(data) {
 export function deployStart(deployId) {
   return request({
     url: '/flowable/process/startFlow/' + deployId,
-    method: 'get',
+    method: 'get'
   })
 }
 
diff --git a/anrui-system-ui/src/components/flow/flowRecord.vue b/anrui-system-ui/src/components/flow/flowRecord.vue
index bdd0745aa3..02a8378e59 100644
--- a/anrui-system-ui/src/components/flow/flowRecord.vue
+++ b/anrui-system-ui/src/components/flow/flowRecord.vue
@@ -10,35 +10,48 @@
           </div>
           <div style="width:50%;;float:left;border-left: 1px solid blue">
             <el-timeline>
-              <el-timeline-item v-for="(item,index ) in flowRecordList" :key="index" :icon="setIcon(item.finishTime)" :color="setColor(item.finishTime)">
-                <p style="font-weight: 700">{{ item.taskName }}</p>
-                <el-card :body-style="{ padding: '10px' }">
-                  <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: flex-start">
+              <el-timeline-item v-for="(item,index ) in flowRecordList" :key="index" :icon="setIcon(item.time)" :color="setColor(item.time)">
+                <div v-if="item.flowableRecordVo !== null">
+                  <p style="font-weight: 700">{{ item.flowableRecordVo.taskName }}</p>
+                  <el-card :body-style="{ padding: '10px' }">
+                    <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: flex-start">
+                      <div>
+                        <label v-if="item.flowableRecordVo.taskUserInfos" style="font-weight: normal;margin-right: 30px;">实际办理：
+                          <span v-for="(items, index ) in item.flowableRecordVo.taskUserInfos" :key="index">{{ items.assigneeName }},</span>
+                          <!-- <el-tag type="info" size="mini">{{item.deptName}}</el-tag>-->
+                        </label>
+                        <label v-if="item.flowableRecordVo.candidate" style="font-weight: normal;margin-right: 30px;">候选办理：{{ item.flowableRecordVo.candidate }}</label><br>
+                        <label style="font-weight: normal">接收时间： </label><label style="color:#8a909c;font-weight: normal">{{ item.flowableRecordVo.createTime }}</label><br>
+                        <label v-if="item.flowableRecordVo.finishTime" style="font-weight: normal">办理时间： </label>
+                        <label style="color:#8a909c;font-weight: normal">{{ item.flowableRecordVo.finishTime }}</label><br>
+                      </div>
+                      <div>
+                        <label v-if="item.duration" style="font-weight: normal">耗时：</label>
+                        <label style="color:red;font-weight: normal">{{ item.duration }}</label>
+                      </div>
+                    </div>
                     <div>
-                      <label v-if="item.taskUserInfos" style="font-weight: normal;margin-right: 30px;">实际办理：
-                        <span v-for="(items, index ) in item.taskUserInfos" :key="index">{{ items.assigneeName }},</span>
-                        <!-- <el-tag type="info" size="mini">{{item.deptName}}</el-tag>-->
-                      </label>
-                      <label v-if="item.candidate" style="font-weight: normal;margin-right: 30px;">候选办理：{{ item.candidate }}</label><br>
-                      <label style="font-weight: normal">接收时间： </label><label style="color:#8a909c;font-weight: normal">{{ item.createTime }}</label><br>
-                      <label v-if="item.finishTime" style="font-weight: normal">办理时间： </label>
-                      <label style="color:#8a909c;font-weight: normal">{{ item.finishTime }}</label><br>
+                      <p v-if="item.comment">
+                        <el-tag type="success" v-if="item.comment.type === '1'"> {{ item.comment.comment }}</el-tag>
+                        <el-tag type="warning" v-if="item.comment.type === '2'"> {{ item.comment.comment }}</el-tag>
+                        <el-tag type="danger" v-if="item.comment.type === '3'"> {{ item.comment.comment }}</el-tag>
+                        <el-tag type="danger" v-if="item.comment.type === '7'"> {{ item.comment.comment }}</el-tag>
+                        <el-tag type="danger" v-if="item.comment.type === '6'"> {{ item.comment.comment }}</el-tag>
+                      </p>
                     </div>
+                  </el-card>
+                </div>
+                <div v-else>
+                  <p style="font-weight: 700">{{ item.processCommentVo.title }}</p>
+                  <el-card :body-style="{ padding: '10px' }">
                     <div>
-                      <label v-if="item.duration" style="font-weight: normal">耗时：</label>
-                      <label style="color:red;font-weight: normal">{{ item.duration }}</label>
+                      <div>
+                        <label style="font-weight: normal">评论时间： </label><label style="color:#8a909c;font-weight: normal">{{ item.processCommentVo.time }}</label><br>
+                        <label style="font-weight: normal">评论内容： </label><label style="color:#8a909c;font-weight: normal">{{ item.processCommentVo.content }}</label>
+                      </div>
                     </div>
-                  </div>
-                  <div>
-                    <p v-if="item.comment">
-                      <el-tag type="success" v-if="item.comment.type === '1'"> {{ item.comment.comment }}</el-tag>
-                      <el-tag type="warning" v-if="item.comment.type === '2'"> {{ item.comment.comment }}</el-tag>
-                      <el-tag type="danger" v-if="item.comment.type === '3'"> {{ item.comment.comment }}</el-tag>
-                      <el-tag type="danger" v-if="item.comment.type === '7'"> {{ item.comment.comment }}</el-tag>
-                      <el-tag type="danger" v-if="item.comment.type === '6'"> {{ item.comment.comment }}</el-tag>
-                    </p>
-                  </div>
-                </el-card>
+                  </el-card>
+                </div>
               </el-timeline-item>
             </el-timeline>
           </div>
diff --git a/anrui-system-ui/src/views/flow/doneList.vue b/anrui-system-ui/src/views/flow/doneList.vue
index af632b69c9..947edc1b01 100644
--- a/anrui-system-ui/src/views/flow/doneList.vue
+++ b/anrui-system-ui/src/views/flow/doneList.vue
@@ -345,7 +345,7 @@ import flowRecords from '@/components/flow/flowRecord'
         var token = getStorage()
         const params = { procInsId: procInsId, deployId: deployId, token: token }
         flowRecord(params).then(res => {
-          this.flowRecordList = res.data.flowList
+          this.flowRecordList = res.data
           // 流程过程中不存在初始化表单 直接读取的流程变量中存储的表单值
           if (res.data.formData) {
             this.formConf = res.data.formData
diff --git a/anrui-system-ui/src/views/flow/todoList.vue b/anrui-system-ui/src/views/flow/todoList.vue
index 7e6062a24d..a5399d0dc0 100644
--- a/anrui-system-ui/src/views/flow/todoList.vue
+++ b/anrui-system-ui/src/views/flow/todoList.vue
@@ -430,7 +430,7 @@ export default {
         var token = getStorage()
         const params = {procInsId: procInsId, deployId: deployId,token: token }
         flowRecord(params).then(res => {
-          this.flowRecordList = res.data.flowList
+          this.flowRecordList = res.data
           // 流程过程中不存在初始化表单 直接读取的流程变量中存储的表单值
           if (res.data.formData) {
             this.formConf = res.data.formData

From 92fd48c6ec2bceda80aa08e86d306d7b730ee05f Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 23 Feb 2023 17:44:51 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E7=9B=98=E5=BA=93=E6=8A=A5=E5=91=8A--?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui-scm-ui/src/api/kucunguanli/panku.js | 10 ++++
 .../panku/pankubaogao/pankubaogaoguanli.vue   | 52 ++++++++++++++++++-
 2 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/anrui-scm/anrui-scm-ui/src/api/kucunguanli/panku.js b/anrui-scm/anrui-scm-ui/src/api/kucunguanli/panku.js
index 568c9d4855..d31159051b 100644
--- a/anrui-scm/anrui-scm-ui/src/api/kucunguanli/panku.js
+++ b/anrui-scm/anrui-scm-ui/src/api/kucunguanli/panku.js
@@ -59,5 +59,15 @@ export default {
       data: data,
       headers: { 'Content-Type': 'application/json' }
     })
+  },
+  // 导出
+  exportExcel: function(data) {
+    return request({
+      url: '/scm/v1/scmvehinventorymonth/exportExcel',
+      method: 'post',
+      responseType: 'blob', // 表明返回服务器返回的数据类型
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
   }
 }
diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankubaogao/pankubaogaoguanli.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankubaogao/pankubaogaoguanli.vue
index ca84c419eb..8616aeb2e1 100644
--- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankubaogao/pankubaogaoguanli.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankubaogao/pankubaogaoguanli.vue
@@ -28,7 +28,8 @@
           <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
         </div>
         <div class="">
-          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
+            <el-table-column width="50" fixed type="selection" align="center"/>
             <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
             <el-table-column fixed width="200" label="操作" align="center">
               <template slot-scope="scope">
@@ -116,6 +117,13 @@ export default {
     return {
       btndisabled: false,
       btnList: [
+        {
+          type: 'success',
+          size: 'small',
+          icon: 'export',
+          btnKey: 'doExport',
+          btnLabel: '导出'
+        },
         {
           type: 'info',
           size: 'small',
@@ -130,6 +138,7 @@ export default {
       // 查询条件 -----------
       tableKey: 0,
       list: [],
+      sids: [],
       FormLoading: false,
       listLoading: false,
       listQuery: {
@@ -174,6 +183,9 @@ export default {
     btnHandle(btnKey) {
       console.log('XXXXXXXXXXXXXXX    ' + btnKey)
       switch (btnKey) {
+        case 'doExport':
+          this.doExport()
+          break
         case 'doClose':
           this.doClose()
           break
@@ -187,6 +199,13 @@ export default {
       var pageindex = index + 1 + pagestart
       return pageindex
     },
+    handleSelectionChange(row) {
+      const aa = []
+      row.forEach((element) => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+    },
     // 查询列表信息
     getList() {
       this.listLoading = true
@@ -232,6 +251,37 @@ export default {
     resetState() {
       this.viewState = 1
     },
+    // 导出
+    doExport() {
+      if (this.sids.length > 0) {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        req.exportExcel(this.sids).then((resp) => {
+          loading.close()
+          const blob = new Blob([resp], {
+            type: 'application/vnd.ms-excel'
+          })
+          const fileName = '盘库报告表' + '.xls'
+          const elink = document.createElement('a')
+          elink.download = fileName
+          elink.style.display = 'nonde'
+          elink.href = URL.createObjectURL(blob)
+          document.body.appendChild(elink)
+          elink.click()
+          URL.revokeObjectURL(elink.href)
+          document.body.removeChild(elink)
+        }).catch(() => {
+          loading.close()
+        })
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '请至少选择一条记录进行导出操作' })
+        return
+      }
+    },
     doClose() {
       this.$emit('doback')
     }

From ba1ba42b2bd4ed76c197b6c63f50b5ca431a5b52 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 24 Feb 2023 17:30:46 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BB=A3=E6=94=B6?=
 =?UTF-8?q?=E6=AC=BE=E7=94=B3=E8=AF=B7=E3=80=81=E6=94=B6=E6=AC=BE=E6=AC=BE?=
 =?UTF-8?q?=E9=A1=B9=E7=A1=AE=E8=AE=A4=E3=80=81=E5=87=BA=E7=BA=B3=E6=AC=BE?=
 =?UTF-8?q?=E9=A1=B9=E7=A1=AE=E8=AE=A4--=E5=88=97=E8=A1=A8=E4=B8=AD?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8B=E8=BD=BD=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/anruifinmanagement/agencyfund/agencyfund.vue | 5 +++++
 .../paymentConfirmation/acknowledgementReceipt.vue         | 7 ++++++-
 .../paymentConfirmation/cashierConfirmation.vue            | 5 +++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfund.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfund.vue
index 7640896916..619455d66c 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfund.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfund.vue
@@ -49,6 +49,11 @@
                   <span>{{ scope.row.auditState == 1 ? '待审核' : scope.row.auditState == 2 ? '已驳回' : scope.row.auditState ==3 ? '已审核' : '其他' }}</span>
                 </template>
               </el-table-column>
+              <el-table-column label="下载次数" align="center" width="90">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.downNum }}</span>
+                </template>
+              </el-table-column>
               <el-table-column label="申请部门" align="center" width="90">
                 <template slot-scope="scope">
                   <span>{{ scope.row.createDept }}</span>
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue
index 4193d784f4..c8da7a4372 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue
@@ -49,6 +49,11 @@
                   <span>{{ scope.row.auditState == 1 ? '待审核' : scope.row.auditState == 2 ? '已驳回' : scope.row.auditState ==3 ? '已审核' : '其他' }}</span>
                 </template>
               </el-table-column>
+              <el-table-column label="下载次数" align="center" width="90">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.downNum }}</span>
+                </template>
+              </el-table-column>
               <el-table-column label="申请部门" align="center" width="90">
                 <template slot-scope="scope">
                   <span>{{ scope.row.createDept }}</span>
@@ -150,7 +155,7 @@
 </template>
 
 <script>
-import {createPdf, listPage} from '@/api/anruifinmanagement/paymentConfirmation.js'
+import { createPdf, listPage } from '@/api/anruifinmanagement/paymentConfirmation.js'
 import Pagination from '@/components/pagination'
 import ButtonBar from '@/components/ButtonBar'
 import pageye from '@/components/pagination/pageye'
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue
index 7473f4e77b..2b585d453b 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue
@@ -63,6 +63,11 @@
                   <span>{{ scope.row.subscriptionState == 1 ? '未认款' : scope.row.subscriptionState == 2 ? '部分认款' : scope.row.subscriptionState == 3 ? '已认款' : '其他' }}</span>
                 </template>
               </el-table-column>
+              <el-table-column label="下载次数" align="center" width="90">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.downNum }}</span>
+                </template>
+              </el-table-column>
               <el-table-column label="收款单号" align="center" width="100">
                 <template slot-scope="scope">
                   <span>{{ scope.row.billNo }}</span>

From 50032f38e156d9f72c4ec81965b2fce4ffbe2bcb Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 24 Feb 2023 17:33:43 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E5=8F=B0=E8=B4=A6--=E5=88=97=E8=A1=A8=E4=B8=AD=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cheliangxiaoshou/cheliangxiaoshouguanli.vue       | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue
index 111d14d7d9..1e08b02113 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue
@@ -95,6 +95,11 @@
                 <span>{{ scope.row.type }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="采购类型" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.manPurOrderTypeValue }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="销售日期" align="center" width="100">
               <template slot-scope="scope">
                 <span>{{ scope.row.saleDate }}</span>
@@ -185,12 +190,6 @@
                 <span>{{ scope.row.innerName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="采购类型" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.manPurOrderTypeValue }}</span>
-              </template>
-            </el-table-column>
-
           </el-table>
         </div>
         <div class="pages">

From 136a159a965bd3febe4c3e8e09cb4fc19ec9160d Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 24 Feb 2023 17:35:56 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=A5=E5=BA=93--?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
index 01a5f52f31..37e13dad31 100644
--- a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
@@ -34,7 +34,7 @@
           <el-row>
             <el-col :span="12">
               <div class="span-sty spanOneWidth"><span>采购订单编号</span></div>
-              <el-form-item><el-input v-model="formobj.purchaseOrderNo" placeholder="" clearable class="addinputw addinputwOne"/></el-form-item>
+              <el-form-item><el-input v-model="formobj.purchaseOrderNo" placeholder="" clearable class="addinputw addinputwOne" style="width: 75% !important;"/></el-form-item>
             </el-col>
             <el-col :span="12">
               <div class="span-sty spanOneWidth"><span>内部编码</span></div>

From 1bf329b399303a258625dc7ce7301f97ed3c242d Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Sat, 25 Feb 2023 10:07:11 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinCollectionConfirmationService.java                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
index 87130949b9..dfa4dccc9e 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
@@ -359,7 +359,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             BeanUtil.copyProperties(dto, finCollectionConfirmation, "sid");
             if(StringUtils.isBlank(finCollectionConfirmation.getStaffUserSid())){
                 finCollectionConfirmation.setStaffName(finCollectionConfirmation.getCreateByName());
-                finCollectionConfirmation.setStaffUserSid(finCollectionConfirmation.getCreateBySid());
+                finCollectionConfirmation.setStaffUserSid(dto.getUserSid());
                 finCollectionConfirmation.setStaffDeptName(finCollectionConfirmation.getCreateDept());
                 finCollectionConfirmation.setStaffDeptSid(finCollectionConfirmation.getCreateDeptSid());
             }

From 4ff5e44aec58b1ba267e71ebb7efdb5ced7b5a60 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Sat, 25 Feb 2023 10:24:46 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=AD=97=E6=A0=B7=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E8=AF=81=E4=BB=B6=E5=8F=B7=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl  | 2 +-
 .../src/main/resources/ftl/existingvehicles_black.ftl           | 2 +-
 anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl  | 2 +-
 .../anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl   | 2 +-
 anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl
index 5e9b3fc462..47d0a9057a 100644
--- a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl
+++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl
@@ -812,7 +812,7 @@
                         <w:sz w:val="20"/>
                         <w:sz-cs w:val="20"/>
                     </w:rPr>
-                    <w:t>身份证号码：</w:t>
+                    <w:t>证件号码：</w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl
index 6b98277ed7..69a2e05ecf 100644
--- a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl
+++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl
@@ -812,7 +812,7 @@
                         <w:sz w:val="20"/>
                         <w:sz-cs w:val="20"/>
                     </w:rPr>
-                    <w:t>身份证号码：</w:t>
+                    <w:t>证件号码：</w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl
index 492ce74020..28fcb513a8 100644
--- a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl
+++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl
@@ -928,7 +928,7 @@
                         <w:sz w:val="20"/>
                         <w:sz-cs w:val="20"/>
                     </w:rPr>
-                    <w:t>身份证号码：</w:t>
+                    <w:t>证件号码：</w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl
index ea325ea12e..3fbdf7c7a9 100644
--- a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl
+++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl
@@ -928,7 +928,7 @@
                         <w:sz w:val="20"/>
                         <w:sz-cs w:val="20"/>
                     </w:rPr>
-                    <w:t>身份证号码：</w:t>
+                    <w:t>证件号码：</w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl
index 98d1791092..9c74df0d71 100644
--- a/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl
+++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl
@@ -996,7 +996,7 @@
                         <w:sz w:val="28"/>
                         <w:sz-cs w:val="28"/>
                     </w:rPr>
-                    <w:t>身份证号码：</w:t>
+                    <w:t>证件号码：</w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>

From 40ecbd9d062edf8e804803f1051d0e7edfc12d92 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Sat, 25 Feb 2023 10:47:03 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E6=97=B6=E4=BC=81=E4=B8=9A=E7=9A=84=E4=B8=8D=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E8=AF=81=E4=BB=B6=E5=8F=B7=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/biz/commoncontract/CommonContractService.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
index 5e0fef2799..9da257a02a 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
@@ -1600,10 +1600,12 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             return rb.setMsg(crmResultBean.getMsg());
         }
         CrmCustomerTempVo crmCustomerTempVo = crmResultBean.getData();
-        //身份证号
         String idNo = crmCustomerTempVo.getIDNumber();
-        if (StringUtils.isBlank(idNo)) {
-            return rb.setMessage(sid).setMsg("请先在客户洽谈的基础信息中补全客户的身份证号").setCode("515");
+        //身份证号
+        if("1".equals(crmCustomerTempVo.getCustomerTypeKey())){
+            if (StringUtils.isBlank(idNo)) {
+                return rb.setMessage(sid).setMsg("请先在客户洽谈的基础信息中补全客户的身份证号").setCode("515");
+            }
         }
         //查询销售订单的车型信息
         AppOrderModelInfoVo appOrderModelInfoVo = appOrderDetailsVo.getModelInfo();

From 5959570926f6583268b94969f913bb50a2f0a45a Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Sat, 25 Feb 2023 11:18:07 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=B5=81=E7=A8=8Bid?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui/flowable/api/utils/ProcDefEnum.java | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
index 44203a4e1d..83a271b82e 100644
--- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
+++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
@@ -37,19 +37,33 @@ public enum ProcDefEnum {
     SCMSPECIALREBATECHEDISTRIBUTE("专项返利分配申请", "process_h3w1aval:1:615004"),
     SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:1:630004"),
     SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:1:630008"),
-    CONTRACTAPPLY("合同审核", "process_gd8c9xd5:1:545008"),
+    CONTRACTAPPLY("合同审核", "process_gd8c9xd5:2:932504"),
     BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),
 
 
     /******************************测试流程id*********************************************/
 
-    /*ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"),
+    /*  ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"),
     ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"),
     ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
+    SALESPOLICY("销售政策审批流程", "process_biw9gfh7:3:917504"),
+    FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"),
+    BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
+    ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),
+    VEHICLEAPPLY("排产申请流程", "process_9egcg169:12:735004"),
+    SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:725008"),
+    BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"),
+    FINCOSTAPPLY("费用申请", "process_u0pahv0s:6:725016"),
+    FINPAYAPPLY("付款申请", "process_gin2tntb:4:725020"),
     RECORDAPPLICATION("入库申请", "process_xbwq2c7p:3:675024"),
+    SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:722508"),
     SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"),
-    SALESORDER("销售订单审批流程", "process_p5ils2rn:7:1123496"),
-    BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:2:357504"),
+    SALESORDER("销售订单审批流程", "process_p5ils2rn:7:827504"),
+    BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:722504"),
+    BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:722512"),
+    BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:722516"),
+    BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:2:722520"),
+    BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:3:770004"),
     BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"),
     BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"),
     SCMVEHREBATEWITHAPPLY("单车返利预提申请", "process_qegarc7r:1:535004"),
@@ -60,21 +74,7 @@ public enum ProcDefEnum {
     SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:1:630004"),
     SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:1:630008"),
     CONTRACTAPPLY("合同审核", "process_gd8c9xd5:1:545008"),
-    SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:860004"), //TODO:测试
-    BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:9:852504"),//ToDo:测试
-    VEHICLEAPPLY("排产申请流程", "process_9egcg169:12:910004"),//TODO:测试
-    FINCOSTAPPLY("费用申请","process_u0pahv0s:6:902504"),//ToDo:测试
-    FINPAYAPPLY("付款申请","process_gin2tntb:4:902508"),//ToDo:测试
-    ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:2:862512"),//测试（新）2022、11、22
-    BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:4:862504"), //测试
-    FINBILLAPPLICATION("开票申请流程", "process_sndce6s9:2:937504"),//测试（新）2022、11、22
-    BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:867504"),//测试外采流程定义id
-    BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:867520"),//测试车型调价流程定义id
-    BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:4:892504"),//测试调车流程定义id
-    BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:2:867516"), //测试调账流程定义id
-    SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:867508"),//测试采购退库流程定义id
-    SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:867524"),//测试销售政策流程定义id
-    BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),//测试优惠包申请流程定义id*/
+    BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),*/
     ;
 
     ProcDefEnum(String proDefName, String proDefId) {