diff --git a/yxt-as-ui/src/views/storage/oldPartsFactory/index.vue b/yxt-as-ui/src/views/storage/oldPartsFactory/index.vue
index b4fe07e478..8bd1399d8a 100644
--- a/yxt-as-ui/src/views/storage/oldPartsFactory/index.vue
+++ b/yxt-as-ui/src/views/storage/oldPartsFactory/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div v-show="viewState == 1">
-      <button-bar ref="btnbar" view-title="旧件返厂管理" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <button-bar ref="btnbar" view-title="旧件返厂管理" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
       <div class="main-content">
         <div class="searchcon">
           <el-button size="small" class="searchbtn" @click="clicksearchShow">
@@ -10,40 +10,33 @@
           <div v-show="isSearchShow" class="search">
             <el-form :inline="true" class="tab-header">
               <el-form-item label="分公司">
-                <el-input v-model="queryParams.params.useOrgName" placeholder="" clearable />
+                <el-input v-model="queryParams.params.useOrgName" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="申请部门">
-                <el-input v-model="queryParams.params.deptName" placeholder="" clearable />
+                <el-input v-model="queryParams.params.deptName" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="申请人">
-                <el-input v-model="queryParams.params.createByName" placeholder="" clearable />
+                <el-input v-model="queryParams.params.createByName" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="单据编号">
-                <el-input v-model="queryParams.params.billNo" placeholder="" clearable />
+                <el-input v-model="queryParams.params.billNo" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="单据日期">
-                <el-date-picker v-model="queryParams.params.createStartTime" type="date" placeholder="选择日期"
-                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
-                </el-date-picker>至
-                <el-date-picker v-model="queryParams.params.createEndTime" type="date" placeholder="选择日期"
-                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
-                </el-date-picker>
+                <el-date-picker v-model="queryParams.params.createStartTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="queryParams.params.createEndTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
               </el-form-item>
               <el-form-item label="办结日期">
-                <el-date-picker v-model="queryParams.params.finishStartTime" type="date" placeholder="选择日期"
-                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
-                </el-date-picker>
-                至
-                <el-date-picker v-model="queryParams.params.finishEndTime" type="date" placeholder="选择日期"
-                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
-                </el-date-picker>
+                <el-date-picker v-model="queryParams.params.finishStartTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="queryParams.params.finishEndTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
               </el-form-item>
-              <!--  <el-form-item label="厂家确认结果">
-                <el-select v-model="queryParams.params.billState" placeholder="请选择">
+              <el-form-item label="厂家确认结果">
+                <el-select v-model="queryParams.params.confirmResult" placeholder="请选择">
                   <el-option v-for="(item,i) in confirmResultsList" :key="i" :label="item.name" :value="item.sid">
                   </el-option>
                 </el-select>
-              </el-form-item> -->
+              </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
               <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
@@ -58,14 +51,12 @@
         <!-- End 项目列表头部 -->
         <!-- Start 项目列表 -->
         <div class="">
-          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
-            @selection-change="selectionLineChangeHandle">
-            <el-table-column fixed width="50" type="selection" align="center" />
-            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="selectionLineChangeHandle">
+            <el-table-column fixed width="50" type="selection" align="center"/>
+            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
             <el-table-column fixed label="操作" align="center" width="180">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" :disabled="scope.row.nodeState!='待提交'"
-                  @click="toEdit(scope.row)">办理</el-button>
+                <el-button type="primary" size="mini" :disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true" @click="toEdit(scope.row)">办理</el-button>
                 <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button>
               </template>
             </el-table-column>
@@ -75,445 +66,337 @@
                 <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="billNo" label="单据编号" width="180" align="center" />
-            <el-table-column prop="useOrgName" label="分公司" width="120" align="center" />
-            <el-table-column prop="deptName" label="申请部门" width="120" align="center" />
-            <el-table-column prop="createByName" label="申请人" width="100" align="center" />
-            <el-table-column prop="createTime" label="申请日期" width="120" align="center" />
-            <el-table-column prop="needReturnCount" label="应返厂数量合计" width="180" align="center" />
-            <el-table-column prop="actualReturnCount" label="实际返厂数量合计" width="180" align="center" />
+            <el-table-column prop="billNo" label="单据编号" width="180" align="center"/>
+            <el-table-column prop="useOrgName" label="分公司" width="120" align="center"/>
+            <el-table-column prop="deptName" label="申请部门" width="120" align="center"/>
+            <el-table-column prop="createByName" label="申请人" width="100" align="center"/>
+            <el-table-column prop="createTime" label="申请日期" width="120" align="center"/>
+            <el-table-column prop="needReturnCount" label="应返厂数量合计" width="180" align="center"/>
+            <el-table-column prop="actualReturnCount" label="实际返厂数量合计" width="180" align="center"/>
             <el-table-column label="附件" align="center" width="100">
               <template slot-scope="scope">
-                <div style="color: #1890FF; text-decoration: underline ;cursor: pointer;"
-                  @click="showAdjunct(scope.row.filePaths)">查看
-                </div>
+                <span class="bluezi" @click="showAdjunct(scope.row.filePaths)">查看</span>
               </template>
             </el-table-column>
-            <el-table-column label="返厂情况" prop="state" align="center" width="100" />
-            <!--   <template slot-scope="scope">
-                <div style="color: #1890FF; text-decoration: underline ;">{{scope.row.state}}
-                </div>
-              </template>
-            </el-table-column> -->
+            <el-table-column label="返厂情况" prop="state" align="center" width="100"/>
             <el-table-column label="厂家确认情况" align="center" width="150">
               <template slot-scope="scope">
-                <div style="color: #1890FF; text-decoration: underline ;cursor: pointer;"
-                  v-show="scope.row.confirmSid!=''" @click="showDetail(scope.row)">
-                  查看
-                </div>
+                <span class="bluezi" v-show="scope.row.confirmSid!=''" @click="showDetail(scope.row)">查看</span>
               </template>
             </el-table-column>
-
           </el-table>
         </div>
         <!-- End 项目列表 -->
         <div class="pages">
-          <div class="tit" />
+          <div class="tit"/>
           <!--  翻页  -->
-          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
-            :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
         </div>
       </div>
     </div>
     <!-- End 查询和其列表部分 -->
     <!-- 新增修改部分组件 -->
-    <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
-    <divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList" />
-    <manufacturerconfirmInfo v-show="viewState == 5" ref="manufacturerconfirmInfo" @doback="resetState"
-      @reloadlist="loadList" />
+    <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList"/>
+    <divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList"/>
+    <manufacturerconfirmInfo v-show="viewState == 5" ref="manufacturerconfirmInfo" @doback="resetState" @reloadlist="loadList"/>
 
     <el-dialog title="附件" :visible.sync="dialogVisible" :before-close="handleClose">
       <el-form ref="dataForm1" class="formadd" style="margin-top: -30px;">
         <el-row class="first_row">
           <el-col :span="24" class="trightb">
-            <el-image style="width: 120px;height: 120px; margin: 10px; background: #f0f;"
-              v-for="(item,index) in fileList" :src="item" :preview-src-list="[item]">
+            <el-image style="width: 120px;height: 120px; margin: 10px; background: #f0f;" v-for="(item, index) in fileList" :key="index" :src="item" :preview-src-list="[item]">
             </el-image>
           </el-col>
         </el-row>
       </el-form>
     </el-dialog>
-
-    <el-dialog title="确认结果详情" :visible.sync="dialogVisible2" :before-close="handleClose2">
-      <el-form ref="dataForm1" class="formadd" style="margin-top: -40px;" :model="orderInfo">
-
-        <el-row class="first_row">
-          <el-col :span="8" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">返件数量确认</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="16">
-            <el-form-item class="trightb_item">
-              <el-radio-group v-model="orderInfo.isUnanimous" size="small" :disabled="true">
-                <el-radio :label="0">一致</el-radio>
-                <el-radio :label="1">不一致</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">备注</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="16">
-            <el-form-item class="trightb_item">
-              <span class="addinputw" style="width:100%">{{orderInfo.remarks}}</span>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">附件</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="16" class="trightb">
-            <el-form-item class="trightb_item">
-              <el-image style="width: 120px;height: 120px; margin: 10px; " v-for="(item,index) in orderInfo.filePaths"
-                :src="item" :preview-src-list="[item]">
-              </el-image>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </el-dialog>
-
     <!-- 流程审批记录 -->
     <el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
-      <iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no"
-        :src="this.centerDialogVisible === true ? url :''"></iframe>
+      <iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>
     </el-dialog>
-
   </div>
 </template>
 
 <script>
