From 09832fcba58d4f22348c7bad184f21086060747b Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 10 Aug 2022 13:46:59 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=8E=92=E4=BA=A7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=92=8C=E6=B5=81=E7=A8=8B=E4=B8=AD=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=87=87=E8=B4=AD=E7=B1=BB=E5=9E=8B=E3=80=81=E6=8E=92?=
 =?UTF-8?q?=E4=BA=A7=E7=B1=BB=E5=9E=8B=E6=94=B9=E4=B8=BA=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E5=8E=9F=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cheliangpaichan/cheliangpaichan.vue       | 36 +++++++++++++++---
 .../cheliangpaichan/cheliangpaichanAdd.vue    | 37 +++++++++++++++++--
 .../cheliangpaichan/cheliangpaichanInfo.vue   |  9 ++++-
 .../cheliangpaichanDaiBanInfo.vue             |  9 ++++-
 .../paichanguanli/cheliangpaichanEdit.vue     | 35 ++++++++++++++++--
 .../cheliangpaichanYiBanInfo.vue              |  9 ++++-
 6 files changed, 116 insertions(+), 19 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichan.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichan.vue
index 05432b88c8..2ab0b63a94 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichan.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichan.vue
@@ -13,8 +13,15 @@
                 <div class="line">至</div>
                 <el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.params.applicationDateEnd" clearable style="width: 160px;" type="date" placeholder="结束日期"/>
               </el-form-item>
-              <el-form-item label="车型">
-                <el-input v-model="queryParams.params.modelName" placeholder="请输入车型" clearable/>
+              <el-form-item label="采购类型">
+                <el-select v-model="queryParams.params.applyTypeKey" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in applyType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="采购原因">
+                <el-select v-model="queryParams.params.schedulingTypeKey" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in schedulingType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+                </el-select>
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -44,7 +51,7 @@
                 <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
               </template>
             </el-table-column>
-            <el-table-column width="150" prop="schedulingType" label="排产类型" align="center"/>
+            <el-table-column width="150" prop="schedulingType" label="采购原因" align="center"/>
             <el-table-column width="200" prop="applicationCode" label="申请编号" align="center"/>
             <el-table-column width="150" prop="applicationDate" label="申请日期" align="center"/>
             <el-table-column width="150" prop="createOrgName" label="分公司" align="center"/>
