diff --git a/yxt-as-ui/src/views/storage/manufacturerconfirm/index.vue b/yxt-as-ui/src/views/storage/manufacturerconfirm/index.vue
index 8cae1408af..352b2c5580 100644
--- a/yxt-as-ui/src/views/storage/manufacturerconfirm/index.vue
+++ b/yxt-as-ui/src/views/storage/manufacturerconfirm/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,481 +51,257 @@
         <!-- 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="100">
               <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" @click="toRelevancy(scope.row)">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column prop="nodeState" label="流程状态" 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="申请人" align="center" />
-            <el-table-column prop="createTime" label="申请日期" 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="nodeState" label="流程状态" 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="申请人" align="center"/>
+            <el-table-column prop="createTime" label="申请日期" 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 ;" @click="showAdjunct(scope.row.filePaths)">查看
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="confirmCount" label="厂家确认数量" width="180" align="center" />
-            <!-- <el-table-column label="厂家确认结果" align="center">
-              <template slot-scope="scope">
-                <div style="color: #1890FF; text-decoration: underline ;" @click="showResult(scope.row)">
-                  {{ scope.row.confirmResult }}
-                </div>
-              </template>
-            </el-table-column> -->
-
+            <el-table-column prop="confirmCount" label="厂家确认数量" width="180" align="center"/>
           </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" />
-
+    <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList"/>
+    <divInfo v-show="viewState == 4" ref="divinfo" @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="dialogVisible3" :before-close="handleClose3">
-      <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">
-                <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-input v-model="orderInfo.remarks" placeholder="" class="addinputw addinputInfo" clearable />
-            </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">
-              <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-form>
-
-      <div class="btn" style="text-align: center; margin-top: 20px;">
-        <el-button type="primary" size="mini" @click="saveResult()">保存</el-button>
-        <el-button type="primary" size="mini" @click="handleClose3()">关闭</el-button>
-      </div>
-    </el-dialog>
-
-
-
   </div>
 </template>
 
 <script>