-  import req from '@/api/storage/oldPartsFactory.js'
-  import ButtonBar from '@/components/ButtonBar'
-  import Pagination from '@/components/pagination'
-  import pageye from '@/components/pagination/pageye'
-  import divAdd from './oldPartsFactoryAdd.vue'
-  import divInfo from './oldPartsFactoryInfo.vue'
-  import manufacturerconfirmInfo from './manufacturerconfirmInfo.vue'
-  import {
-    getStorage
-  } from '@/utils/auth'
-  export default {
-    components: {
-      ButtonBar,
-      Pagination,
-      pageye,
-      divAdd,
-      divInfo,
-      manufacturerconfirmInfo
-    },
-    data() {
-      return {
-        url: '',
-        dialogHeight: '80%',
-        centerDialogVisible: false,
-        dialogVisible: false,
-        dialogVisible2: false,
-        fileList: [],
-        orderInfo: {},
-        btndisabled: false,
-        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
-        isSearchShow: false,
-        searchxianshitit: '显示查询条件',
-        tableLoading: false,
-        dataList: [],
-        btnList: [{
-            type: 'primary',
-            size: 'small',
-            icon: 'plus',
-            btnKey: 'toAdd',
-            btnLabel: '新增'
-          }, {
-            type: 'danger',
-            size: 'small',
-            icon: 'del',
-            btnKey: 'doDel',
-            btnLabel: '删除'
-          },
+import req from '@/api/storage/oldPartsFactory.js'
+import ButtonBar from '@/components/ButtonBar'
+import Pagination from '@/components/pagination'
+import divAdd from './oldPartsFactoryAdd.vue'
+import divInfo from './oldPartsFactoryInfo.vue'
+import manufacturerconfirmInfo from '../manufacturerconfirm/manufacturerconfirmInfo'
+import { getStorage } from '@/utils/auth'
 
-          {
-            type: 'info',
-            size: 'small',
-            icon: 'cross',
-            btnKey: 'doClose',
-            btnLabel: '关闭'
-          }
-        ],
-        queryParams: {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            "useOrgName": "",
-            "deptName": "",
-            "createByName": "",
-            "billNo": "",
-            "createStartTime": "",
-            "createEndTime": "",
-            "finishStartTime": "",
-            "finishEndTime": "",
-            "billState": "",
-            "userSid": "",
-            "orgPath": "",
-            "menuUrl": "",
-            "menuSid": ""
-          }
+export default {
+  components: {
+    ButtonBar,
+    Pagination,
+    divAdd,
+    divInfo,
+    manufacturerconfirmInfo
+  },
+  data() {
+    return {
+      url: '',
+      dialogHeight: '80%',
+      centerDialogVisible: false,
+      dialogVisible: false,
+      fileList: [],
+      btndisabled: false,
+      viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      tableLoading: false,
+      dataList: [],
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'plus',
+          btnKey: 'toAdd',
+          btnLabel: '新增'
+        }, {
+          type: 'danger',
+          size: 'small',
+          icon: 'del',
+          btnKey: 'doDel',
+          btnLabel: '删除'
         },
-        sids: [],
-        selectionList: [],
-        confirmResultsList: [{
-            name: "一致",
-            sid: "1"
-          },
-          {
-            name: "不一致",
-            sid: "2"
-          }
-        ],
-        pathList: []
-      }
-    },
-    mounted() {
-      // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage
-      window.addEventListener('message', this.handleMessage)
-      this.$refs['btnbar'].setButtonList(this.btnList)
-    },
-    created() {
-      this.loadList()
-    },
-    methods: {
-      async handleMessage(event) {
-        var code = ''
-        if (event.data.params !== null && event.data.params !== undefined) {
-          code = event.data.params.code
+
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
         }
-        if (code === 1) {
-          this.centerDialogVisible = false
-        } else if (code === 2) {
-          this.dialogHeight = event.data.params.data
-          this.setIframeHeight(document.getElementById('iframe'))
+      ],
+      queryParams: {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          useOrgName: '',
+          deptName: '',
+          createByName: '',
+          billNo: '',
+          createStartTime: '',
+          createEndTime: '',
+          finishStartTime: '',
+          finishEndTime: '',
+          confirmResult: '',
+          userSid: '',
+          orgPath: '',
+          menuUrl: '',
+          menuSid: ''
         }
       },
-      closeIt() {
-        this.url = ''
-        this.centerDialogVisible = false
-      },
-      setIframeHeight(iframe) {
-        iframe.height = this.dialogHeight
-      },
-      flowRecord(row) {
-        this.centerDialogVisible = true
-        var params = {
-          deployId: row.procDefId,
-          procInsId: row.procInstId,
-          token: getStorage()
+      sids: [],
+      selectionList: [],
+      confirmResultsList: [
+        {
+          name: '未确认',
+          sid: '1'
+        },
+        {
+          name: '已确认',
+          sid: '2'
         }
-        this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
-      },
-      handleClose() {
-        this.dialogVisible = false
-      },
-      handleClose2() {
-        this.dialogVisible2 = false
-      },
-      showAdjunct(paths) {
-        this.fileList = paths
-        this.dialogVisible = true
-      },
-      showDetail(row) {
-
-
-        this.viewState = 5
-        this.$refs['manufacturerconfirmInfo'].showEdit(row.confirmSid)
-      },
-      showResult(row) {
-
-        if (row.confirmResult == '未确认') {
-          this.$message({
-            type: 'warning',
-            showClose: true,
-            message: '厂家暂未确认'
-          })
+      ]
+    }
+  },
+  mounted() {
+    // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage
+    window.addEventListener('message', this.handleMessage)
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  created() {
+    this.loadList()
+  },
+  methods: {
+    async handleMessage(event) {
+      var code = ''
+      if (event.data.params !== null && event.data.params !== undefined) {
+        code = event.data.params.code
+      }
+      if (code === 1) {
+        this.centerDialogVisible = false
+      } else if (code === 2) {
+        this.dialogHeight = event.data.params.data
+        this.setIframeHeight(document.getElementById('iframe'))
+      }
+    },
+    closeIt() {
+      this.url = ''
+      this.centerDialogVisible = false
+    },
+    setIframeHeight(iframe) {
+      iframe.height = this.dialogHeight
+    },
+    flowRecord(row) {
+      this.centerDialogVisible = true
+      var params = {
+        deployId: row.procDefId,
+        procInsId: row.procInstId,
+        token: getStorage()
+      }
+      this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
+    },
+    handleClose() {
+      this.dialogVisible = false
+    },
+    showAdjunct(paths) {
+      this.fileList = paths
+      this.dialogVisible = true
+    },
+    showDetail(row) {
+      this.viewState = 5
+      this.$refs['manufacturerconfirmInfo'].showEdit(row.confirmSid)
+    },
+    selectionLineChangeHandle(val) {
+      this.selectionList = val
+      const aa = []
+      val.forEach(element => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+    },
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      switch (btnKey) {
+        case 'doDel':
+          this.doDel()
+          break
+        case 'toAdd':
+          this.toAdd()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    loadList() {
+      this.tableLoading = true
+      this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
+      this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.queryParams.params.menuUrl = this.$route.path
+      req.listPage(this.queryParams).then((resp) => {
+        this.tableLoading = false
+        if (resp.success) {
+          const data = resp.data
+          this.queryParams.total = data.total
+          this.dataList = data.records
         } else {
-          req.fetchDetailsByMainSid(row.sid).then((resp) => {
-
-            console.log("fetchDetailsByMainSid", resp);
-
-            this.orderInfo = resp.data
-
-            this.dialogVisible2 = true
-
-          }).catch(() => {
-
-          })
+          // 根据resp.code进行异常情况处理
+          this.dataList = []
+          this.queryParams.total = 0
         }
+      }).catch(() => {
+        this.tableLoading = false
+      })
+    },
 
-      },
-      selectionLineChangeHandle(val) {
-        console.log("val", val);
-
-        this.selectionList = val
-        const aa = []
-        val.forEach(element => {
-          aa.push(element.sid)
-        })
-        this.sids = aa
-
-      },
-      // 搜索条件效果
-      clicksearchShow() {
-        this.isSearchShow = !this.isSearchShow
-        if (this.isSearchShow) {
-          this.searchxianshitit = '隐藏查询条件'
-        } else {
-          this.searchxianshitit = '显示查询条件'
-        }
-      },
-      btnHandle(btnKey) {
-        switch (btnKey) {
-          case 'doDel':
-            this.doDel()
-            break
-          case 'toAdd':
-            this.toAdd()
-            break
-          case 'doClose':
-            this.doClose()
-            break
-          default:
-            break
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    dosearch() {
+      this.queryParams.current = 1
+      this.loadList()
+    },
+    resetQuery() {
+      this.queryParams = {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          useOrgName: '',
+          deptName: '',
+          createByName: '',
+          billNo: '',
+          createStartTime: '',
+          createEndTime: '',
+          finishStartTime: '',
+          finishEndTime: '',
+          confirmResult: '',
+          userSid: '',
+          orgPath: '',
+          menuUrl: '',
+          menuSid: ''
         }
-      },
-      loadList() {
-        this.tableLoading = true
-        this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
-        this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
-        this.queryParams.params.menuUrl = this.$route.path
-        req.listPage(this.queryParams).then((resp) => {
-          this.tableLoading = false
-          if (resp.success) {
-            const data = resp.data
-            this.queryParams.total = data.total
-            this.dataList = data.records
-          } else {
-            // 根据resp.code进行异常情况处理
-            this.dataList = []
-            this.queryParams.total = 0
-          }
+      }
+      this.loadList()
+    },
+    doDel() {
+      if (this.sids.length > 0) {
+        const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+        this.$confirm(tip, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
+          req.deleteBySids(this.sids).then((resp) => {
+            loading.close()
+            if (resp.success) {
+              this.$message({
+                type: 'success',
+                message: resp.msg,
+                showClose: true
+              })
+              this.loadList()
+            } else {
+              // 根据resp.code进行异常情况处理
+            }
+          }).catch(e => {
+            loading.close()
+          })
         }).catch(() => {
-          this.tableLoading = false
         })
-      },
-
-      // 序号
-      indexMethod(index) {
-        var pagestart = (this.queryParams.current - 1) * this.queryParams.size
-        var pageindex = index + 1 + pagestart
-        return pageindex
-      },
-      dosearch() {
-        this.queryParams.current = 1
-        this.loadList()
-      },
-      resetQuery() {
-        this.queryParams = {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            "useOrgName": "",
-            "deptName": "",
-            "createByName": "",
-            "billNo": "",
-            "createStartTime": "",
-            "createEndTime": "",
-            "finishStartTime": "",
-            "finishEndTime": "",
-            "billState": "",
-            "userSid": "",
-            "orgPath": "",
-            "menuUrl": "",
-            "menuSid": ""
-          }
-        }
-        this.loadList()
-      },
-      doDel() {
-
-        if (this.sids.length > 0) {
-          const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
-          this.$confirm(tip, '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            const loading = this.$loading({
-              lock: true,
-              text: 'Loading',
-              spinner: 'el-icon-loading',
-              background: 'rgba(0, 0, 0, 0.7)'
-            })
-            req.deleteBySids(this.sids).then((resp) => {
-              loading.close()
-              if (resp.success) {
-                this.$message({
-                  type: 'success',
-                  message: resp.msg,
-                  showClose: true
-                })
-                this.loadList()
-              } else {
-                // 根据resp.code进行异常情况处理
-              }
-            }).catch(e => {
-              loading.close()
-            })
-          }).catch(() => {})
-        } else {
-          this.$message({
-            showClose: true,
-            message: '请至少选择一条记录进行删除操作'
-          })
-        }
-      },
-
-      toAdd() {
-
-        this.viewState = 2
-        this.$refs['divadd'].showAdd()
-
-      },
-
-      toEdit(row) {
-
-        this.viewState = 3
-        this.$refs['divadd'].showEdit(row)
-
-      },
-
-      doClose() {
-        this.$store.dispatch('tagsView/delView', this.$route)
-        this.$router.go(-1)
-      },
-      toRelevancy(row) {
-        this.viewState = 4
-        this.$refs['divinfo'].showEdit(row)
-      },
-
-      resetState() {
-        this.viewState = 1
-      },
-
+      } else {
+        this.$message({
+          showClose: true,
+          message: '请至少选择一条记录进行删除操作'
+        })
+      }
+    },
+    toAdd() {
+      this.viewState = 2
+      this.$refs['divadd'].showAdd()
+    },
+    toEdit(row) {
+      this.viewState = 3
+      this.$refs['divadd'].showEdit(row)
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    },
+    toRelevancy(row) {
+      this.viewState = 4
+      this.$refs['divinfo'].showEdit(row)
+    },
+    resetState() {
+      this.viewState = 1
     }
   }
+}
 </script>
 <style scoped>
 </style>
diff --git a/yxt-as-ui/src/views/storage/oldPartsFactory/manufacturerconfirmInfo.vue b/yxt-as-ui/src/views/storage/oldPartsFactory/manufacturerconfirmInfo.vue
deleted file mode 100644
index 63618b913e..0000000000
--- a/yxt-as-ui/src/views/storage/oldPartsFactory/manufacturerconfirmInfo.vue
+++ /dev/null
@@ -1,172 +0,0 @@
-<template>
-  <div>
-
-    <div class="tab-header webtop">
-      <!-- 标题 -->
-      <div>厂家确认</div>
-      <!-- start 添加修改按钮 -->
-      <div>
-        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
-      </div>
-      <!-- end 添加修改按钮 -->
-      <!-- end 详情按钮 -->
-    </div>
-
-    <div class="listconadd">
-
-      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
-        <!-- <div class="title">
-          <div>基础信息</div>
-        </div> -->
-        <el-row class="first_row">
-
-          <!--  <el-col :span="12">
-           <div class="span-sty">单据编号</div>
-           <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
-         </el-col> -->
-          <el-col :span="8">
-            <div class="span-sty">申请人</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">申请部门</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <div class="span-sty">申请日期</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <!-- <el-row>
-
-          <el-col :span="12">
-            <div class="span-sty">分公司</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.useOrgName }}</span></el-form-item>
-          </el-col>
-
-
-        </el-row>
-        <el-row>
-
-          <el-col :span="12">
-            <div class="span-sty">流程状态</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.nodeState }}</span></el-form-item>
-          </el-col>
-
-        </el-row> -->
-        <el-row>
-
-          <el-col :span="24">
-            <div class="span-sty">备注</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
-          </el-col>
-
-        </el-row>
-
-        <el-row>
-          <el-col :span="24">
-            <div class="span-sty">附件</div>
-            <el-form-item class="trightb_item">
-              <el-image style="width: 120px;height: 120px; margin: 10px;" class="addinputInfo"
-                v-for="(item,index) in formobj.filePaths" :src="item" :preview-src-list="[item]">
-              </el-image>
-            </el-form-item>
-          </el-col>
-
-        </el-row>
-
-        <div class="title"
-          style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
-          <div>已返厂旧件列表</div>
-        </div>
-        <el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;"
-          :row-style="{height: '40px'}">
-          <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-          <el-table-column label="商品名称" prop="goodsSpuName" align="center" />
-          <el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
-          <el-table-column label="厂家" prop="manufacturerName" align="center" />
-          <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
-          <el-table-column label="单位" prop="unit" align="center" />
-          <el-table-column label="车架号" prop="vinNo" align="center" />
-          <el-table-column label="维修单号" prop="sourceBillNo" align="center" />
-          <el-table-column label="索赔单号" prop="claimBillNo" align="center" />
-          <el-table-column label="需返厂数量" prop="needReturnCount" align="center" />
-          <el-table-column label="实际返厂数量" prop="actualReturnCount" align="center" />
-          <el-table-column label="差异说明" prop="remarks" align="center" />
-          <el-table-column label="确认数量" prop="confirmCount" align="center" />
-        </el-table>
-      </el-form>
-
-    </div>
-
-
-  </div>
-</template>
-
-<script>
-  import req from '@/api/storage/manufacturerconfirm.js'
-
-  export default {
-    components: {},
-    data() {
-      return {
-        listLoading: false,
-        submitdisabled: false,
-        formobj: {},
-      }
-    },
-    methods: {
-      indexMethod(index) {
-        return index + 1
-      },
-
-      handleReturn(isreload) {
-        if (isreload === 'true') this.$emit('reloadlist')
-        this.$emit('doback')
-      },
-
-      showAdd() {
-
-      },
-      showEdit(sid) {
-
-        req.init(sid)
-          .then(resp => {
-            if (resp.success) {
-              this.formobj = resp.data
-            }
-          })
-          .catch(e => {
-            this.formobj = {}
-          })
-      }
-    }
-  }
-</script>
-<style scoped>
-  .span-sty {
-    width: 130px !important;
-  }
-
-  .addinputInfo {
-    margin-left: 120px !important;
-  }
-
-  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
-    margin-left: 120px !important;
-    width: calc(100% - 115px);
-  }
-
-  .first_row {
-    border-top: 1px solid #E0E3EB;
-  }
-
-  .titleOne {
-    padding: 7px;
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    align-items: center;
-  }
-</style>
diff --git a/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue b/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue
index bb180d45f3..433127bfdb 100644
--- a/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue
+++ b/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue
@@ -1,28 +1,18 @@
 <template>