@@ -127,6 +134,8 @@ export default {
       // sid数组
       sids: [], // 用于导出的时候保存已选择SID
       sides: '', // 一条数据的sid
+      schedulingType_list: [],
+      applyType_list: [],
       queryParams: {
         current: 1,
         size: 10,
@@ -134,7 +143,8 @@ export default {
         params: {
           applicationDateStart: '',
           applicationDateEnd: '',
-          modelName: '', // 车型
+          applyTypeKey: '',
+          schedulingTypeKey: '',
           userSid: ''
         }
       },
@@ -142,6 +152,7 @@ export default {
     }
   },
   created() {
+    this.init()
     this.loadList()
   },
   mounted() {
@@ -179,6 +190,20 @@ export default {
       }
       this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
     },
+    init() {
+      req.pullDown({ type: 'schedulingType' }).then((res) => {
+        if (res.success) {
+          this.schedulingType_list = res.data
+          console.log('下拉框请求111', res.data)
+        }
+      })
+      req.pullDown({ type: 'applyType' }).then((res) => {
+        if (res.success) {
+          this.applyType_list = res.data
+          console.log('下拉框请求111', res.data)
+        }
+      })
+    },
     btnHandle(btnKey) {
       console.log('XXXXXXXXXXXXXXX' + btnKey)
       switch (btnKey) {
@@ -234,7 +259,8 @@ export default {
           params: {
           applicationDateStart: '',
             applicationDateEnd: '',
-            modelName: '', // 车型
+            applyTypeKey: '',
+            schedulingTypeKey: '',
             userSid: ''
         }
       }
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
index 9d1fe7011b..cb8f294888 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
@@ -34,8 +34,16 @@
             </el-col>
           </el-row>
           <el-row class="rowStyle">
-            <el-col :span="24" class="colStyle">
-              <div class="span-sty spanOneWidth"><span>排产类型:</span></div>
+            <el-col :span="8" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>采购类型:</span></div>
+              <el-form-item>
+                <el-select v-model="formobj.applyType" placeholder="请选择" @change="changeApplyType" clearable class="addinputInfo addinputOne">
+                  <el-option v-for="item in applyType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="16" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>采购原因:</span></div>
               <el-form-item>
                 <el-select v-model="formobj.schedulingType" placeholder="请选择" @change="changeSchedulingType" clearable class="addinputInfo addinputOne">
                   <el-option v-for="item in schedulingType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
@@ -150,6 +158,7 @@ export default {
       tableKey: 0,
       // 下拉框
       schedulingType_list: [], // 排产订金使用
+      applyType_list: [],
       isRead: false,
       // 表单数据
       formobj: {
@@ -159,7 +168,9 @@ export default {
         createByName: '', // 制单人
         applicationCode: '', // 申请编号
         applicationDate: '', // 申请日期
-        schedulingType: '', // 排产类型
+        applyType: '', // 采购类型
+        applyTypeKey: '',
+        schedulingType: '', // 采购原因
         schedulingTypeKey: '',
         remarks: '', // 备注
         currentAmount: '', // 当前订金金额
@@ -179,7 +190,11 @@ export default {
       req.pullDown({ type: 'schedulingType' }).then((res) => {
         if (res.success) {
           this.schedulingType_list = res.data
-          console.log('下拉框请求111', res.data)
+        }
+      })
+      req.pullDown({ type: 'applyType' }).then((res) => {
+        if (res.success) {
+          this.applyType_list = res.data
         }
       })
     },
@@ -285,6 +300,18 @@ export default {
         })
       }
     },
+    changeApplyType(value) {
+      let bb = null
+      this.applyType_list.forEach((e) => {
+        if (e.dictValue === value) {
+          bb = {
+            key: e.dictKey,
+            value: e.dictValue
+          }
+        }
+      })
+      this.formobj.applyTypeKey = bb.key
+    },
     changeSchedulingType(value) {
       let bb = null
       this.schedulingType_list.forEach((e) => {
@@ -408,6 +435,8 @@ export default {
     // 返回（===既判断）
     handleReturn(isreload) {
       if (isreload === 'true') this.$emit('reloadlist')
+      this.formobj.applyType = ''
+      this.formobj.applyTypeKey = ''
       this.formobj.schedulingType = '' // 排产类型
       this.formobj.schedulingTypeKey = ''
       this.formobj.remarks = '' // 备注
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue
index f3be1e0de8..2d519f47f9 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue
@@ -30,8 +30,13 @@
             </el-col>
           </el-row>
           <el-row class="rowStyle">
-            <el-col :span="24" class="colStyle">
-              <div class="span-sty spanOneWidth"><span>排产类型:</span></div>
+            <el-col :span="8" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>采购类型:</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.applyType }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="16" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>采购原因:</span></div>
               <el-form-item><span class="addinputInfo addinputOne">{{ formobj.schedulingType }}</span>
               </el-form-item>
             </el-col>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue
index d8509f37ce..ac5000e597 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue
@@ -32,8 +32,13 @@
             </el-col>
           </el-row>
           <el-row class="rowStyle">
-            <el-col :span="24" class="colStyle">
-              <div class="span-sty spanOneWidth"><span>排产类型:</span></div>
+            <el-col :span="8" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>采购类型:</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.applyType }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="16" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>采购原因:</span></div>
               <el-form-item><span class="addinputInfo addinputOne">{{ formobj.schedulingType }}</span>
               </el-form-item>
             </el-col>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
index e86fc47c94..960201d296 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
@@ -33,8 +33,16 @@
             </el-col>
           </el-row>
           <el-row class="rowStyle">
-            <el-col :span="24" class="colStyle">
-              <div class="span-sty spanOneWidth"><span>排产类型:</span></div>
+            <el-col :span="8" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>采购类型:</span></div>
+              <el-form-item>
+                <el-select v-model="formobj.applyType" placeholder="请选择" @change="changeApplyType" clearable class="addinputInfo addinputOne">
+                  <el-option v-for="item in applyType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="16" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>采购原因:</span></div>
               <el-form-item>
                 <el-select v-model="formobj.schedulingType" placeholder="请选择" @change="changeSchedulingType" clearable class="addinputInfo addinputOne">
                   <el-option v-for="item in schedulingType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
@@ -148,6 +156,7 @@ export default {
       tableKey: 0,
       // 下拉框
       schedulingType_list: [], // 排产订金使用
+      applyType_list: [],
       isRead: false,
       // 表单数据
       formobj: {
@@ -157,7 +166,9 @@ export default {
         createByName: '', // 制单人
         applicationCode: '', // 申请编号
         applicationDate: '', // 申请日期
-        schedulingType: '', // 排产类型
+        applyType: '', // 采购类型
+        applyTypeKey: '',
+        schedulingType: '', // 采购原因
         schedulingTypeKey: '',
         remarks: '', // 备注
         currentAmount: '', // 当前订金金额
@@ -196,7 +207,11 @@ export default {
       req.pullDown({ type: 'schedulingType' }).then((res) => {
         if (res.success) {
           this.schedulingType_list = res.data
-          console.log('下拉框请求111', res.data)
+        }
+      })
+      req.pullDown({ type: 'applyType' }).then((res) => {
+        if (res.success) {
+          this.applyType_list = res.data
         }
       })
     },
@@ -263,6 +278,18 @@ export default {
         })
       }
     },
+    changeApplyType(value) {
+      let bb = null
+      this.applyType_list.forEach((e) => {
+        if (e.dictValue === value) {
+          bb = {
+            key: e.dictKey,
+            value: e.dictValue
+          }
+        }
+      })
+      this.formobj.applyTypeKey = bb.key
+    },
     changeSchedulingType(value) {
       let bb = null
       this.schedulingType_list.forEach((e) => {
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue
index 5be6cbfa4c..584327c768 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue
@@ -30,8 +30,13 @@
             </el-col>
           </el-row>
           <el-row class="rowStyle">
-            <el-col :span="24" class="colStyle">
-              <div class="span-sty spanOneWidth"><span>排产类型:</span></div>
+            <el-col :span="8" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>采购类型:</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.applyType }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="16" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>采购原因:</span></div>
               <el-form-item><span class="addinputInfo addinputOne">{{ formobj.schedulingType }}</span>
               </el-form-item>
             </el-col>

From 34d2bd2be53804e15042ddb8a2b75ac9e4a90b28 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 10 Aug 2022 13:49:04 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=8E=82=E5=AE=B6=E8=AE=A2=E9=87=91?=
 =?UTF-8?q?=E8=AE=A4=E6=AC=BE=E6=8E=92=E4=BA=A7=E7=94=B3=E8=AF=B7=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E6=94=B9=E4=B8=BA=E7=94=B3=E8=AF=B7=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=87=87=E8=B4=AD=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../changjiaxitong/manufacturers.vue          | 28 +++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue
index 71de0afe9e..5c721235d6 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue
@@ -8,7 +8,7 @@
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="110px" class="tab-header">
-              <el-form-item label="状态">
+              <el-form-item label="认款状态">
                 <el-select v-model="listQuery.params.state" placeholder="请选择" clearable class="addinputw">
                   <el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
@@ -18,7 +18,7 @@
                   <el-option v-for="item in paymentState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
-              <el-form-item label="认款时间">
+              <el-form-item label="认款日期">
                 <div class="block" style="float: left;">
                   <el-date-picker v-model="listQuery.params.subscriptionStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
                 </div>
@@ -27,9 +27,14 @@
                   <el-date-picker v-model="listQuery.params.subscriptionEndDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
                 </div>
               </el-form-item>
-              <el-form-item label="排产申请编号">
+              <el-form-item label="申请编号">
                 <el-input v-model="listQuery.params.proSchAppNo" placeholder="请输入排产申请编号" clearable/>
               </el-form-item>
+              <el-form-item label="采购类型">
+                <el-select v-model="listQuery.params.applyTypeKey" placeholder="请选择" clearable class="addinputw">
+                  <el-option v-for="item in applyType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
               <el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
@@ -54,11 +59,16 @@
                 <span>{{ scope.row.state == '0' ? '未认款' : '已认款' }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="排产申请编号" align="center" width="200px">
+            <el-table-column label="申请编号" align="center" width="200px">
               <template slot-scope="scope">
                 <span>{{ scope.row.proSchAppNo }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="采购类型" align="center" width="200px">
+              <template slot-scope="scope">
+                <span>{{ scope.row.applyType }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="申请订金金额" header-align="center" align="left" width="150px">
               <template slot-scope="scope">
                 <span>{{ scope.row.paymentMoney }}</span>
@@ -110,7 +120,7 @@
 
 <script>
 import req from '@/api/supplychain/manufacturers'
-import { getPathSidByUserSid } from '@/api/cheliang/dictcommons'
+import { getPathSidByUserSid, typeValues } from '@/api/cheliang/dictcommons'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
@@ -168,6 +178,7 @@ export default {
           dictValue: '无需打款'
         }
       ],
+      applyType_list: [],
       FormLoading: false,
       listLoading: false,
       listQuery: {
@@ -177,6 +188,7 @@ export default {
           subscriptionStartDate: '',
           subscriptionEndDate: '',
           proSchAppNo: '',
+          applyTypeKey: '',
           createOrgSid: ''
         },
         current: 1,
@@ -217,6 +229,11 @@ export default {
       }
     },
     init() {
+      typeValues({ type: 'applyType' }).then((resp) => {
+        if (resp.success) {
+          this.applyType_list = resp.data
+        }
+      })
       getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
         if (res.success) {
           this.listQuery.params.createOrgSid = res.data
@@ -263,6 +280,7 @@ export default {
           subscriptionStartDate: '',
           subscriptionEndDate: '',
           proSchAppNo: '',
+          applyTypeKey: '',
           createOrgSid: ''
         },
         current: 1,

From 7879d15f9ab91a56e744926f79fa7a58ddae4030 Mon Sep 17 00:00:00 2001
From: Zhao Qiqi <1287235164@qq.com>
Date: Wed, 10 Aug 2022 14:05:51 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BF=AB=E9=80=9F=E6=96=B0=E5=A2=9E=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/cheliang/chexing/chexing.vue    | 33 ++++++++++++++
 .../src/views/cheliang/chexing/chexingAdd.vue | 43 +++++++++++++++++--
 .../supplychain/yancheguanli/yancheguanli.vue | 11 +++++
 3 files changed, 83 insertions(+), 4 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue
index e990e2df88..693dbf6f7b 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue
@@ -222,6 +222,13 @@ export default {
     return {
       btndisabled: false,
       btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'plus',
+          btnKey: 'toQuickAdd',
+          btnLabel: '快速新增'
+        },
         {
           type: 'primary',
           size: 'small',
@@ -345,6 +352,9 @@ export default {
     btnHandle(btnKey) {
       console.log('XXXXXXXXXXXXXXX    ' + btnKey)
       switch (btnKey) {
+        case 'toQuickAdd':
+          this.toQuickAdd()
+          break
         case 'toAdd':
           this.toAdd()
           break
@@ -558,6 +568,29 @@ export default {
       this.sids = aa
       console.log('sids', this.sids)
     },
+    // 打开快速添加
+    toQuickAdd() {
+      if (this.sids.length === 1) {
+        this.viewState = 2
+        const sid = this.sids[0]
+        this.$refs['divadd'].showQuickAdd(sid)
+      } else if (this.sids.length > 1) {
+        this.$notify({
+          title: '提示',
+          message: '不能选中多个车型进行快速新增操作!',
+          type: 'info',
+          duration: 2000
+        })
+      } else {
+        this.$notify({
+          title: '提示',
+          message: '没有选择车型进行快速新增操作!',
+          type: 'error',
+          duration: 2000
+        })
+        return
+      }
+    },
     // 打开添加
     toAdd() {
       this.viewState = 2
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue
index a0541762bf..5d6557d444 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue
@@ -191,8 +191,7 @@ import {
   SaveList,
   selectByOrgSid
 } from '@/api/cheliang/basevehiclemodel'
-import {fetchBySid} from '@/api/cheliang/dictcommons'
-import { typeValues } from '@/api/cheliang/dictcommons'
+import { fetchBySid, typeValues } from '@/api/cheliang/dictcommons'
 import Upload from '@/components/uploadFile/uploadImg.vue'
 
 export default {
@@ -353,7 +352,41 @@ export default {
         this.setDetaList()
         this.getChang()
       },
-
+      showQuickAdd(sid) {
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+        this.dialogStatus = 'add'
+        this.stateId = 0
+        this.viewTitle = '【新增】常用配置信息'
+        // 此时数据必须修改才能保存
+        const userSid = window.sessionStorage.getItem('userSid')
+        getAll({ sid: sid, userSid: userSid }).then(resp => {
+          if (resp.success) {
+            const data = resp.data
+            this.temp = data
+            this.temp = JSON.parse(JSON.stringify(this.temp).replace(
+                /baseVehicleModelAppendixVos/g,
+                'baseVehicleModelAppendixDtos'
+              )
+            )
+            this.temp.sid = ''
+            if (this.temp.baseVehicleModelAppendixDtos.length > 0) {
+              for (var i = 0; i < this.temp.baseVehicleModelAppendixDtos.length; i++) {
+                var imgName = this.temp.baseVehicleModelAppendixDtos[i].filePath.split('/')
+                this.imgList.push({
+                  name: imgName[imgName.length - 1],
+                  url: this.temp.baseVehicleModelAppendixDtos[i].filePath
+                })
+              }
+              console.log('123123', this.imgList)
+            }
+          }
+        })
+        this.getPathSid()
+        this.setDetaList()
+        this.getChang()
+      },
       showEdit(sid, row) {
         console.log(sid)
         console.log('imgList', this.imgList)
@@ -426,13 +459,15 @@ export default {
       },
       getUrl() {
         console.log('已有图片', this.imgList)
+        var img_file = []
         for (var i = 0; i < this.imgList.length; i++) {
           console.log(this.temp)
-          this.temp.baseVehicleModelAppendixDtos.push({
+          img_file.push({
             modelSid: this.temp.sid,
             filePath: this.imgList[i].url
           })
         }
+        this.temp.baseVehicleModelAppendixDtos = img_file
       },
       updateUrl() {
         console.log('回显', this.imgList)
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue
index 6352d59481..02a6b66f85 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue
@@ -29,6 +29,13 @@
                 </el-select>
                 <!--    <el-input v-model="listQuery.params.warehouseContract" placeholder="请输入负责人" clearable/>-->
               </el-form-item>
+              <el-form-item label="验车日期">
+                <el-date-picker v-model="listQuery.params.inspectedStartDate" class="filter-item" type="date"
+                                format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="请选择"/>
+                <label>至</label>
+                <el-date-picker v-model="listQuery.params.inspectedEndDate" class="filter-item" type="date"
+                                format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="请选择"/>
+              </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
               <el-button type="primary" icon="el-icon-search" size="small" @click="getList">查询</el-button>
@@ -126,6 +133,8 @@ export default {
           vin: '',
           model: '',
           purchaseType: '',
+          inspectedStartDate:'',
+          inspectedEndDate:'',
           userSid: window.sessionStorage.getItem('userSid')
         }
       },
@@ -187,6 +196,8 @@ export default {
           vin: '',
           model: '',
           purchaseType: '',
+          inspectedStartDate:'',
+          inspectedEndDate:'',
           userSid: window.sessionStorage.getItem('userSid')
         }
       }

From 32cae028ab5c29049c417834cecc47db8e3e1dcb Mon Sep 17 00:00:00 2001
From: Zhao Qiqi <1287235164@qq.com>
Date: Wed, 10 Aug 2022 14:38:29 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=20=E5=B8=B8=E7=94=A8=E9=85=8D=E7=BD=AE=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E5=90=8E=E6=A1=A5=E9=80=9F=E6=AF=94=E6=8B=86?=
 =?UTF-8?q?=E5=88=86=E6=88=90=E5=90=8E=E6=A1=A5=E3=80=81=E9=80=9F=E6=AF=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/flow/orderSalesTodo.js            | 19 ++++++++++++++++++-
 .../api/salesManagement/orderManagement.js    |  4 ++--
 .../views/cheliang/chexing/chexinglook.vue    |  7 ++++++-
 .../chexing/relation/changyongpeizhi.vue      |  7 ++++++-
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/flow/orderSalesTodo.js b/anrui-buscenter/anrui-buscenter-ui/src/api/flow/orderSalesTodo.js
index 27e7428dcb..b2803ddb73 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/api/flow/orderSalesTodo.js
+++ b/anrui-buscenter/anrui-buscenter-ui/src/api/flow/orderSalesTodo.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 销售订单代办任务同意办理
+// 销售订单代办任务同意办理 (8.9修改后)
 export function businessAgree(params) {
   return request({
     url: "/buscenter/v1/bussalesorder/complete",
@@ -47,3 +47,20 @@ export function revokeTask(params) {
     }
   })
 }
+
+// 销售订单审批流程（同意）获取下一环节 (8.9修改后)
+export function getNextNodesForSubmit(params) {
+  return request({
+    url: '/buscenter/v1/bussalesorder/getNextNodesForSubmit',
+    method: 'get',
+    params: params
+  })
+}
+// 审批流程（驳回、终止）获取上一环节(8.9修改后)
+export function getPreviousNodesForReject(params) {
+  return request({
+    url: '/buscenter/v1/bussalesorder/getPreviousNodesForReject',
+    method: 'get',
+    params: params
+  })
+}
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js b/anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js
index 9befda46dd..39e656a779 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js
+++ b/anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js
@@ -36,7 +36,7 @@ export function saveOrderForm(data) {
   });
 }
 
-// 编辑、详情初始化 已改
+// 编辑、详情初始化 已改(8.9修改后)
 export function fetchDetailsBySid(params) {
   return request({
     url: "/buscenter/v1/bussalesorder/fetchDetailsBySid/" + params.sid,
@@ -44,7 +44,7 @@ export function fetchDetailsBySid(params) {
     params: params,
   });
 }
-// 销售订单提交接口
+// 销售订单提交接口 (8.9修改后)
 export function submitOrderForm(params) {
   return request({
     url: "/buscenter/v1/bussalesorder/submit",
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexinglook.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexinglook.vue
index 209bb61772..c5af5c683e 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexinglook.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexinglook.vue
@@ -165,7 +165,12 @@
                   <span>{{ props.row.specification }}</span>
                 </template>
               </el-table-column>
-              <el-table-column prop="netReceiptsNum" width="150" label="后桥速比" align="center">
+              <el-table-column prop="netReceiptsNum" width="150" label="后桥" align="center">
+                <template slot-scope="props">
+                  <span>{{ props.row.rearAxleValue }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="netReceiptsNum" width="150" label="速比" align="center">
                 <template slot-scope="props">
                   <span>{{ props.row.rearAxleRatio }}</span>
                 </template>
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue
index f5f2c92a92..ce20bd58c3 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue
@@ -166,7 +166,12 @@
                 <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
-            <el-table-column width="110px" label="后桥速比" align="center">
+            <el-table-column width="110px" label="后桥" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.rearAxleValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column width="110px" label="速比" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.rearAxleRatio }}</span>
               </template>

From 679d184fa34c2779dc877511d142616a5572a284 Mon Sep 17 00:00:00 2001
From: Zhao Qiqi <1287235164@qq.com>
Date: Wed, 10 Aug 2022 16:32:22 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=B8=B8=E7=94=A8=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=BE=B7=E5=90=8E=E6=A1=A5=E9=80=9F=E6=AF=94?=
 =?UTF-8?q?=20=E8=A7=A3=E5=86=B3=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../relation/chexingguanlianchangyong.vue     |  7 ++++-
 .../chexingpeizhi/changyongpeizhi.vue         |  7 ++++-
 .../organizationManage/organizationManage.vue | 27 ++++++++++++-------
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue
index 824eb60044..08d06163c1 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue
@@ -170,7 +170,12 @@
                 <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
-            <el-table-column width="110px" label="后桥速比" align="center">
+            <el-table-column width="110px" label="后桥" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.rearAxleValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column width="110px" label="速比" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.rearAxleRatio }}</span>
               </template>
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue
index 49140e223c..8e3fcd6d92 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue
@@ -183,7 +183,12 @@
               <span>{{ scope.row.specification }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="后桥速比" width="130px" align="center">
+          <el-table-column label="后桥" width="130px" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.rearAxleValue }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="速比" width="130px" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.rearAxleRatio }}</span>
             </template>
diff --git a/anrui-system-ui/src/views/organizationManage/organizationManage.vue b/anrui-system-ui/src/views/organizationManage/organizationManage.vue
index 982f64cfb4..a8ee76fbe0 100644
--- a/anrui-system-ui/src/views/organizationManage/organizationManage.vue
+++ b/anrui-system-ui/src/views/organizationManage/organizationManage.vue
@@ -44,7 +44,7 @@
         <tr>
           <td>主管人员</td>
           <td>
-            <el-select v-model="form.zgStaffSid" style="width:300px">
+            <el-select v-model="form.zgStaffSid" style="width:300px" clearable>
               <el-option v-for="(item, i) in staffdata" :key="i" :label="item.name" :value="item.sid">
               </el-option>
             </el-select>
@@ -52,7 +52,7 @@
 
           <td>分管人员</td>
           <td>
-            <el-select v-model="form.fgStaffSid" style="width:300px" filterable multiple>
+            <el-select v-model="fgStaffSid" style="width:300px" filterable multiple>
               <el-option v-for="(item,index) in staffdata2" :key="item.sid" :label="item.name" :value="item.sid"/>
             </el-select>
             <!--            <el-autocomplete v-model="form.fgStaffName" :fetch-suggestions="querySearchAsync" class="addinputw"-->
@@ -217,7 +217,7 @@
           <tr>
             <td>主管人员</td>
             <td>
-              <el-select v-model="form.zgStaffSid" style="width:300px" @change="zgStaffSidChange">
+              <el-select v-model="form.zgStaffSid" clearable style="width:300px" @change="zgStaffSidChange">
                 <el-option v-for="(item, i) in staffdata" :key="i" :label="item.name" :value="item.sid">
                 </el-option>
               </el-select>
@@ -225,7 +225,7 @@
 
             <td>分管人员</td>
             <td>
-              <el-select v-model="form.fgStaffSid" style="width:300px" filterable multiple>
+              <el-select v-model="fgStaffSid" style="width:300px" filterable multiple>
                 <el-option v-for="(item,index) in staffdata2" :key="item.sid" :label="item.name" :value="item.sid"/>
               </el-select>
             </td>
@@ -312,7 +312,7 @@ export default {
         sort: '',
         isDept: ''
       },
-
+      fgStaffSid: [],
       formBackup: Object.assign({}, this.form),
       isshow: 'table',
       page: {
@@ -376,7 +376,12 @@ export default {
       })
     },
     save() {
-      this.form.fgStaffSid = this.form.fgStaffSid.join()
+      if (this.fgStaffSid.length > 0) {
+        this.form.fgStaffSid = this.fgStaffSid.join()
+      } else {
+        this.form.fgStaffName = ''
+        this.form.fgStaffSid = ''
+      }
       this.form.organizationSid = this.$store.getters.userInfo.orgSid
 //      this.form.dlxx = typeof(this.form.dlxx) == 'string' ? this.form.dlxx : this.form.dlxx.join()
       if (this.form.sid) {
@@ -384,7 +389,7 @@ export default {
         putOrgtree(this.form).then(res => {
           this.isshow = 'table'
           this.getOrgTree()
-          this.handleNodeClick({ sid: this.form.psid })
+          this.handleNodeClick({sid: this.form.psid})
           this.$message({
             message: res.msg,
             type: 'success'
@@ -423,10 +428,13 @@ export default {
         if (response.success) {
           this.form = response.data
           this.form.fgStaffName = response.data.fgNames
-          this.form.fgStaffSid = response.data.fgStaffSid.split(',')
+          this.form.fgStaffSid = response.data.fgStaffSid
+          if (this.form.fgStaffSid) {
+            this.fgStaffSid = response.data.fgStaffSid.split(',')
+          }
           this.form.zgStaffName = response.data.zgNames
           this.form.zgStaffSid = response.data.zgStaffSid
-          console.log('112233445566', this.form)
+          console.log('编辑回显的数据', this.form)
         }
       })
 //       console.log('点击编辑', row)
@@ -465,6 +473,7 @@ export default {
       this.form.fgStaffSid = data.fgSids.split(',')
     },
     nodeSave() { // 节点编辑保存
+      console.log('这是保存nodeSave(0')
       this.form.fgStaffSid = this.form.fgStaffSid.join()
       postOrgtree(this.form).then(res => {
         this.getOrgTree()