-  import req from '@/api/storage/manufacturerconfirm.js'
-  import ButtonBar from '@/components/ButtonBar'
-  import Pagination from '@/components/pagination'
-  import pageye from '@/components/pagination/pageye'
-  import divAdd from './manufacturerconfirmAdd.vue'
-  import divInfo from './manufacturerconfirmInfo.vue'
-  import uploadImg from '@/components/uploadFile/uploadImg'
-  export default {
-
-    components: {
-      ButtonBar,
-      Pagination,
-      pageye,
-      divAdd,
-      divInfo,
-      uploadImg
-    },
-    data() {
-      return {
-        dialogVisible: false,
-        dialogVisible2: false,
-        dialogVisible3: false,
-        fileList: [],
-        orderInfo: {
-          filePaths: []
+import req from '@/api/storage/manufacturerconfirm.js'
+import ButtonBar from '@/components/ButtonBar'
+import Pagination from '@/components/pagination'
+import divAdd from './manufacturerconfirmAdd.vue'
+import divInfo from './manufacturerconfirmInfo.vue'
+
+export default {
+
+  components: {
+    ButtonBar,
+    Pagination,
+    divAdd,
+    divInfo
+  },
+  data() {
+    return {
+      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: '厂家确认'
         },
-        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: 'info',
-            size: 'small',
-            icon: 'cross',
-            btnKey: 'doClose',
-            btnLabel: '关闭'
-          }
-        ],
-        queryParams: {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            name: ''
-          }
+        {
+          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: '',
+          confirmResult: '',
+          userSid: '',
+          orgPath: '',
+          menuUrl: ''
+        }
+      },
+      sids: [],
+      selectionList: [],
+      confirmResultsList: [
+        {
+          name: '未确认',
+          sid: '1'
         },
-        sids: [],
-        selectionList: [],
-        confirmResultsList: [{
-            name: "一致",
-            sid: "1"
-          },
-          {
-            name: "不一致",
-            sid: "2"
-          }
-        ],
-        pathList: [],
-        imgList: []
-      }
+        {
+          name: '已确认',
+          sid: '2'
+        }
+      ]
+    }
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  created() {
+    this.loadList()
+  },
+  methods: {
+    handleClose() {
+      this.dialogVisible = false
     },
-    mounted() {
-      this.$refs['btnbar'].setButtonList(this.btnList)
+    showAdjunct(paths) {
+      this.fileList = paths
+      this.dialogVisible = true
     },
-    created() {
-      this.loadList()
+    selectionLineChangeHandle(val) {
+      this.selectionList = val
+      const aa = []
+      val.forEach(element => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
     },
-    methods: {
-      handleClose() {
-        this.dialogVisible = false
-      },
-      handleClose2() {
-        this.dialogVisible2 = false
-      },
-      handleClose3() {
-        this.dialogVisible3 = false
-      },
-      showAdjunct(paths) {
-        this.fileList = paths
-        this.dialogVisible = true
-      },
-      saveResult() {
-        console.log("saveResult", this.orderInfo);
-
-        req.saveConfirmResult(this.orderInfo).then((resp) => {
-
-
-          this.dialogVisible3 = false
-          this.orderInfo = {
-            filePaths: []
-          }
-          this.loadList()
-        }).catch(() => {
-
-        })
-
-      },
-      showResult(row) {
-
-        if (row.confirmResult == '未确认') {
-          this.$message({
-            type: 'warning',
-            showClose: true,
-            message: '厂家暂未确认'
-          })
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      switch (btnKey) {
+        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: ''
         }
-      },
-      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
-          }
-        }).catch(() => {
-          this.tableLoading = false
+      }
+      this.loadList()
+    },
+    toAdd() {
+      if (this.sids.length === 1) {
+        this.viewState = 2
+        this.$refs['divadd'].showAdd(this.sids[0])
+      } else {
+        this.$message({
+          type: 'warning',
+          showClose: true,
+          message: '请选择一条记录'
         })
-      },
-
-      // 序号
-      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: {
-            name: ''
-          }
-        }
-        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({
-            type: 'warning',
-            showClose: true,
-            message: '请至少选择一条记录进行删除操作'
-          })
-        }
-      },
-
-      toAdd() {
-
-        if (this.sids.length == 1) {
-          // this.dialogVisible3 = true
-
-          // this.orderInfo.mainSid = this.sids[0]
-
-          this.viewState = 2
-          this.$refs['divadd'].showAdd(this.sids[0])
-
-        } else {
-          this.$message({
-            type: 'warning',
-            showClose: true,
-            message: '请选择一条记录'
-          })
-        }
-
-      },
-
-      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
-      },
-      backData(value) {
-        console.log('backData》》》》', value)
-        console.log('imgList', this.imgList)
-
-        for (var i = 0; i < this.imgList.length; i++) {
-          this.orderInfo.filePaths.push(this.imgList[i].url)
-        }
-
-
       }
-
+    },
+    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/manufacturerconfirm/manufacturerconfirmAdd.vue b/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmAdd.vue
index da9afcb2fc..d9e5972f0a 100644
--- a/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmAdd.vue
+++ b/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmAdd.vue
@@ -1,30 +1,15 @@
 <template>
-  <div>
-
+  <div class="app-container">
     <div class="tab-header webtop">
-      <!-- 标题 -->
-      <div>{{title}}厂家确认</div>
-      <!-- start 添加修改按钮 -->
+      <div>{{ title }}厂家确认</div>
       <div>
         <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">确认</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">
-        <!-- <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>
@@ -33,7 +18,6 @@
             <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>
@@ -43,204 +27,163 @@
           <el-col :span="24">
             <div class="span-sty"><span class="must">*</span> 附件</div>
             <el-form-item prop="imgList">
-              <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-form-item>
+              <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"
-          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.asOldpartreturnConfirmDetailDetailsList" 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" />
+        <div class="title">已返厂旧件列表</div>
+        <el-table v-loading="listLoading" :data="formobj.asOldpartreturnConfirmDetailDetailsList" 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="确认数量" align="center" width="180">
             <template slot-scope="scope">
-              <el-input ref="focusAssumptionInput" v-model="scope.row.confirmCount" clearable placeholder=""
-                oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" @input="commodityComputeYHAndXSJE(scope.row)" />
+              <el-input ref="focusAssumptionInput" v-model="scope.row.confirmCount" clearable placeholder="" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" @input="commodityComputeYHAndXSJE(scope.row)"/>
             </template>
           </el-table-column>
         </el-table>
-
       </el-form>
-
     </div>
-
-
   </div>
 </template>
 
 <script>