-  <div>
+  <div class="app-container">
     <div class="tab-header webtop">
-      <!-- 标题 -->
       <div>{{title}}旧件返厂申请</div>
-      <!-- start 添加修改按钮 -->
       <div>
         <el-button type="primary" size="small" :disabled="submitdisabled" @click="importDetail">导入厂家返件明细</el-button>
+        <el-button type="primary" size="small" :disabled="submitdisabled" v-show="formobj.sid!=''" @click="downLoadDetail">导出待出库旧件明细</el-button>
         <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
         <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit">提交</el-button>
-        <el-button type="primary" size="small" :disabled="submitdisabled" v-show="formobj.sid!=''"
-          @click="downLoadDetail">下载待出库旧件明细</el-button>
         <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
       </div>
-      <!-- end 添加修改按钮 -->
-      <!-- end 详情按钮 -->
     </div>
     <div class="listconadd">
       <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
         <el-row class="first_row">
-
-          <!--  <el-col :span="12">
-            <div class="span-sty">单据编号</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
-          </el-col> -->
           <el-col :span="8">
             <div class="span-sty">申请人</div>
             <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
@@ -33,102 +23,41 @@
           </el-col>
           <el-col :span="8">
             <div class="span-sty">申请日期</div>
-            <el-form-item prop="createTime">
+            <el-form-item>
               <span class="addinputInfo">{{ formobj.createTime }}</span>
-              <!--  <el-date-picker v-model="formobj.createTime" class="addinputw addinputInfo" type="date"
-                value-format="yyyy-MM-dd" placeholder="选择日期">
-              </el-date-picker> -->
             </el-form-item>
           </el-col>
-
-        </el-row>
-        <!--        <el-row>
-
-          <el-col :span="12">
-            <div class="span-sty">分公司</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.useOrgName }}</span></el-form-item>
-          </el-col>
-
-
         </el-row>
         <el-row>
-
-
-          <el-col :span="12">
-            <div class="span-sty">流程状态</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.nodeState }}</span></el-form-item>
-          </el-col>
-
-        </el-row> -->
-
-        <el-row>
-
           <el-col :span="24">
             <div class="span-sty"><span class="must">*</span> 附件</div>
             <el-form-item prop="filePaths">
-              <upload-img ref="uploadImg" class="addinputw" v-model="imgList" :limit="50" bucket="map"
-                :upload-data="{ type: '0001' }" @change="backData" />
+              <upload-img ref="uploadImg" class="addinputw" v-model="imgList" :limit="50" bucket="map" :upload-data="{ type: '0001' }" @change="backData" />
             </el-form-item>
           </el-col>
-
         </el-row>
-
         <el-row>
-
           <el-col :span="24">
             <div class="span-sty">备注</div>
             <el-form-item>
-              <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" type="textarea"
-                :rows="4" clearable />
-
+              <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" type="textarea" :rows="4" clearable />
             </el-form-item>
           </el-col>
-
         </el-row>
-
         <div class="title  titleOne">
           <div>返厂旧件列表</div>
           <el-button type="primary" size="mini" @click="seleGoods3()">添加</el-button>
         </div>
         <el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border>
           <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-          <!-- <el-table-column align="center" width="100" :render-header="commodityHeader">
-            <template slot-scope="scope">
-              <i class="el-icon-delete" @click="commodityDelete(scope.$index)"></i>
-            </template>
-          </el-table-column> -->
-          <!-- <el-table-column label="商品名称" align="center" min-width="200">
-            <template slot-scope="scope">
-              <el-popover placement="right" width="900" trigger="click">
-                <div>
-                  <el-table :data="commodityData" v-loading="commodityLoading" highlight-current-row
-                    @current-change="commodityCurrentChange($event, scope.row)">
-                    <el-table-column fixed prop="goodsSpuName" label="商品ID" align="center" />
-                    <el-table-column fixed prop="goodsSpuName" label="商品名称" align="center" />
-                    <el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
-                    <el-table-column prop="manufacturerName" label="厂家" align="center" />
-                    <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
-                    <el-table-column prop="unit" label="单位" align="center" />
-                    <el-table-column prop="unit" label="车架号" align="center" />
-                    <el-table-column prop="unit" label="维修单号" align="center" />
-                  </el-table>
-                  <el-pagination :page.sync="commodityQuery.current" :page-size="commodityQuery.size"
-                    layout="total, pager" :total="commodityQuery.total" />
-                </div>
-                <el-input slot="reference" v-model="scope.row.goodsSkuName"
-                  @input="commodityInput(scope.row.goodsSkuName)" clearable placeholder="商品名称" />
-              </el-popover>
-            </template>
-          </el-table-column> -->
           <el-table-column fixed label="操作" align="center" width="180">
             <template slot-scope="scope">
-              <el-button type="primary" size="mini" :disabled="scope.row.isCf=='否'"
-                @click="delGoods(scope.$index)">删除</el-button>
+              <el-button type="primary" size="mini" :disabled="scope.row.isCf=='否'" @click="delGoods(scope.$index)">删除</el-button>
               <el-button type="primary" size="mini" @click="seleGoods(scope.row)">选择旧件</el-button>
             </template>
           </el-table-column>
           <el-table-column prop="goodsSpuName" label="商品名称" align="center" />
-          <el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
+          <el-table-column prop="goodsSkuCode" label="图号" align="center" />
           <el-table-column prop="manufacturerName" label="厂家" align="center" />
           <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
           <el-table-column prop="unit" label="单位" align="center" />
@@ -144,9 +73,7 @@
           </el-table-column>
           <el-table-column prop="isCf" label="是否迟返" align="center" />
         </el-table>
-
       </el-form>
-
     </div>
 
     <!-- 导入 -->
@@ -156,9 +83,19 @@
       </div>
       <el-card class="box-card">
         <div>
-          <el-upload ref="upload" class="upload-demo" accept=".xls,.xlsx" name="file" :action="updateAction"
-            :on-success="handleSuccess" :file-list="fileList" :auto-upload="false" :multiple="false" :limit="1"
-            :data="uploadData" :headers="headers">
+          <el-upload
+            ref="upload"
+            class="upload-demo"
+            accept=".xls,.xlsx"
+            name="file"
+            :action="updateAction"
+            :on-success="handleSuccess"
+            :file-list="fileList"
+            :auto-upload="false"
+            :multiple="false"
+            :limit="1"
+            :data="uploadData"
+            :headers="headers">
             <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
             <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传</el-button>
           </el-upload>
@@ -176,16 +113,13 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="选择旧件" :visible.sync="dialogVisible2" :before-close="handleClose2"
-      style="width:150%;margin-left: -20%;">
-
-      <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%;margin-top: -20px;"
-        @selection-change="selectionLineChangeHandle">
+    <el-dialog title="选择旧件" :visible.sync="dialogVisible2" :before-close="handleClose2" style="width:150%;margin-left: -20%;">
+      <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%;margin-top: -20px;" @selection-change="selectionLineChangeHandle">
         <el-table-column fixed width="50" type="selection" align="center" />
         <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
         <el-table-column prop="goodsID" label="商品ID" align="center" />
         <el-table-column prop="goodsSpuName" label="商品名称" align="center" />
