From de5c80f3592120a15cedd71356ca6c6cf05071a7 Mon Sep 17 00:00:00 2001
From: Zhao Qiqi <1287235164@qq.com>
Date: Sat, 2 Jul 2022 15:56:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplychain/caigoutuiku/caigoutuiku.vue   | 98 +++++--------------
 .../caigoutuiku/caigoutuikuAdd.vue            |  1 +
 2 files changed, 24 insertions(+), 75 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuiku.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuiku.vue
index 803bd66b63..56897ab4e0 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuiku.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuiku.vue
@@ -25,29 +25,6 @@
                 type="date"
                 placeholder="结束日期"/>
             </el-form-item>
-            <el-form-item label="状态">
-              <!--   <el-select v-model="queryParams.params.billType" @change="changeBillType" style="width:200px"-->
-              <!--              filterable placeholder="请选择" clearable>-->
-              <!--     <el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue"-->
-              <!--                :value="item.dictKey"></el-option>-->
-              <!--   </el-select>-->
-              <el-input v-model="queryParams.params.vehicleName" placeholder="请输入状态" clearable/>
-              <el-date-picker
-                value-format="yyyy-MM-dd"
-                v-model="queryParams.params.applyDateStart"
-                clearable
-                style="width: 160px;"
-                type="date"
-                placeholder="开始日期"/>
-              <div class="line">至</div>
-              <el-date-picker
-                value-format="yyyy-MM-dd"
-                v-model="queryParams.params.applyDateEnd"
-                clearable
-                style="width: 160px;"
-                type="date"
-                placeholder="结束日期"/>
-            </el-form-item>
             <el-form-item label="状态">
               <el-input v-model="queryParams.params.nodeState" placeholder="请输入状态" clearable/>
             </el-form-item>
@@ -61,7 +38,6 @@
       </div>
       <!--Start 项目列表头部-->
       <div class="listtop">
-
         <div class="tit">车辆采购退库列表</div>
         <pageye
           v-show="dataList.length > 0"
@@ -93,40 +69,12 @@
               <el-button type="primary" size="small" @click="toInfo(scope.row)">查看</el-button>
             </template>
           </el-table-column>
-          <el-table-column width="150" prop="nodeState" 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="createByName" label="申请人" align="center"/>
-          <el-table-column prop="remarks" fit label="备注" align="left" header-align="center"/>
-          <el-table
-            v-loading="tableLoading"
-            :data="dataList"
-            border
-            style="width: 100%"
-            @selection-change="handleSelectionChange">
-            <el-table-column width="50px" type="selection" align="center"/>
-            <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
-            <el-table-column width="150px" label="操作" align="center">
-              <template slot-scope="scope">
-                <div class="searchbtns">
-                  <el-button
-                    size="small"
-                    type="primary"
-                    :disabled="scope.row. nodeState== '' ? false:scope.row.nodeState == '发起订单'?false : true"
-                    @click="changeNodeState(scope.row)">办理
-                  </el-button>
-                  <el-button size="small" type="primary" @click="toInfo(scope.row)">查看</el-button>
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column prop="nodeState" label="状态" align="center"/>
-            <el-table-column prop="applicationCode" label="申请编号" align="center"/>
-            <el-table-column prop="applicationName" label="申请人" align="center"/>
-            <el-table-column prop="createTime" label="申请日期" align="center"/>
-            <el-table-column prop="reason" label="退库原因" align="center"/>
-            <el-table-column prop="num" label="台数" align="center"/>
-          </el-table>
+          <el-table-column prop="nodeState" label="状态" align="center"/>
+          <el-table-column prop="applicationCode" label="申请编号" align="center"/>
+          <el-table-column prop="applicationName" label="申请人" align="center"/>
+          <el-table-column prop="createTime" label="申请日期" align="center"/>
+          <el-table-column prop="reason" label="退库原因" align="center"/>
+          <el-table-column prop="num" label="台数" align="center"/>
         </el-table>
       </div>
       <!--End 项目列表-->
@@ -151,24 +99,24 @@
 </template>
 
 <script>
-  import req from '@/api/supplychain/busvehicleapply'
-  import ButtonBar from '@/components/ButtonBar'
-  import Pagination from '@/components/pagination'
-  import pageye from '@/components/pagination/pageye'
-  import divAdd from './caigoutuikuAdd'
-  import divInfo from './caigoutuikuInfo'
+import req from '@/api/supplychain/purchasereturntowarehouse'
+import ButtonBar from '@/components/ButtonBar'
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import divAdd from './caigoutuikuAdd'
+import divInfo from './caigoutuikuInfo'
 
-  export default {
-    name: 'caigoutuiku',
-    components: {
-      ButtonBar,
-      Pagination,
-      pageye,
-      divAdd,
-      divInfo
-    },
-    data() {
-      return {
+export default {
+  name: 'caigoutuiku',
+  components: {
+    ButtonBar,
+    Pagination,
+    pageye,
+    divAdd,
+    divInfo
+  },
+  data() {
+    return {
         btndisabled: false,
         viewState: 1, // 1、列表 2、添加 3、修改 4、查看
         isSearchShow: false, // 显示隐藏
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuAdd.vue
index 2d84032d52..971d0825af 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuAdd.vue
@@ -297,6 +297,7 @@
               cancelButtonText: '取消',
               type: 'warning'
             }).then(() => {
+              this.formobj.detailsList = this.list
               req.submitVehicleReturn(this.formobj).then(resp => {
                 this.submitdisabled = false
                 if (resp.success) {