-  import req from '@/api/storage/manufacturerconfirm.js'
-  import uploadImg from '@/components/uploadFile/uploadImg'
-  export default {
-    components: {
-      uploadImg
-    },
-    data() {
-      return {
-        listLoading: false,
-        submitdisabled: false,
-        title: "新增",
-        formobj: {},
-        imgList: [],
-        rules: {
-          filePaths: [{
-            required: true,
-            message: '附件不能为空',
-            trigger: 'blur'
-          }],
-        }
+import req from '@/api/storage/manufacturerconfirm.js'
+import uploadImg from '@/components/uploadFile/uploadImg'
+
+export default {
+  components: {
+    uploadImg
+  },
+  data() {
+    return {
+      listLoading: false,
+      submitdisabled: false,
+      title: '新增',
+      formobj: {},
+      imgList: [],
+      rules: {
+        filePaths: [{ required: true, message: '附件不能为空', trigger: 'blur' }]
       }
+    }
+  },
+  methods: {
+    indexMethod(index) {
+      return index + 1
     },
-    methods: {
-      indexMethod(index) {
-        return index + 1
-      },
-
-      handleReturn(isreload) {
-        if (isreload === 'true') this.$emit('reloadlist')
-        this.imgList = []
-        this.submitdisabled = false
-        this.$emit('doback')
-      },
 
-      showAdd(sid) {
-        this.$nextTick(() => {
-          this.$refs['form_obj'].clearValidate()
-        })
-        req.init(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]
-                })
-              }
-            }
-          })
-          .catch(e => {
-            this.formobj = {}
-          })
-      },
-      showEdit(row) {
-        this.$nextTick(() => {
-          this.$refs['form_obj'].clearValidate()
-        })
-        var params = {
-          sid: row.sid
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.imgList = []
+      this.submitdisabled = false
+      this.$emit('doback')
+    },
+    showAdd(sid) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.init(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]
+            })
+          }
         }
-        req.init(row.sid)
-          .then(resp => {
-            if (resp.success) {
-              this.formobj = resp.data
+      }).catch(e => {
+        this.formobj = {}
+      })
+    },
+    showEdit(row) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.init(row.sid).then(resp => {
+        if (resp.success) {
+          this.formobj = resp.data
+        }
+      }).catch(e => {
+        this.formobj = {}
+      })
+    },
+    backData(value) {
+      console.log('imgList', this.imgList)
+      this.imgList = value
+      this.formobj.filePaths = []
+      for (var i = 0; i < this.imgList.length; i++) {
+        this.formobj.filePaths.push(this.imgList[i].url)
+      }
+    },
+    commodityComputeYHAndXSJE(row) {
+      if (Number(row.actualReturnCount) < Number(row.confirmCount)) {
+        row.confirmCount = Number(row.actualReturnCount)
+      }
+    },
+    saveOrUpdate() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.save(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: '保存成功'
+              })
+              this.handleReturn('true')
+            } else {
+              this.submitdisabled = false
             }
+          }).catch(() => {
+            this.submitdisabled = false
           })
-          .catch(e => {
-            this.formobj = {}
-          })
-      },
-      backData(value) {
-        console.log('backData》》》》', value)
-        console.log('imgList', this.imgList)
-        this.imgList = value
-        this.formobj.filePaths = []
-        for (var i = 0; i < this.imgList.length; i++) {
-          this.formobj.filePaths.push(this.imgList[i].url)
-        }
-
-
-      },
-      commodityComputeYHAndXSJE(row) {
-
-        if (Number(row.actualReturnCount) < Number(row.confirmCount)) {
-          row.confirmCount = Number(row.actualReturnCount)
         }
-
-      },
-      saveOrUpdate() {
-
-        this.$refs['form_obj'].validate((valid) => {
-          if (valid) {
-            this.submitdisabled = true
-            req.save(this.formobj).then((res) => {
-              if (res.success) {
-                this.$message({
-                  showClose: true,
-                  type: 'success',
-                  message: '保存成功'
-                })
-                this.handleReturn('true')
-              } else {
-                this.submitdisabled = false
-              }
-            }).catch(() => {
-              this.submitdisabled = 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;
+}
 </style>
diff --git a/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmInfo.vue b/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmInfo.vue
index 25e49a6d6d..e712eda997 100644
--- a/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmInfo.vue
+++ b/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmInfo.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,145 +17,89 @@
             <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.asOldpartreturnConfirmDetailDetailsList" 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" />
+        <div class="title">已返厂旧件列表</div>
+        <el-table v-loading="listLoading" :data="formobj.asOldpartreturnConfirmDetailDetailsList" 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: {},
-      }
+import req from '@/api/storage/manufacturerconfirm.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;
-  }
+.span-sty {
+  width: 130px !important;
+}
 
-  .addinputInfo {
-    margin-left: 120px !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;
-  }
+.first_row {
+  border-top: 1px solid #E0E3EB;
+}
 </style>