-        <el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
+        <el-table-column prop="goodsSkuCode" label="图号" align="center" />
         <el-table-column prop="manufacturerName" label="厂家" align="center" />
         <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
         <el-table-column prop="unit" label="单位" align="center" />
@@ -204,22 +138,15 @@
       <div class="pages">
         <div class="tit" />
         <!--  翻页  -->
-        <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
-          :limit.sync="queryParams.size" class="pagination" @pagination="seleGoods" />
-
+        <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="seleGoods" />
       </div>
-
       <div class="btn" style="text-align: center; margin-top: 20px;">
         <el-button type="primary" size="mini" @click="addDialogList()">确认</el-button>
         <el-button type="primary" size="mini" @click="handleClose2()">关闭</el-button>
       </div>
     </el-dialog>
-
-    <el-dialog title="选择旧件" :visible.sync="dialogVisible3" :before-close="handleClose3"
-      style="width:150%;margin-left: -20%;">
-
-      <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%;margin-top: -20px;"
-        @selection-change="selectionLineChangeHandle3">
+    <el-dialog title="选择旧件" :visible.sync="dialogVisible3" :before-close="handleClose3" style="width:150%;margin-left: -20%;">
+      <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%;margin-top: -20px;" @selection-change="selectionLineChangeHandle3">
         <el-table-column fixed width="50" type="selection" align="center" />
         <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
         <el-table-column prop="goodsID" label="商品ID" align="center" />
@@ -230,9 +157,7 @@
         <el-table-column prop="unit" label="单位" align="center" />
         <el-table-column label="仓库-库区" align="center" width="150">
           <template slot-scope="scope">
-            <div>
-              {{scope.row.warehouseName}} - {{scope.row.warehouseAreaName}}
-            </div>
+            <span>{{scope.row.warehouseName}} - {{scope.row.warehouseAreaName}}</span>
           </template>
         </el-table-column>
         <el-table-column prop="warehouseRackName" label="库位" align="center" />
@@ -243,20 +168,13 @@
       <div class="pages">
         <div class="tit" />
         <!--  翻页  -->
-        <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
-          :limit.sync="queryParams.size" class="pagination" @pagination="seleGoods3" />
-
+        <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="seleGoods3" />
       </div>
-
       <div class="btn" style="text-align: center; margin-top: 20px;">
         <el-button type="primary" size="mini" @click="addDialogList3()">确认</el-button>
         <el-button type="primary" size="mini" @click="handleClose3()">关闭</el-button>
       </div>
     </el-dialog>
-
-
-
-
   </div>
 </template>
 
@@ -293,29 +211,25 @@
         listLoading: false,
         submitdisabled: false,
         formobj: {
-          "sid": "",
-          "remarks": "",
-          "createBySid": window.sessionStorage.getItem('userSid'),
-          "createByName": window.sessionStorage.getItem('name'),
-          "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
-            .getItem('defaultOrgPath').lastIndexOf('/') + 1),
-          "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
-            .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
-          "createTime": getCurrentDate(),
-          "billNo": "",
-          "filePaths": [],
-          "useOrgSid": '',
-          "useOrgName": '',
-          "orgSidPath": window.sessionStorage.getItem('orgSidPath'),
-          "procDefId": "",
-          "nodeId": "",
-          "procInstId": "",
-          "nodeState": "",
-          "taskId": "",
-          "finishTime": "",
-          "asOldpartreturnList": [
-
-          ]
+          sid: '',
+          remarks: '',
+          createBySid: window.sessionStorage.getItem('userSid'),
+          createByName: window.sessionStorage.getItem('name'),
+          deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1),
+          deptName: window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
+          createTime: getCurrentDate(),
+          billNo: '',
+          filePaths: [],
+          useOrgSid: '',
+          useOrgName: '',
+          orgSidPath: window.sessionStorage.getItem('orgSidPath'),
+          procDefId: '',
+          nodeId: '',
+          procInstId: '',
+          nodeState: '',
+          taskId: '',
+          finishTime: '',
+          asOldpartreturnList: []
         },
         imgList: [],
         dataList: [],
@@ -328,23 +242,14 @@
           size: 10,
           total: 0,
           params: {
-            "vinNo": "",
-            "goodsSkuCode": "",
-            "sourceBillNo": "",
-            "orgPath": "",
+            vinNo: '',
+            goodsSkuCode: '',
+            sourceBillNo: '',
+            orgPath: ''
           }
         },
         rules: {
-          createTime: [{
-            required: true,
-            message: '申请日期不能为空',
-            trigger: 'change'
-          }],
-          filePaths: [{
-            required: true,
-            message: '附件不能为空',
-            trigger: 'blur'
-          }],
+          filePaths: [{ required: true, message: '附件不能为空', trigger: 'blur' }]
         }
       }
     },
@@ -366,8 +271,6 @@
         this.dialogVisible = true
       },
       saveOrUpdate() {
-        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
-
         this.$refs['form_obj'].validate((valid) => {
           if (valid) {
             this.submitdisabled = true
@@ -389,7 +292,6 @@
         })
       },
       submit() {
-
         this.$refs['form_obj'].validate((valid) => {
           if (valid) {
             this.submitdisabled = true
@@ -409,74 +311,57 @@
             })
           }
         })
-
       },
       handleReturn(isreload) {
         if (isreload === 'true') this.$emit('reloadlist')
         this.imgList = []
         this.formobj = {
-          "sid": "",
-          "remarks": "",
-          "createBySid": window.sessionStorage.getItem('userSid'),
-          "createByName": window.sessionStorage.getItem('name'),
-          "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
-            .getItem('defaultOrgPath').lastIndexOf('/') + 1),
-          "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
-            .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
-          "createTime": getCurrentDate(),
-          "billNo": "",
-          "filePaths": [],
-          "useOrgSid": '',
-          "useOrgName": '',
-          "orgSidPath": window.sessionStorage.getItem('orgSidPath'),
-          "procDefId": "",
-          "nodeId": "",
-          "procInstId": "",
-          "nodeState": "",
-          "taskId": "",
-          "finishTime": "",
-          "asOldpartreturnList": [
-
-          ]
+          sid: '',
+          remarks: '',
+          createBySid: window.sessionStorage.getItem('userSid'),
+          createByName: window.sessionStorage.getItem('name'),
+          deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1),
+          deptName: window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
+          createTime: getCurrentDate(),
+          billNo: '',
+          filePaths: [],
+          useOrgSid: '',
+          useOrgName: '',
+          orgSidPath: window.sessionStorage.getItem('orgSidPath'),
+          procDefId: '',
+          nodeId: '',
+          procInstId: '',
+          nodeState: '',
+          taskId: '',
+          finishTime: '',
+          asOldpartreturnList: []
         }
         this.submitdisabled = false
-        this.isUpdata = false
         this.$emit('doback')
       },
-
       showAdd() {
         this.$nextTick(() => {
           this.$refs['form_obj'].clearValidate()
         })
-        this.title = "【新增】"
-        this.isUpdata = false
+        this.title = '【新增】'
       },
       showEdit(row) {
         this.$nextTick(() => {
           this.$refs['form_obj'].clearValidate()
         })
-        this.title = "【修改】"
-        this.isUpdata = true
-        // var params = {
-        //   sid: row.sid
-        // }
-
-        req.init(row.sid)
-          .then(resp => {
-            if (resp.success) {
-              this.formobj = resp.data
-
-              for (var i = 0; i < resp.data.filePaths.length; i++) {
-                this.imgList.push({
-                  url: resp.data.filePaths[i].url
-                })
-              }
-
+        this.title = '【修改】'
+        req.init(row.sid).then(resp => {
+          if (resp.success) {
+            this.formobj = resp.data
+            for (var i = 0; i < resp.data.filePaths.length; i++) {
+              this.imgList.push({
+                url: resp.data.filePaths[i].url
+              })
             }
-          })
-          .catch(e => {
-            this.formobj = {}
-          })
+          }
+        }).catch(e => {
+          this.formobj = {}
+        })
       },
       downLoadDetail() {
         const loading = this.$loading({
@@ -493,7 +378,7 @@
           const fileName = '待出库旧件明细' + '.xls'
           const elink = document.createElement('a')
           elink.download = fileName
-          elink.style.display = 'nonde'
+          elink.style.display = 'none'
           elink.href = URL.createObjectURL(blob)
           document.body.appendChild(elink)
           elink.click()
@@ -535,15 +420,11 @@
         const _this = this
         _this.uploadResultMesssage = resp.msg
         _this.uploadSuccess = resp.success
-
         if (resp.success) {
-
           for (var i = 0; i < resp.data.length; i++) {
             this.formobj.asOldpartreturnList.push(resp.data[i])
           }
-
         }
-
       },
       handleConfirm() {
         if (!this.uploadSuccess) {
@@ -560,178 +441,148 @@
         console.log('backData》》》》', value)
         console.log('imgList', this.imgList)
         this.imgList = value
-
         for (var i = 0; i < this.imgList.length; i++) {
           this.formobj.filePaths.push(this.imgList[i].url)
         }
-
-
       },
       seleGoods(row) {
         this.itemInfo = row
         this.queryParams.params = {
-          "vinNo": row.vinNo,
-          "goodsSkuCode": row.goodsSkuCode,
-          "sourceBillNo": row.sourceBillNo,
-          "orgPath": window.sessionStorage.getItem('defaultOrgPath'),
+          vinNo: row.vinNo,
+          goodsSkuCode: row.goodsSkuCode,
+          sourceBillNo: row.sourceBillNo,
+          orgPath: window.sessionStorage.getItem('defaultOrgPath')
         }
-
         req.getGoodsListPage(this.queryParams).then(resp => {
-            if (resp.success) {
-              const data = resp.data
-              this.queryParams.total = data.total
-              this.dataList = data.records
-              this.dialogVisible2 = true
-            } else {
-              // 根据resp.code进行异常情况处理
-              this.dataList = []
-              this.queryParams.total = 0
-            }
-
-          })
-          .catch(e => {})
-
-
+          if (resp.success) {
+            const data = resp.data
+            this.queryParams.total = data.total
+            this.dataList = data.records
+            this.dialogVisible2 = true
+          } else {
+            // 根据resp.code进行异常情况处理
+            this.dataList = []
+            this.queryParams.total = 0
+          }
+        }).catch(e => {
+        })
       },
       delGoods(index) {
-
         this.formobj.asOldpartreturnList.splice(index, 1)
-
       },
       selectionLineChangeHandle(val) {
         this.selectionList = val
       },
-
       addDialogList() {
         this.dialogVisible2 = false
-
         if (this.selectionList.length > 0) {
-
           const choose = this.formobj.asOldpartreturnList.filter((item) => item == this.itemInfo)
-          console.log('>>>>>>>>>addDialogList', choose)
-
           var num = 0
           if (choose != null && choose.length > 0) {
-
             for (var i = 0; i < this.selectionList.length; i++) {
-
               var item = this.selectionList[i]
-
               num += Number(item.count)
             }
             choose[0].actualReturnCount = num
-
           }
-
         }
-
       },
       handleClose2() {
         this.dialogVisible2 = false
       },
       seleGoods3() {
         this.queryParams.params = {
-          "vinNo": '',
-          "goodsSkuCode": '',
-          "sourceBillNo": '',
-          "orgPath": window.sessionStorage.getItem('defaultOrgPath'),
+          vinNo: '',
+          goodsSkuCode: '',
+          sourceBillNo: '',
+          orgPath: window.sessionStorage.getItem('defaultOrgPath')
         }
         req.getGoodsListPage(this.queryParams).then(resp => {
-            if (resp.success) {
-              const data = resp.data
-              this.queryParams.total = data.total
-              this.dataList = data.records
-              this.dialogVisible3 = true
-            } else {
-              // 根据resp.code进行异常情况处理
-              this.dataList = []
-              this.queryParams.total = 0
-            }
-
-          })
-          .catch(e => {})
-
-
+          if (resp.success) {
+            const data = resp.data
+            this.queryParams.total = data.total
+            this.dataList = data.records
+            this.dialogVisible3 = true
+          } else {
+            // 根据resp.code进行异常情况处理
+            this.dataList = []
+            this.queryParams.total = 0
+          }
+        }).catch(e => {
+        })
       },
       selectionLineChangeHandle3(val) {
         this.selectionList3 = val
       },
-
       addDialogList3() {
         this.dialogVisible3 = false
-
         for (var i = 0; i < this.selectionList3.length; i++) {
-
           var item = this.selectionList3[i]
-
           this.formobj.asOldpartreturnList.push({
-            "sid": '',
-            "remarks": '',
-            "mainSid": '',
-            "vinNo": item.vinNo,
-            "goodsSpuSid": item.goodsSpuSid,
-            "goodsSpuName": item.goodsSpuName,
-            "goodsSkuSid": item.goodsSkuSid,
-            "goodsSkuTitle": item.goodsSkuTitle,
-            "goodsSkuCode": item.goodsSkuCode,
-            "goodsSkuOwnSpec": item.goodsSkuOwnSpec,
-            "manufacturerSid": item.manufacturerSid,
-            "manufacturerName": item.manufacturerName,
-            "warehouseSid": item.warehouseSid,
-            "warehouseName": item.warehouseName,
-            "warehouseAreaSid": item.warehouseAreaSid,
-            "warehouseAreaName": item.warehouseAreaName,
-            "warehouseRackSid": item.warehouseRackSid,
-            "warehouseRackName": item.warehouseRackName,
-            "unit": item.unit,
-            "sourceBillNo": item.sourceBillNo,
-            "claimBillNo": '',
-            "isCf": "是",
-            "needReturnCount": item.count,
-            "actualReturnCount": item.count
+            sid: '',
+            remarks: '',
+            mainSid: '',
+            vinNo: item.vinNo,
+            goodsSpuSid: item.goodsSpuSid,
+            goodsSpuName: item.goodsSpuName,
+            goodsSkuSid: item.goodsSkuSid,
+            goodsSkuTitle: item.goodsSkuTitle,
+            goodsSkuCode: item.goodsSkuCode,
+            goodsSkuOwnSpec: item.goodsSkuOwnSpec,
+            manufacturerSid: item.manufacturerSid,
+            manufacturerName: item.manufacturerName,
+            warehouseSid: item.warehouseSid,
+            warehouseName: item.warehouseName,
+            warehouseAreaSid: item.warehouseAreaSid,
+            warehouseAreaName: item.warehouseAreaName,
+            warehouseRackSid: item.warehouseRackSid,
+            warehouseRackName: item.warehouseRackName,
+            unit: item.unit,
+            sourceBillNo: item.sourceBillNo,
+            claimBillNo: '',
+            isCf: '是',
+            needReturnCount: item.count,
+            actualReturnCount: item.count
           })
         }
-
-
       },
       handleClose3() {
         this.dialogVisible3 = false
-      },
-
+      }
     }
   }
 </script>
 <style scoped>
-  /deep/ .el-form-item__error {
-    margin-left: 120px !important;
-  }
-
-  .must {
-    color: #f00;
-  }
-
-  .span-sty {
-    width: 130px !important;
-  }
-
-  .addinputInfo {
-    margin-left: 120px !important;
-  }
-
-  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
-    margin-left: 120px !important;
-    width: calc(100% - 115px);
-  }
-
-  .first_row {
-    border-top: 1px solid #E0E3EB;
-  }
-
-  .titleOne {
-    padding: 7px;
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    align-items: center;
-  }
+/deep/ .el-form-item__error {
+  margin-left: 120px !important;
+}
+
+.must {
+  color: #f00;
+}
+
+.span-sty {
+  width: 130px !important;
+}
+
+.addinputInfo {
+  margin-left: 120px !important;
+}
+
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+  margin-left: 120px !important;
+  width: calc(100% - 115px);
+}
+
+.first_row {
+  border-top: 1px solid #E0E3EB;
+}
+
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
 </style>
diff --git a/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryInfo.vue b/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryInfo.vue
index db5cef2f15..f3a66f9ad8 100644
--- a/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryInfo.vue
+++ b/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryInfo.vue
@@ -1,29 +1,14 @@
 <template>
-  <div>
-
+  <div class="app-container">
     <div class="tab-header webtop">
-      <!-- 标题 -->
       <div>旧件返厂</div>
-      <!-- start 添加修改按钮 -->
       <div>
         <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
       </div>
-      <!-- end 添加修改按钮 -->
-      <!-- end 详情按钮 -->
     </div>
-
     <div class="listconadd">
-
       <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
-        <!-- <div class="title">
-          <div>基础信息</div>
-        </div> -->
         <el-row class="first_row">
-
-          <!--  <el-col :span="12">
-           <div class="span-sty">单据编号</div>
-           <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
-         </el-col> -->
           <el-col :span="8">
             <div class="span-sty">申请人</div>
             <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
@@ -32,147 +17,88 @@
             <div class="span-sty">申请部门</div>
             <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
           </el-col>
-
           <el-col :span="8">
             <div class="span-sty">申请日期</div>
             <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
           </el-col>
-        </el-row>
-        <!-- <el-row>
-
-          <el-col :span="12">
-            <div class="span-sty">分公司</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.useOrgName }}</span></el-form-item>
-          </el-col>
-
-
         </el-row>
-        <el-row>
-
-          <el-col :span="12">
-            <div class="span-sty">流程状态</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.nodeState }}</span></el-form-item>
-          </el-col>
-
-        </el-row> -->
-
-
         <el-row>
           <el-col :span="24">
             <div class="span-sty">附件</div>
             <el-form-item class="trightb_item">
-              <el-image style="width: 120px;height: 120px; margin: 10px;" class="addinputInfo"
-                v-for="(item,index) in formobj.filePaths" :src="item" :preview-src-list="[item]">
+              <el-image style="width: 120px;height: 120px; margin: 10px;" class="addinputInfo" v-for="(item, index) in formobj.filePaths" :key="index" :src="item" :preview-src-list="[item]">
               </el-image>
             </el-form-item>
           </el-col>
-
         </el-row>
-
         <el-row>
-
           <el-col :span="24">
             <div class="span-sty">备注</div>
             <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
           </el-col>
-
         </el-row>
-
-        <div class="title"
-          style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
-          <div>商品列表</div>
-        </div>
-        <el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;"
-          :row-style="{height: '40px'}">
-          <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-          <el-table-column label="商品名称" prop="goodsSpuName" align="center" />
-          <el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
-          <el-table-column label="厂家" prop="manufacturerName" align="center" />
-          <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
-          <el-table-column label="单位" prop="unit" align="center" />
-          <el-table-column label="车架号" prop="vinNo" align="center" />
-          <el-table-column label="维修单号" prop="sourceBillNo" align="center" />
-          <el-table-column label="索赔单号" prop="claimBillNo" align="center" />
-          <el-table-column label="需返厂数量" prop="needReturnCount" align="center" />
-          <el-table-column label="实际返厂数量" prop="actualReturnCount" align="center" />
-          <el-table-column label="差异说明" prop="remarks" align="center" />
-          <el-table-column label="是否迟返" prop="isCf" align="center" />
+        <div class="title">商品列表</div>
+        <el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;" :row-style="{height: '40px'}">
+          <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
+          <el-table-column label="商品名称" prop="goodsSpuName" align="center"/>
+          <el-table-column label="图号" prop="goodsSkuCode" align="center"/>
+          <el-table-column label="厂家" prop="manufacturerName" align="center"/>
+          <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center"/>
+          <el-table-column label="单位" prop="unit" align="center"/>
+          <el-table-column label="车架号" prop="vinNo" align="center"/>
+          <el-table-column label="维修单号" prop="sourceBillNo" align="center"/>
+          <el-table-column label="索赔单号" prop="claimBillNo" align="center"/>
+          <el-table-column label="需返厂数量" prop="needReturnCount" align="center"/>
+          <el-table-column label="实际返厂数量" prop="actualReturnCount" align="center"/>
+          <el-table-column label="差异说明" prop="remarks" align="center"/>
+          <el-table-column label="是否迟返" prop="isCf" align="center"/>
         </el-table>
-
       </el-form>
-
     </div>
-
-
   </div>
 </template>
 
 <script>
-  import req from '@/api/storage/oldPartsFactory.js'
-
-  export default {
-    components: {},
-    data() {
-      return {
-        listLoading: false,
-        submitdisabled: false,
-        formobj: {},
-      }
+import req from '@/api/storage/oldPartsFactory.js'
+
+export default {
+  components: {},
+  data() {
+    return {
+      listLoading: false,
+      submitdisabled: false,
+      formobj: {}
+    }
+  },
+  methods: {
+    indexMethod(index) {
+      return index + 1
     },
-    methods: {
-      indexMethod(index) {
-        return index + 1
-      },
-
-      handleReturn(isreload) {
-        if (isreload === 'true') this.$emit('reloadlist')
-        this.$emit('doback')
-      },
-
-      showAdd() {
-
-      },
-      showEdit(row) {
 
-        var params = {
-          sid: row.sid
+    handleReturn() {
+      this.formobj = {}
+      this.$emit('doback')
+    },
+    showEdit(row) {
+      req.init(row.sid).then(resp => {
+        if (resp.success) {
+          this.formobj = resp.data
         }
-        req.init(row.sid)
-          .then(resp => {
-            if (resp.success) {
-              this.formobj = resp.data
-            }
-          })
-          .catch(e => {
-            this.formobj = {}
-          })
-      }
+      }).catch(e => {
+        this.formobj = {}
+      })
     }
   }
+}
 </script>
 <style scoped>
-  .span-sty {
-    width: 130px !important;
-  }
-
-  .addinputInfo {
-    margin-left: 120px !important;
-  }
-
-  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
-    margin-left: 120px !important;
-    width: calc(100% - 115px);
-  }
-
-  .first_row {
-    border-top: 1px solid #E0E3EB;
-  }
-
-  .titleOne {
-    padding: 7px;
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    align-items: center;
-  }
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+.first_row {
+  border-top: 1px solid #E0E3EB;
+}
 </style>
diff --git a/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryDaiBan.vue b/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryDaiBan.vue
index 19931755e0..774b1a5c81 100644
--- a/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryDaiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryDaiBan.vue
@@ -31,35 +31,28 @@
               <div class="span-sty">备注</div>
               <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
             </el-col>
-
           </el-row>
           <el-row>
             <el-col :span="24">
               <div class="span-sty">附件</div>
               <el-form-item class="trightb_item">
-                <el-image style="width: 120px;height: 120px; margin: 10px;" class="addinputInfo"
-                  v-for="(item,index) in formobj.filePaths" :src="item" :preview-src-list="[item]">
+                <el-image style="width: 120px;height: 120px; margin: 10px;" class="addinputInfo" v-for="(item, index) in formobj.filePaths" :key="index" :src="item" :preview-src-list="[item]">
                 </el-image>
               </el-form-item>
             </el-col>
           </el-row>
-          <div class="title"
-            style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
-            <div>商品列表</div>
-          </div>
-          <el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;"
-            :row-style="{height: '40px'}">
-            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-            <el-table-column label="商品名称" prop="goodsSkuName" align="center" />
-            <el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
-            <el-table-column label="厂家" prop="manufacturerName" align="center" />
-            <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
-            <el-table-column label="单位" prop="unit" align="center" />
-            <el-table-column label="需返厂数量" prop="needReturnCount" align="center" />
-            <el-table-column label="实际返厂数量" prop="actualReturnCount" align="center" />
-            <el-table-column label="差异说明" prop="remarks" align="center" />
+          <div class="title">商品列表</div>
+          <el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;" :row-style="{height: '40px'}">
+            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="商品名称" prop="goodsSkuName" align="center"/>
+            <el-table-column label="图号" prop="goodsSkuCode" align="center"/>
+            <el-table-column label="厂家" prop="manufacturerName" align="center"/>
+            <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center"/>
+            <el-table-column label="单位" prop="unit" align="center"/>
+            <el-table-column label="需返厂数量" prop="needReturnCount" align="center"/>
+            <el-table-column label="实际返厂数量" prop="actualReturnCount" align="center"/>
+            <el-table-column label="差异说明" prop="remarks" align="center"/>
           </el-table>
-
         </el-form>
       </div>
     </div>
@@ -92,8 +85,9 @@
             <span>意见:</span>
           </el-col>
           <el-col :span="20">
-            <el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw"
-                type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable></el-input></el-form-item>
+            <el-form-item>
+              <el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable></el-input>
+            </el-form-item>
           </el-col>
         </el-row>
         <div style="text-align:center;margin-top: 20px;">
@@ -106,339 +100,335 @@
 </template>
 
 <script>
-  import req from '@/api/storage/oldPartsFactory'
-  import {
-    selectStaffListss
-  } from '@/api/Common/dictcommons'
+import req from '@/api/storage/oldPartsFactory'
+import { selectStaffListss } from '@/api/Common/dictcommons'
 
-  export default {
-    name: 'WorkSLRSettlementDaiBan',
-    data() {
-      return {
-        viewTitle: '',
-        viewState: 1,
-        submitdisabled: false,
-        tableKey: 0,
-        index: 0,
-        formobj: {
-          "sid": "",
-          "remarks": "",
-          "createBySid": '',
-          "createByName": '',
-          "deptSid": '',
-          "deptName": '',
-          "createTime": "",
-          "billNo": "",
-          "filePaths": [],
-          "useOrgSid": '',
-          "useOrgName": '',
-          "orgSidPath": '',
-          "procDefId": "",
-          "nodeId": "",
-          "procInstId": "",
-          "nodeState": "",
-          "taskId": "",
-          "finishTime": "",
-          "asOldpartreturnList": [
+export default {
+  name: 'WorkSLRSettlementDaiBan',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      tableKey: 0,
+      index: 0,
+      formobj: {
+        sid: '',
+        remarks: '',
+        createBySid: '',
+        createByName: '',
+        deptSid: '',
+        deptName: '',
+        createTime: '',
+        billNo: '',
+        filePaths: [],
+        useOrgSid: '',
+        useOrgName: '',
+        orgSidPath: '',
+        procDefId: '',
+        nodeId: '',
+        procInstId: '',
+        nodeState: '',
+        taskId: '',
+        finishTime: '',
+        asOldpartreturnList: []
+      },
+      rules: {},
+      options: [],
+      operation: '', // 点击操作按钮
+      dialogList: {
+        comment: ''
+      },
+      startTask: true,
+      current: {
+        taskDefKey: '',
+        taskName: '' // 当前环节名称
+      },
+      nextNode: {}, // 下一环节
+      nodeDialogVisible: false,
+      currentLink: true,
+      countersignLink: false,
+      // 环节所需参数
+      linkByParameter: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        orgSidPath: '',
+        taskDefKey: '',
+        userSid: ''
+      },
+      // 加签按钮所需参数
+      countersign: {
+        taskId: '',
+        assignee: '',
+        userSid: '',
+        instanceId: '',
+        views: ''
+      }
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    console.log('iframe页面获取的obj:', obj)
+    // 点击（同意、终止、驳回、驳回）操作时所需的参数
+    this.linkByParameter.businessSid = obj.businessSid
+    this.linkByParameter.instanceId = obj.instanceId
+    this.linkByParameter.taskId = obj.taskId
+    this.linkByParameter.taskDefKey = obj.taskDefKey
+    // this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+    this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
+    this.current.taskDefKey = obj.taskDefKey
+    this.current.taskName = obj.taskName
+    // 加签参数
+    this.countersign.taskId = obj.taskId
+    this.countersign.userSid = window.sessionStorage.getItem('userSid')
+    this.countersign.instanceId = obj.instanceId
+    // 加载表单数据
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 500 + 'px'
+      }
+    }, '*')
+  },
 
-          ]
-        },
-        rules: {},
-        options: [],
-        operation: '', // 点击操作按钮
-        dialogList: {
-          comment: ''
-        },
-        startTask: true,
-        current: {
-          taskDefKey: '',
-          taskName: '' // 当前环节名称
-        },
-        nextNode: {}, // 下一环节
-        nodeDialogVisible: false,
-        currentLink: true,
-        countersignLink: false,
-        // 环节所需参数
-        linkByParameter: {
-          businessSid: '',
-          comment: '',
-          instanceId: '',
-          taskId: '',
-          orgSidPath: '',
-          taskDefKey: '',
-          userSid: ''
-        },
-        // 加签按钮所需参数
-        countersign: {
-          taskId: '',
-          assignee: '',
-          userSid: '',
-          instanceId: '',
-          views: ''
+  methods: {
+    showInfo(sid) {
+      this.viewTitle = '旧件返厂申请详情'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid(sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
         }
-      }
+      })
+      selectStaffListss().then((res) => {
+        if (res.success) {
+          this.options = res.data
+        }
+      })
     },
-    created() {
-      console.log('url:' + window.location.href)
-      var one = window.location.href.indexOf('&data') + 6
-      const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
-      const obj = JSON.parse(decodeURIComponent(data))
-      console.log('iframe页面获取的obj:', obj)
-      // 点击（同意、终止、驳回、驳回）操作时所需的参数
-      this.linkByParameter.businessSid = obj.businessSid
-      this.linkByParameter.instanceId = obj.instanceId
-      this.linkByParameter.taskId = obj.taskId
-      this.linkByParameter.taskDefKey = obj.taskDefKey
-      // this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
-      this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
-      this.current.taskDefKey = obj.taskDefKey
-      this.current.taskName = obj.taskName
-      // 加签参数
-      this.countersign.taskId = obj.taskId
-      this.countersign.userSid = window.sessionStorage.getItem('userSid')
-      this.countersign.instanceId = obj.instanceId
-      // 加载表单数据
-      this.showInfo(obj.businessSid)
+    // 加签
+    openCountersign(val) {
+      this.operation = val
+      this.currentLink = true
+      this.countersignLink = true
+      this.dialogList.comment = ''
+      req.getNextNodesForSubmit({
+        taskDefKey: this.current.taskDefKey,
+        businessSid: this.linkByParameter.businessSid
+      }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
     },
-    mounted() {
-      window.parent.postMessage({
-        cmd: 'returnHeight',
-        params: {
-          // 告诉父级页面，子页面的弹框高度。
-          code: 2,
-          data: 500 + 'px'
+    // 同意
+    openAgree(val) {
+      this.operation = val
+      this.currentLink = true
+      this.countersignLink = false
+      this.dialogList.comment = '同意'
+      req.getNextNodesForSubmit({
+        taskDefKey: this.current.taskDefKey,
+        businessSid: this.linkByParameter.businessSid
+      }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
         }
-      }, '*')
+        this.submitdisabled = false
+      })
     },
-
-    methods: {
-      showInfo(sid) {
-        this.viewTitle = '旧件返厂申请详情'
-        this.$nextTick(() => {
-          this.$refs['form_obj'].clearValidate()
-        })
-        req.fetchBySid(sid).then((res) => {
-          if (res.success) {
-            this.formobj = res.data
-          }
-        })
-        selectStaffListss().then((res) => {
-          if (res.success) {
-            this.options = res.data
-          }
-        })
-      },
-      // 加签
-      openCountersign(val) {
-        this.operation = val
-        this.currentLink = true
-        this.countersignLink = true
-        this.dialogList.comment = ''
-        req.getNextNodesForSubmit({
-          taskDefKey: this.current.taskDefKey,
-          businessSid: this.linkByParameter.businessSid
-        }).then((resp) => {
-          if (resp.success) {
-            var arr = resp.data
-            this.nextNode = arr[0]
-            this.nodeDialogVisible = true
-          }
-          this.submitdisabled = false
-        })
-      },
-      // 同意
-      openAgree(val) {
-        this.operation = val
-        this.currentLink = true
-        this.countersignLink = false
-        this.dialogList.comment = '同意'
-        req.getNextNodesForSubmit({
-          taskDefKey: this.current.taskDefKey,
-          businessSid: this.linkByParameter.businessSid
-        }).then((resp) => {
-          if (resp.success) {
-            var arr = resp.data
-            this.nextNode = arr[0]
-            this.nodeDialogVisible = true
-          }
-          this.submitdisabled = false
-        })
-      },
-      // 驳回
-      openReject(val) {
-        this.operation = val
-        this.currentLink = true
-        this.countersignLink = false
-        this.dialogList.comment = ''
-        req.getPreviousNodesForReject({
-          taskDefKey: this.current.taskDefKey,
-          businessSid: this.linkByParameter.businessSid
-        }).then((resp) => {
-          if (resp.success) {
-            var arr = resp.data
-            this.nextNode = arr[0]
-            this.nodeDialogVisible = true
-          }
-          this.submitdisabled = false
-        })
-      },
-      // 终止
-      openStop(val) {
-        this.operation = val
-        this.currentLink = false
-        this.countersignLink = false
-        this.dialogList.comment = ''
-        this.nodeDialogVisible = true
-      },
-      reject() {
-        if (this.operation === '同意') {
-          this.handleAgree()
-        } else if (this.operation === '驳回') {
-          if (this.dialogList.comment === '') {
-            this.$message({
-              showClose: true,
-              type: 'error',
-              message: '请填写审批意见'
-            })
-          } else {
-            this.handleReject()
-          }
-        } else if (this.operation === '终止') {
-          if (this.dialogList.comment === '') {
-            this.$message({
-              showClose: true,
-              type: 'error',
-              message: '请填写审批意见'
-            })
-          } else {
-            this.handleStop()
-          }
-        } else if (this.operation === '加签') {
-          this.handleCountersign()
+    // 驳回
+    openReject(val) {
+      this.operation = val
+      this.currentLink = true
+      this.countersignLink = false
+      this.dialogList.comment = ''
+      req.getPreviousNodesForReject({
+        taskDefKey: this.current.taskDefKey,
+        businessSid: this.linkByParameter.businessSid
+      }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
         }
-      },
-      /** 加签 */
-      handleCountersign() {
-        if (this.countersign.assignee === '') {
+        this.submitdisabled = false
+      })
+    },
+    // 终止
+    openStop(val) {
+      this.operation = val
+      this.currentLink = false
+      this.countersignLink = false
+      this.dialogList.comment = ''
+      this.nodeDialogVisible = true
+    },
+    reject() {
+      if (this.operation === '同意') {
+        this.handleAgree()
+      } else if (this.operation === '驳回') {
+        if (this.dialogList.comment === '') {
           this.$message({
             showClose: true,
             type: 'error',
-            message: '请选择加签人员'
+            message: '请填写审批意见'
           })
-          return
+        } else {
+          this.handleReject()
         }
+      } else if (this.operation === '终止') {
         if (this.dialogList.comment === '') {
           this.$message({
             showClose: true,
             type: 'error',
             message: '请填写审批意见'
           })
-          return
+        } else {
+          this.handleStop()
         }
-        this.countersign.views = this.dialogList.comment
-        req.delegate(this.countersign).then((response) => {
-          if (response.success) {
-            this.$notify({
-              title: '提示',
-              message: '执行成功',
-              type: 'success',
-              duration: 2000
-            })
-            this.nodeDialogVisible = false
-            // 子页面向父级页面传递值
-            window.parent.postMessage({
-              cmd: 'returnHeight',
-              params: {
-                // 操作成功，告诉父级页面关闭弹框
-                code: 1
-              }
-            }, '*')
-          }
-        })
-      },
-      /** 同意任务 */
-      handleAgree() {
-        this.linkByParameter.comment = this.dialogList.comment
-        req.complete(this.linkByParameter).then((response) => {
-          if (response.success) {
-            this.$notify({
-              title: '提示',
-              message: '执行成功',
-              type: 'success',
-              duration: 2000
-            })
-            this.nodeDialogVisible = false
-            // 子页面向父级页面传递值
-            window.parent.postMessage({
-              cmd: 'returnHeight',
-              params: {
-                // 操作成功，告诉父级页面关闭弹框
-                code: 1
-              }
-            }, '*')
-          }
-        })
-      },
-      /** 驳回任务 */
-      handleReject() {
-        this.linkByParameter.comment = this.dialogList.comment
-        req.reject(this.linkByParameter).then((response) => {
-          if (response.success) {
-            this.$notify({
-              title: '提示',
-              message: '执行成功',
-              type: 'success',
-              duration: 2000
-            })
-            this.nodeDialogVisible = false
-            // 子页面向父级页面传递值
-            window.parent.postMessage({
-              cmd: 'returnHeight',
-              params: {
-                // 操作成功，告诉父级页面关闭弹框
-                code: 1
-              }
-            }, '*')
-          }
+      } else if (this.operation === '加签') {
+        this.handleCountersign()
+      }
+    },
+    /** 加签 */
+    handleCountersign() {
+      if (this.countersign.assignee === '') {
+        this.$message({
+          showClose: true,
+          type: 'error',
+          message: '请选择加签人员'
         })
-      },
-      /** 终止任务 */
-      handleStop() {
-        this.linkByParameter.comment = this.dialogList.comment
-        req.breakProcess(this.linkByParameter).then((response) => {
-          if (response.success) {
-            this.$notify({
-              title: '提示',
-              message: '执行成功',
-              type: 'success',
-              duration: 2000
-            })
-            this.nodeDialogVisible = false
-            // 子页面向父级页面传递值
-            window.parent.postMessage({
-              cmd: 'returnHeight',
-              params: {
-                // 操作成功，告诉父级页面关闭弹框
-                code: 1
-              }
-            }, '*')
-          }
+        return
+      }
+      if (this.dialogList.comment === '') {
+        this.$message({
+          showClose: true,
+          type: 'error',
+          message: '请填写审批意见'
         })
+        return
       }
+      this.countersign.views = this.dialogList.comment
+      req.delegate(this.countersign).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 同意任务 */
+    handleAgree() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.complete(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 驳回任务 */
+    handleReject() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.reject(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 终止任务 */
+    handleStop() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.breakProcess(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
     }
   }
+}
 </script>
 
 <style scoped>
-  .span-sty {
-    width: 130px !important;
-  }
+.span-sty {
+  width: 130px !important;
+}
 
-  .addinputInfo {
-    margin-left: 120px !important;
-  }
+.addinputInfo {
+  margin-left: 120px !important;
+}
 
-  .rowClass {
-    border-top: 1px solid #E0E3EB;
-  }
+.rowClass {
+  border-top: 1px solid #E0E3EB;
+}
 </style>
diff --git a/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryEdit.vue b/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryEdit.vue
index 4a1c1b1b74..2f92dbe6a9 100644
--- a/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryEdit.vue
+++ b/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryEdit.vue
@@ -29,35 +29,27 @@
               <div class="span-sty">备注</div>
               <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
             </el-col>
-
           </el-row>
           <el-row>
             <el-col :span="24">
               <div class="span-sty">附件</div>
               <el-form-item class="trightb_item">
-                <el-image style="width: 120px;height: 120px; margin: 10px;" class="addinputInfo"
-                  v-for="(item,index) in formobj.filePaths" :src="item" :preview-src-list="[item]">
-                </el-image>
+                <el-image style="width: 120px;height: 120px; margin: 10px;" class="addinputInfo" v-for="(item, index) in formobj.filePaths" :key="index" :src="item" :preview-src-list="[item]"></el-image>
               </el-form-item>
             </el-col>
           </el-row>
-          <div class="title"
-            style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
-            <div>商品列表</div>
-          </div>
-          <el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;"
-            :row-style="{height: '40px'}">
-            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-            <el-table-column label="商品名称" prop="goodsSkuName" align="center" />
-            <el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
-            <el-table-column label="厂家" prop="manufacturerName" align="center" />
-            <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
-            <el-table-column label="单位" prop="unit" align="center" />
-            <el-table-column label="需返厂数量" prop="needReturnCount" align="center" />
-            <el-table-column label="实际返厂数量" prop="actualReturnCount" align="center" />
-            <el-table-column label="差异说明" prop="remarks" align="center" />
+          <div class="title">商品列表</div>
+          <el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;" :row-style="{height: '40px'}">
+            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column label="商品名称" prop="goodsSkuName" align="center"/>
+            <el-table-column label="商品编码" prop="goodsSkuCode" align="center"/>
+            <el-table-column label="厂家" prop="manufacturerName" align="center"/>
+            <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center"/>
+            <el-table-column label="单位" prop="unit" align="center"/>
+            <el-table-column label="需返厂数量" prop="needReturnCount" align="center"/>
+            <el-table-column label="实际返厂数量" prop="actualReturnCount" align="center"/>
+            <el-table-column label="差异说明" prop="remarks" align="center"/>
           </el-table>
-
         </el-form>
       </div>
     </div>
@@ -65,145 +57,137 @@
 </template>
 
 <script>
-  import req from '@/api/storage/oldPartsFactory'
-
-  export default {
-    name: 'WorkSLRSettlementEdit',
-    data() {
-      return {
-        viewTitle: '',
-        viewState: 1,
-        submitdisabled: false,
-        tableKey: 0,
-        index: 0,
-        // service服务
-        serviceKey: 1,
-        // subjoin附加项目
-        subjoinKey: 2,
-        formobj: {
-          "sid": "",
-          "remarks": "",
-          "createBySid": '',
-          "createByName": '',
-          "deptSid": '',
-          "deptName": '',
-          "createTime": "",
-          "billNo": "",
-          "filePaths": [],
-          "useOrgSid": '',
-          "useOrgName": '',
-          "orgSidPath": '',
-          "procDefId": "",
-          "nodeId": "",
-          "procInstId": "",
-          "nodeState": "",
-          "taskId": "",
-          "finishTime": "",
-          "asOldpartreturnList": [
+import req from '@/api/storage/oldPartsFactory'
 
-          ]
-        },
-        rules: {}
+export default {
+  name: 'WorkSLRSettlementEdit',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      tableKey: 0,
+      index: 0,
+      formobj: {
+        sid: '',
+        remarks: '',
+        createBySid: '',
+        createByName: '',
+        deptSid: '',
+        deptName: '',
+        createTime: '',
+        billNo: '',
+        filePaths: [],
+        useOrgSid: '',
+        useOrgName: '',
+        orgSidPath: '',
+        procDefId: '',
+        nodeId: '',
+        procInstId: '',
+        nodeState: '',
+        taskId: '',
+        finishTime: '',
+        asOldpartreturnList: []
+      },
+      rules: {}
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 500 + 'px'
       }
-    },
-    created() {
-      console.log('url:' + window.location.href)
-      var one = window.location.href.indexOf('&data') + 6
-      const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
-      const obj = JSON.parse(decodeURIComponent(data))
-      this.showInfo(obj.businessSid)
-    },
-    mounted() {
-      window.parent.postMessage({
-        cmd: 'returnHeight',
-        params: {
-          // 告诉父级页面，子页面的弹框高度。
-          code: 2,
-          data: 500 + 'px'
+    }, '*')
+  },
+  computed: {},
+  methods: {
+    showInfo(sid) {
+      this.viewTitle = '【编辑】旧件返厂申请'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid(sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
         }
-      }, '*')
-    },
-    computed: {
-
+      })
     },
-    methods: {
-      showInfo(sid) {
-        this.viewTitle = '【编辑】旧件返厂申请'
-        this.$nextTick(() => {
-          this.$refs['form_obj'].clearValidate()
-        })
-        req.fetchBySid(sid).then((res) => {
-          if (res.success) {
-            this.formobj = res.data
-          }
-        })
-      },
-      saveOrUpdate() {
-        this.$refs['form_obj'].validate((valid) => {
-          if (valid) {
-            this.submitdisabled = true
-            req.saveOrUpdate(this.formobj).then((res) => {
-              if (res.success) {
-                this.$message({
-                  showClose: true,
-                  type: 'success',
-                  message: '保存成功'
-                })
-                // 子页面向父级页面传递值(关闭弹框)
-                window.parent.postMessage({
-                  cmd: 'returnHeight',
-                  params: {
-                    // 操作成功，告诉父级页面关闭弹框
-                    code: 1
-                  }
-                }, '*')
-              } else {
-                this.submitdisabled = false
-              }
-            }).catch(() => {
+    saveOrUpdate() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.saveOrUpdate(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: '保存成功'
+              })
+              // 子页面向父级页面传递值(关闭弹框)
+              window.parent.postMessage({
+                cmd: 'returnHeight',
+                params: {
+                  // 操作成功，告诉父级页面关闭弹框
+                  code: 1
+                }
+              }, '*')
+            } else {
               this.submitdisabled = false
-            })
-          }
-        })
-      },
-      submit() {
-        this.$refs['form_obj'].validate((valid) => {
-          if (valid) {
-            this.submitdisabled = true
-            req.submit(this.formobj).then((res) => {
-              if (res.success) {
-                this.$message({
-                  showClose: true,
-                  type: 'success',
-                  message: '提交成功'
-                })
-                // 子页面向父级页面传递值(关闭弹框)
-                window.parent.postMessage({
-                  cmd: 'returnHeight',
-                  params: {
-                    // 操作成功，告诉父级页面关闭弹框
-                    code: 1
-                  }
-                }, '*')
-              } else {
-                this.submitdisabled = false
-              }
-            }).catch(() => {
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    },
+    submit() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.submit(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: '提交成功'
+              })
+              // 子页面向父级页面传递值(关闭弹框)
+              window.parent.postMessage({
+                cmd: 'returnHeight',
+                params: {
+                  // 操作成功，告诉父级页面关闭弹框
+                  code: 1
+                }
+              }, '*')
+            } else {
               this.submitdisabled = false
-            })
-          }
-        })
-      }
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
     }
   }
+}
 </script>
 
 <style scoped>
-  .span-sty {
-    width: 130px !important;
-  }
+.span-sty {
+  width: 130px !important;
+}
 
-  .addinputInfo {
-    margin-left: 120px !important;
-  }
+.addinputInfo {
+  margin-left: 120px !important;
+}
 </style>
diff --git a/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryYiBan.vue b/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryYiBan.vue
index 84a184044e..8752ecc0d9 100644
--- a/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryYiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryYiBan.vue
@@ -28,35 +28,28 @@
               <div class="span-sty">备注</div>
               <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
             </el-col>
-
           </el-row>
           <el-row>
             <el-col :span="24">
               <div class="span-sty">附件</div>
               <el-form-item class="trightb_item">
-                <el-image style="width: 120px;height: 120px; margin: 10px;" class="addinputInfo"
-                  v-for="(item,index) in formobj.filePaths" :src="item" :preview-src-list="[item]">
+                <el-image style="width: 120px;height: 120px; margin: 10px;" class="addinputInfo" v-for="(item, index) in formobj.filePaths" :key="index" :src="item" :preview-src-list="[item]">
                 </el-image>
               </el-form-item>
             </el-col>
           </el-row>
-          <div class="title"
-            style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
-            <div>商品列表</div>
-          </div>
-          <el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;"
-            :row-style="{height: '40px'}">
-            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-            <el-table-column label="商品名称" prop="goodsSkuName" align="center" />
-            <el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
-            <el-table-column label="厂家" prop="manufacturerName" align="center" />
-            <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
-            <el-table-column label="单位" prop="unit" align="center" />
-            <el-table-column label="需返厂数量" prop="needReturnCount" align="center" />
-            <el-table-column label="实际返厂数量" prop="actualReturnCount" align="center" />
-            <el-table-column label="差异说明" prop="remarks" align="center" />
+          <div class="title">>商品列表</div>
+          <el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;" :row-style="{height: '40px'}">
+            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column label="商品名称" prop="goodsSkuName" align="center"/>
+            <el-table-column label="商品编码" prop="goodsSkuCode" align="center"/>
+            <el-table-column label="厂家" prop="manufacturerName" align="center"/>
+            <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center"/>
+            <el-table-column label="单位" prop="unit" align="center"/>
+            <el-table-column label="需返厂数量" prop="needReturnCount" align="center"/>
+            <el-table-column label="实际返厂数量" prop="actualReturnCount" align="center"/>
+            <el-table-column label="差异说明" prop="remarks" align="center"/>
           </el-table>
-
         </el-form>
       </div>
     </div>
@@ -64,151 +57,143 @@
 </template>
 
 <script>
-  import req from '@/api/storage/oldPartsFactory'
+import req from '@/api/storage/oldPartsFactory'
 
-  export default {
-    name: 'WorkSLRSettlementYiBan',
-    data() {
-      return {
-        viewTitle: '',
-        viewState: 1,
-        submitdisabled: false,
-        tableKey: 0,
-        index: 0,
-        // service服务
-        serviceKey: 1,
-        // subjoin附加项目
-        subjoinKey: 2,
-        formobj: {
-          "sid": "",
-          "remarks": "",
-          "createBySid": '',
-          "createByName": '',
-          "deptSid": '',
-          "deptName": '',
-          "createTime": "",
-          "billNo": "",
-          "filePaths": [],
-          "useOrgSid": '',
-          "useOrgName": '',
-          "orgSidPath": '',
-          "procDefId": "",
-          "nodeId": "",
-          "procInstId": "",
-          "nodeState": "",
-          "taskId": "",
-          "finishTime": "",
-          "asOldpartreturnList": [
-
-          ]
-        },
-        rules: {},
-        // 环节所需参数
-        linkByParameter: {
-          businessSid: '',
-          comment: '',
-          instanceId: '',
-          taskId: '',
-          orgSidPath: '',
-          taskDefKey: '',
-          userSid: ''
-        }
+export default {
+  name: 'WorkSLRSettlementYiBan',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      tableKey: 0,
+      index: 0,
+      formobj: {
+        sid: '',
+        remarks: '',
+        createBySid: '',
+        createByName: '',
+        deptSid: '',
+        deptName: '',
+        createTime: '',
+        billNo: '',
+        filePaths: [],
+        useOrgSid: '',
+        useOrgName: '',
+        orgSidPath: '',
+        procDefId: '',
+        nodeId: '',
+        procInstId: '',
+        nodeState: '',
+        taskId: '',
+        finishTime: '',
+        asOldpartreturnList: []
+      },
+      rules: {},
+      // 环节所需参数
+      linkByParameter: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        orgSidPath: '',
+        taskDefKey: '',
+        userSid: ''
       }
-    },
-    created() {
-      console.log('url:' + window.location.href)
-      var one = window.location.href.indexOf('&data') + 6
-      const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
-      const obj = JSON.parse(decodeURIComponent(data))
-      console.log('iframe页面获取的obj:', obj)
-      // 点击（同意、终止、驳回、驳回）操作时所需的参数
-      this.linkByParameter.businessSid = obj.businessSid
-      this.linkByParameter.instanceId = obj.instanceId
-      this.linkByParameter.taskId = obj.taskId
-      this.linkByParameter.taskDefKey = obj.taskDefKey
-      this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
-      // 加载表单数据
-      this.showInfo(obj.businessSid)
-    },
-    mounted() {
-      window.parent.postMessage({
-        cmd: 'returnHeight',
-        params: {
-          // 告诉父级页面，子页面的弹框高度。
-          code: 2,
-          data: 500 + 'px'
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    console.log('iframe页面获取的obj:', obj)
+    // 点击（同意、终止、驳回、驳回）操作时所需的参数
+    this.linkByParameter.businessSid = obj.businessSid
+    this.linkByParameter.instanceId = obj.instanceId
+    this.linkByParameter.taskId = obj.taskId
+    this.linkByParameter.taskDefKey = obj.taskDefKey
+    this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
+    // 加载表单数据
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 500 + 'px'
+      }
+    }, '*')
+  },
+  computed: {},
+  methods: {
+    showInfo(sid) {
+      this.viewTitle = '旧件返厂申请详情'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid(sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          if (this.formobj.sitemVos.length > 0) {
+            this.formobj.sitemVos.forEach((e) => {
+              if (e.staffNameList.length > 0) {
+                e.repairerName = e.staffNameList.join(',')
+              }
+            })
+          }
         }
-      }, '*')
+      })
     },
-    computed: {
-
-    },
-    methods: {
-      showInfo(sid) {
-        this.viewTitle = '旧件返厂申请详情'
-        this.$nextTick(() => {
-          this.$refs['form_obj'].clearValidate()
-        })
-        req.fetchBySid(sid).then((res) => {
-          if (res.success) {
-            this.formobj = res.data
-            if (this.formobj.sitemVos.length > 0) {
-              this.formobj.sitemVos.forEach((e) => {
-                if (e.staffNameList.length > 0) {
-                  e.repairerName = e.staffNameList.join(',')
-                }
-              })
-            }
-          }
+    /** 确认撤回任务 */
+    openRevoke() {
+      this.$confirm('是否确认执行撤回操作', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.handleRevoke()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消撤回'
         })
-      },
-      /** 确认撤回任务 */
-      openRevoke() {
-        this.$confirm('是否确认执行撤回操作', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.handleRevoke()
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消撤回'
+      })
+    },
+    /** 撤回任务 */
+    handleRevoke() {
+      req.revokeProcess(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
           })
-        })
-      },
-      /** 撤回任务 */
-      handleRevoke() {
-        req.revokeProcess(this.linkByParameter).then((response) => {
-          if (response.success) {
-            this.$notify({
-              title: '提示',
-              message: '执行成功',
-              type: 'success',
-              duration: 2000
-            })
-            this.nodeDialogVisible = false
-            // 子页面向父级页面传递值
-            window.parent.postMessage({
-              cmd: 'returnHeight',
-              params: {
-                // 操作成功，告诉父级页面关闭弹框
-                code: 1
-              }
-            }, '*')
-          }
-        })
-      }
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
     }
   }
+}
 </script>
 
 <style scoped>
-  .span-sty {
-    width: 130px !important;
-  }
+.span-sty {
+  width: 130px !important;
+}
 
-  .addinputInfo {
-    margin-left: 120px !important;
-  }
+.addinputInfo {
+  margin-left: 120px !important;
+}
 </style>