diff --git a/.env.development b/.env.development
index 6d1cc36..1390b7d 100644
--- a/.env.development
+++ b/.env.development
@@ -1,16 +1,10 @@
 # just a flag
 ENV='development'
 
-# base api
-#VUE_APP_BASE_API = http://192.168.60.99:9004/
-#VUE_APP_UPLOAD_API = http://192.168.60.99:9004/api/admin/upload-file
-#VUE_APP_OA_URL = http://192.168.60.18:2021
-#VUE_APP_OA_URL_TYPE = '{"领用":"37","处置":"38","应急":"39"}'
-
 VUE_APP_BASE_API = http://192.168.60.99:8004/
 VUE_APP_UPLOAD_API = http://192.168.60.99:8004/api/admin/upload-file
 VUE_APP_OA_URL= http://192.168.60.18:8001
-VUE_APP_OA_URL_TYPE = '{"领用":"37","处置":"38","应急":"39",'采购入库':40}'
+VUE_APP_OA_URL_TYPE = '{"采购入库":51,"请示入库":43,"调拨入库":52,"领用出库":37,"处置出库":38,"调拨出库":53}'
 
 
 
diff --git a/.env.production b/.env.production
index ac96466..5801a2e 100644
--- a/.env.production
+++ b/.env.production
@@ -3,21 +3,17 @@ ENV = 'production'
 
 # base api
 #http://192.168.60.99:9004/
-VUE_APP_BASE_API = ''
-VUE_APP_UPLOAD_API = /api/admin/upload-file
+VUE_APP_BASE_API = 'http://192.168.60.99:8004/'
+VUE_APP_UPLOAD_API = 'http://192.168.60.99:8004/api/admin/upload-file'
+
 # 正式oa
 #VUE_APP_OA_URL = http://192.168.60.18:2021
-#VUE_APP_OA_URL_TYPE = '{"领用":"37","处置":"38","应急":"39"}'
+#VUE_APP_OA_URL_TYPE = '{"采购入库":51,"请示入库":43,"调拨入库":52,"领用出库":37,"处置出库":38,"调拨出库":53}'
 
 #测试oa
 VUE_APP_OA_URL = http://192.168.60.18:8001
-VUE_APP_OA_URL_TYPE = '{"领用":"37","处置":"38","应急":"39"}'
-
+VUE_APP_OA_URL_TYPE = '{"采购入库":51,"请示入库":43,"调拨入库":52,"领用出库":37,"处置出库":38,"调拨出库":53}'
 
-#VUE_APP_BASE_API = http://192.168.60.99:8004/
-#VUE_APP_UPLOAD_API = http://192.168.60.99:8004/api/admin/upload-file
-#VUE_APP_OA_URL= http://suzhouhedaooa.langye.net
-#VUE_APP_OA_URL_TYPE = '{"领用":"31","处置":"32"}'
 
 
 
diff --git a/.env.staging b/.env.staging
index 2233d25..ce5e67d 100644
--- a/.env.staging
+++ b/.env.staging
@@ -6,9 +6,8 @@ ENV = 'staging'
 # base api
 #http://192.168.60.99:9004/
 
-VUE_APP_BASE_API =
-VUE_APP_UPLOAD_API = /api/admin/upload-file
-VUE_APP_OA_URL = http://192.168.60.18:2021
-VUE_APP_OA_URL_TYPE = '{"领用":"37","处置":"38","应急":"39"}'
-#VUE_APP_BASE_API = '/stage-api'
+VUE_APP_BASE_API = http://192.168.60.99:8004/
+VUE_APP_UPLOAD_API = http://192.168.60.99:8004/api/admin/upload-file
+VUE_APP_OA_URL= http://192.168.60.18:8001
+VUE_APP_OA_URL_TYPE = '{"采购入库":51,"请示入库":43,"调拨入库":52,"领用出库":37,"处置出库":38,"调拨出库":53}'
 
diff --git a/src/views/jsc/index.vue b/src/views/jsc/index.vue
index d4c8bc7..dcd375f 100644
--- a/src/views/jsc/index.vue
+++ b/src/views/jsc/index.vue
@@ -11,19 +11,24 @@
         </div>
       </div>
       <div class="jscC-center">
-        <div class="jscC-center-left">
-          <div style="display: flex; justify-content: space-between;">
-            <span
+        <div class="jscC-center-left" >
+          <div class="jscC-center-left-title">物资数量统计</div>
+          <div class="jscC-center-left-content">
+            <div v-for="item in upList">
+              <span>{{item.name}}：</span>
+              <span>{{item.total}}{{item.unit?item.unit:''}}</span>
+            </div>
+            <!-- <span
               v-for="item in Object.keys(chartDataMap)"
               :key="item"
               :class="['custom-btn', { active: activeType === item }]"
               @click="handleTypeClick(item)"
             >
               {{ item }}
-            </span>
+            </span> -->
           </div>
           <!-- <Bar3DChart></Bar3DChart> -->
-          <fenleiChart :chart-data="chartData" />
+          <!-- <fenleiChart :chart-data="chartData" /> -->
         </div>
         <div class="jscC-center-center">
           <echartsMap ref="echartsMap" />
@@ -72,7 +77,8 @@ export default {
       contentStyle: {
         width: 0,
         height: 0
-      },
+      },
+      upList:[],
       topObj: [{
         label: '仓库数量',
         value: 0,
@@ -81,15 +87,17 @@ export default {
         label: '物资种类',
         value: 0,
         id: 'wuzizhonglei_count'
-      }, {
-        label: '本月出库',
-        value: 0,
-        id: 'chuku_month_count'
-      }, {
-        label: '本月入库',
-        value: 0,
-        id: 'ruku_month_count'
-      }, {
+      },
+      // {
+      //   label: '本月出库',
+      //   value: 0,
+      //   id: 'chuku_month_count'
+      // }, {
+      //   label: '本月入库',
+      //   value: 0,
+      //   id: 'ruku_month_count'
+      // },
+      {
         label: '应急调度次数',
         value: 0,
         id: 'yingjidiaodu_count'
@@ -142,7 +150,7 @@ export default {
       yData: [],
       todoList: [{
         id: 'gongdan',
-        value: '工单'
+        value: '凋令'
       }, {
         id: 'pandian',
         value: '盘点'
@@ -200,8 +208,9 @@ export default {
       })
       console.log(this.xData, this.yData)
       //
-      this.apiData = res.fenleiLevel1
-      this.chartDataMap = this.convertFenleiToChartDataMap(this.apiData)
+      // this.apiData = res.fenleiLevel1
+      // this.chartDataMap = this.convertFenleiToChartDataMap(this.apiData)
+      this.upList = res.upList
     },
     // 处理分类数据
     convertFenleiToChartDataMap(fenleiLevel1) {
@@ -370,7 +379,6 @@ export default {
         // flex-wrap: wrap;
         &-left {
 
-          // width:5.3rem;
           &-title {
             color: #6dcde6;
             text-align: center;
@@ -378,7 +386,16 @@ export default {
             margin-bottom: 10px;
             font-size: 16px;
           }
-
+          &-content{
+            width: 450px;
+            height: 400px;
+            &>div{
+              text-align: center;
+              margin:10px 0;
+              color:#fff;
+              font-size: 16px;
+            }
+          }
           .custom-btn {
             background: #0b1b3a;
             color: #19eaff;
diff --git a/src/views/materialfile/component/addFenlei.vue b/src/views/materialfile/component/addFenlei.vue
index 3727d7c..b9e62eb 100644
--- a/src/views/materialfile/component/addFenlei.vue
+++ b/src/views/materialfile/component/addFenlei.vue
@@ -62,6 +62,16 @@
           </div>
         </div>
       </template>
+      <template v-slot:unit>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>统计单位：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.unit" placeholder="请填写统计单位" clearable style="width: 300px;" />
+          </div>
+        </div>
+      </template>
       <template v-slot:chubeinianxian>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -142,6 +152,7 @@ export default {
         pid: 0,
         name:'',
         is_chart:0,
+        unit:'',
         chubeinianxian: '',
         cunfangyaoqiu: '',
         weihuyaoqiu: '',
@@ -201,6 +212,7 @@ export default {
         pid: res?.pid,
         name:res?.name,
         is_chart:res.is_chart?res.is_chart:0,
+        unit:res?.unit,
         chubeinianxian: res?.chubeinianxian,
         cunfangyaoqiu: res?.cunfangyaoqiu,
         weihuyaoqiu: res?.weihuyaoqiu,
diff --git a/src/views/outbounds/component/addoutbounds.vue b/src/views/outbounds/component/addoutbounds.vue
index a73e441..0f7075a 100644
--- a/src/views/outbounds/component/addoutbounds.vue
+++ b/src/views/outbounds/component/addoutbounds.vue
@@ -135,7 +135,7 @@
       <template v-if="activeStep===0" v-slot:zuozhengwenjian>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>出库文件：
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>物资信息单：
           </div>
           <div class="xy-table-item-content">
             <el-upload
@@ -479,8 +479,8 @@ export default {
       mingxiList: [],
       showLoading: true,
       mingxiTable: [
-      {label:'id',
-      prop:'inventorys_id'},
+      // {label:'id',
+      // prop:'inventorys_id'},
       {
         label: '物资名称',
         prop: 'zichanmingcheng',
@@ -627,23 +627,23 @@ export default {
     // 下一步
     nextStep() {
       if (this.activeStep === 0) {
-        // if (!this.form.chukushijian || !this.form.jilurenyuan) {
-        //   Message({
-        //     type: 'warning',
-        //     message: '请填写数据'
-        //   })
-        //   return
-        // }
-        // // 调令 必须选择工单
-        // if (this.chukuType === '调令') {
-        //   if (!this.form.guanliandiaoling) {
-        //     Message({
-        //       type: 'warning',
-        //       message: '请选择关联工单'
-        //     })
-        //     return
-        //   }
-        // }
+        if (!this.form.chukushijian || !this.form.jilurenyuan) {
+          Message({
+            type: 'warning',
+            message: '请填写数据'
+          })
+          return
+        }
+        // 调令 必须选择工单
+        if (this.chukuType === '调令') {
+          if (!this.form.guanliandiaoling) {
+            Message({
+              type: 'warning',
+              message: '请选择关联工单'
+            })
+            return
+          }
+        }
         this.activeStep++
       } else if (this.activeStep === 1) {
         if (this.mingxiList.length === 0) {
@@ -871,7 +871,8 @@ export default {
         zuozhengwenjian: res.zuozhengwenjian ? res.zuozhengwenjian : [],
         beizhu: res?.beizhu,
         chukumingxi: ''
-      }
+      }
+      this.form.id = this.id
       this.mingxiList = res.id_outbounds_items_outbounds_id_relation
       this.fileList = []
       const _lists = res.zuozhengwenjian_upload_details ? res.zuozhengwenjian_upload_details : []
@@ -918,47 +919,21 @@ export default {
           this.form.zuozhengwenjian.push(k.id)
         }
       }
-
-      // return
-      if (this.type === 'add') {
-        this.form.zhuangtai = '待处理'
-        save({
-          table_name: this.tableName,
-          ...this.form
-        }).then(res => {
-          Message({
-            type: 'success',
-            message: '新增成功'
-          })
-          this.isShow = false
-          this.$emit('refresh')
-        })
-        return
-      }
-      if (this.type === 'editor' || this.type === 'outbounds') {
-        if (this.type === 'outbounds') {
-          this.form.zhuangtai = '已出库'
-        }
-        save({
-          id: this.id,
-          table_name: this.tableName,
-          ...this.form
-        }).then(res => {
-          Message({
-            type: 'success',
-            message: '编辑成功'
-          })
-          if (this.form.zhuangtai = '已出库') {
-            desChuku({
-              outbound_id: this.id
-            }).then(res => {
-
-            })
-          }
-          this.isShow = false
-          this.$emit('refresh')
-        })
-      }
+      if(this.type==='add'){
+        this.form.zhuangtai = 0
+        delete this.form.id
+      }
+      save({
+        table_name: this.tableName,
+        ...this.form
+      }).then(res => {
+        Message({
+          type: 'success',
+          message: '新增成功'
+        })
+        this.isShow = false
+        this.$emit('refresh')
+      })
     }
 
   }
diff --git a/src/views/outbounds/component/printoutbounds.vue b/src/views/outbounds/component/printoutbounds.vue
index a8f3d1a..0739317 100644
--- a/src/views/outbounds/component/printoutbounds.vue
+++ b/src/views/outbounds/component/printoutbounds.vue
@@ -52,7 +52,7 @@
 
       <!-- 提交记录单 -->
       <div>
-        <div>签字确认单：</div>
+        <div>出库记录单：</div>
         <el-upload
           ref="upload"
           class="upload-demo"
@@ -127,6 +127,9 @@ import {
 import {
   Message
 } from 'element-ui'
+import {
+  desChuku
+} from '@/api/system/log.js'
 import {
   getToken
 } from '@/utils/auth'
@@ -241,7 +244,7 @@ export default {
         })
         return
       }
-      this.form.zhuangtai = '已出库'
+      this.form.zhuangtai = 3
       save({
         table_name: this.tableName,
         ...this.form
@@ -249,6 +252,11 @@ export default {
         Message({
           type: 'success',
           message: '出库成功'
+        })
+        desChuku({
+          outbound_id: this.id
+        }).then(res => {
+
         })
         this.isShow = false
         this.$emit('refresh')
diff --git a/src/views/outbounds/component/showChuku.vue b/src/views/outbounds/component/showChuku.vue
new file mode 100644
index 0000000..f3e3cf2
--- /dev/null
+++ b/src/views/outbounds/component/showChuku.vue
@@ -0,0 +1,227 @@
+<template>
+  <div>
+    <xy-dialog :is-show.sync="isShow" type="normal" title="查看" class="contract-detail">
+      <template v-slot:normalContent>
+        <el-descriptions title="基本信息" :column="2" border>
+            <el-descriptions-item label="出库类型">{{form.chukuleixing}}</el-descriptions-item>
+            <el-descriptions-item label="出库日期">{{form.rukushijian}}</el-descriptions-item>
+            <el-descriptions-item label="借用仓库">{{form.jieyongcangku}}</el-descriptions-item>
+            <el-descriptions-item label="借用部门">{{form.jieyongbumen}}</el-descriptions-item>
+            <el-descriptions-item label="经办人">{{form.jilurenyuan}}</el-descriptions-item>
+            <el-descriptions-item label="物资信息单" :span="2">
+              <div v-for="item in zuozhengList">
+                 <a style="color: blue;" :href="item.url" target="_blank">{{item.name}}</a>
+              </div>
+            </el-descriptions-item>
+            <el-descriptions-item label="备注" :span="2">{{form.beizhu}}</el-descriptions-item>
+        </el-descriptions>
+        <div style="margin: 10px 0;font-weight: bold;color:#303133;font-size: 16px;">
+          物资明细
+        </div>
+        <xy-table style="width: 100%" :height="260" :is-page="false" :list="mingxiList" :table-item="mingxiTable">
+          <template v-slot:btns>
+            <div></div>
+          </template>
+        </xy-table>
+        <div style="margin: 10px 0;font-weight: bold;color:#303133;font-size: 16px;">
+          出库记录单
+        </div>
+        <div>
+          <!-- 确认出库 -->
+          <div>
+            <template v-for="(item,index) in fileList">
+              <el-image
+                  style="width: 100px; height: 100px"
+                  :src="item.url"
+                  :key="index"
+                  :initial-index="index">
+                </el-image>
+            </template>
+
+          </div>
+
+        </div>
+      </template>
+      <template v-slot:footerContent>
+        <Button @click="isShow=false">关闭</Button>
+      </template>
+    </xy-dialog>
+  </div>
+</template>
+
+<script>
+  import {
+    save,
+    index,
+    show,
+    destroy
+  } from '@/api/system/baseForm.js'
+  import {
+    Message
+  } from 'element-ui'
+  export default {
+    components: {},
+    data() {
+      return {
+        id: '',
+        isShow: false,
+        tableName: 'outbounds',
+        zuozhengList:[],
+        fileList: [],
+        form: {
+          rukushijian: '',
+          rukuleixing: '',
+          pandianleixing: '',
+          jingbanren: '',
+          jilurenyuan: '',
+          baoguanrenyuan: '',
+          beizhu: '',
+          zuozhengwenjian: '',
+          rukutupian:''
+        },
+        mingxiList: [],
+        mingxiTable: [{
+            label: '序号',
+            type: 'index',
+            fixed: 'left',
+            width: 80
+          },
+          {
+            label: '物资名称',
+            prop: 'zichanmingcheng',
+            width: 180
+          },
+          {
+            label: '物资型号',
+            prop: 'guigexinghao',
+            width: 180
+          }, {
+            label: '物资类型',
+            prop: 'wuzileixing',
+            width: 120
+          }, {
+            label: '种类编码',
+            prop: 'wuzibianma',
+            width: 120
+          },{
+            label: '单位',
+            prop: 'jiliangdanwei',
+            width: 80
+          }, {
+
+              label: '生产日期',
+              prop: 'shengchanriqi',
+              width: 120
+          },{
+            label: '入库批次',
+            prop: 'rukupici',
+            width: 120
+          }, {
+              label: '在库数量',
+              prop: 'zaikushuliang',
+              width: 80
+            }, {
+              label: '借用数量',
+              prop: 'jieyongshuliang',
+              width: 80
+            }, {
+              label: '是否回库',
+              prop: 'shifouhuiku',
+              width: 80
+            }, , {
+              label: '回库日期',
+              prop: 'huikushijian',
+              width: 120
+            }
+        ],
+        // 打印
+        printArr: ''
+      }
+    },
+    watch: {
+      isShow(newVal) {
+        if (newVal) {
+          this.getDetail()
+        }else{
+          this.id = ''
+          this.fileList = []
+          this.zuozhengList = []
+          this.form = {
+            chukushijian: '',
+            guanliandiaoling: '',
+            chukuleixing: '',
+            jieyongcangku: '',
+            jieyongbumen: '',
+            jilurenyuan: '',
+            baofeiyuanyin: '',
+            zuozhengwenjian: '',
+            beizhu: '',
+            chukumingxi: ''
+          }
+
+        }
+      }
+    },
+    created() {
+    },
+    methods: {
+      async getDetail() {
+        const res = await show({
+          id: this.id,
+          table_name: this.tableName
+        })
+        this.form = {
+          chukushijian: res?.chukushijian,
+          zhuangtai: res?.zhuangtai,
+          guanliandiaoling: res?.guanliandiaoling,
+          jieyongcangku: res?.jieyongcangku,
+          jieyongbumen: res?.jieyongbumen,
+          jilurenyuan: res?.jilurenyuan,
+          baofeiyuanyin: res?.baofeiyuanyin,
+          zuozhengwenjian: res.zuozhengwenjian ? res.zuozhengwenjian : [],
+          beizhu: res?.beizhu,
+          chukumingxi: ''
+        }
+        this.mingxiList = res.id_outbounds_items_outbounds_id_relation
+        this.zuozhengList = []
+        const _lists = res.zuozhengwenjian_upload_details ? res.zuozhengwenjian_upload_details : []
+        for (var f of _lists) {
+          this.zuozhengList.push({
+            name: f?.original_name,
+            url: f?.url,
+            response: f
+          })
+        }
+
+        this.fileList = []
+        const chuku_lists = res.qianzi_upload_details ? res.qianzi_upload_details : []
+        for (var f of chuku_lists) {
+          this.fileList.push({
+            name: f?.original_name,
+            url: f?.url,
+            response: f
+          })
+        }
+
+      },
+    }
+  }
+</script>
+
+<style scoped>
+  .step-content {
+    min-height: 300px;
+  }
+
+  .operation-bar {
+    display: flex;
+    justify-content: flex-end;
+  }
+
+  .step-complete {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 300px;
+  }
+</style>
diff --git a/src/views/outbounds/index.vue b/src/views/outbounds/index.vue
index 0cd4d0a..6551e75 100644
--- a/src/views/outbounds/index.vue
+++ b/src/views/outbounds/index.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <div class="button-wrap">
-      <Button type="primary" @click="editorChuku('','add','领用')">领用出库</Button>
-      <Button type="primary" @click="editorChuku('','add','处置')">处置出库</Button>
-      <Button type="primary" @click="editorChuku('','add','调令')">调令出库</Button>
+      <Button type="primary" @click="editorChuku('','add','领用出库')">领用出库</Button>
+      <Button type="primary" @click="editorChuku('','add','处置出库')">处置出库</Button>
+      <Button type="primary" @click="editorChuku('','add','调令出库')">调令出库</Button>
     </div>
     <div ref="lxHeader">
       <lx-header icon="md-apps" :text="`出库管理`" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
@@ -13,6 +13,9 @@
             <el-select v-model="select.chukuleixing" style="width: 200px;margin-right: 10px;" placeholder="出库类型" clearable>
               <el-option v-for="item in chukuTypeList" :key="item.id" :value="item.id" :label="item.value"></el-option>
             </el-select>
+            <el-select v-model="select.zhuangtai" style="width: 200px;margin-right: 10px;" placeholder="状态" clearable>
+              <el-option v-for="item in statusList" :key="item.id" :value="item.id"  :label="item.value"></el-option>
+            </el-select>
             <el-date-picker type="date" placeholder="发起日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="select.created_at" style="width: 200px;margin-right: 10px;" />
             <el-date-picker type="date" placeholder="出库日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="select.chukushijian" style="width: 200px;margin-right: 10px;" />
             <Button type="primary" @click="getindex">查询</Button>
@@ -28,22 +31,49 @@
       :table-item="table"
       @pageSizeChange="e => select.pageSize = e"
       @pageIndexChange="pageChange"
-    >
+    >
+      <template v-slot:zhuangtai>
+         <el-table-column label="状态" width="120" align="center" header-align="left">
+           <template slot-scope="scope">
+             <div v-for="item in statusList">
+               <el-tag :type="item.type" v-if="scope.row.zhuangtai==item.id">
+                 {{ item.value }}
+               </el-tag>
+             </div>
+           </template>
+         </el-table-column>
+       </template>
       <template v-slot:btns>
         <el-table-column fixed="right" label="操作" width="300" header-align="center">
           <template slot-scope="scope">
-            <!-- <template v-if="isCkName=='仓库管理员'||roleName=='系统管理员'">
-              <Button v-if="scope.row.zhuangtai===&quot;已办结&quot;" type="primary" size="small" style="margin-left: 10px;" @click="editorChuku(scope.row.id,'outbounds')">出库</Button>
-            </template> -->
             <template v-if="scope.row.jilurenyuan==authName||isCkName=='仓库管理员'||roleName=='系统管理员'">
-              <Button v-if="scope.row.zhuangtai==='已办结'" type="primary" size="small" style="margin-left: 10px;" @click="printChuku(scope.row.id,scope.row.chukuleixing)">出库</Button>
-              <!-- <template v-if="scope.row.jilurenyuan==authName||roleName=='系统管理员'"> -->
+              <!-- <Button v-if="scope.row.zhuangtai==='已办结'" type="primary" size="small" style="margin-left: 10px;" @click="printChuku(scope.row.id,scope.row.chukuleixing)">出库</Button>
               <Button type="primary" size="small" style="margin-left: 10px;" @click="editorChuku(scope.row.id,'editor',scope.row.chukuleixing)">编辑</Button>
-              <Button v-if="scope.row.zhuangtai==='待处理'" type="primary" size="small" style="margin-left: 10px;" @click="tofollow(scope.row.id,scope.row)">请示流程</Button>
+              <Button v-if="scope.row.zhuangtai==='待处理'" type="primary" size="small" style="margin-left: 10px;" @click="toOaFollow(scope.row.id,scope.row.chukuleixing)">请示流程</Button>
               <Poptip transfer confirm title="确认要删除吗？" @on-ok="deleteChuku(scope.row)">
                 <Button type="error" style="margin-left: 10px;" size="small" ghost>删除</Button>
-              </Poptip>
-            <!-- </template> -->
+              </Poptip> -->
+
+              <template v-if="scope.row.zhuangtai==3 || scope.row.zhuangtai==1">
+                <Button style="margin-right: 10px;" type="primary" size="small"
+                 @click="showChukuDetail(scope.row.id)">查看</Button>
+              </template>
+              <template v-else>
+                <Button v-if="scope.row.zhuangtai==0 || scope.row.zhuangtai==4" style="margin-right: 10px;" type="primary" size="small"
+                @click="editorChuku(scope.row.id,'editor',scope.row.chukuleixing)">编辑</Button>
+
+                <Button v-if="scope.row.zhuangtai==0 || scope.row.zhuangtai==4" style="margin-right: 10px;" type="primary" size="small"
+                 @click="toOaFollow(scope.row.id,scope.row.chukuleixing)">发起流程</Button>
+
+                <Button v-if="scope.row.zhuangtai==2" style="margin-right: 10px;" type="primary" size="small"
+                @click="printChuku(scope.row.id)">确认出库</Button>
+
+                <Poptip v-if="scope.row.zhuangtai==0" transfer confirm title="确认要删除该出库记录？"
+                @on-ok="deleteChuku(scope.row)">
+                  <Button type="error" size="small" ghost>删除</Button>
+                </Poptip>
+              </template>
+
             </template>
           </template>
         </el-table-column>
@@ -53,7 +83,7 @@
     <addoutbounds ref="addoutbounds" @refresh="getindex" />
     <printoutbounds ref="printoutbounds" @refresh="getindex" />
     <imports ref="imports" :table-name="customForm.tableName" :form-info="form" @refresh="getindex" />
-
+    <showChuku ref="showChuku" @refresh="getindex"></showChuku>
   </div>
 </template>
 
@@ -70,6 +100,7 @@ import {
   getOatoken
 } from '@/api/contract.js'
 import addoutbounds from './component/addoutbounds.vue'
+import showChuku from './component/showChuku.vue'
 import printoutbounds from './component/printoutbounds.vue'
 import {
   Message
@@ -83,18 +114,13 @@ import {
 } from '@/api/system/dictionary'
 export default {
   components: {
-    addoutbounds,
+    addoutbounds,
+    showChuku,
     imports,
     printoutbounds
   },
   data() {
     return {
-      window: {
-        width: 0,
-        height: 0,
-        top: 0,
-        left: 0
-      },
       loading: false,
       userName: '',
       authName: '',
@@ -105,20 +131,41 @@ export default {
         pageIndex: 1,
         keyword: '',
         chukuleixing: '',
+        zhuangtai:'',
         created_at:'',
         chukushijian:''
       },
       chukuTypeList: [{
-        id: '领用',
+        id: '领用出库',
         value: '领用出库'
       }, {
-        id: '处置',
+        id: '处置出库',
         value: '处置出库'
       }, {
-        id: '调令',
+        id: '调令出库',
         value: '调令出库'
       }],
-      chukuType: '领用',
+      statusList:[{
+        id:0,
+        value:'待处理',
+        type:'info'
+      },{
+        id:1,
+        value:'待办结',
+        type:'warning'
+      },{
+        id:2,
+        value:'待出库',
+        type:''
+      },{
+        id:3,
+        value:'已出库',
+        type:'success'
+      },{
+        id:4,
+        value:'退回',
+        type:'danger'
+      }],
       customForm: {
         customFormId: '',
         tableName: ''
@@ -140,15 +187,15 @@ export default {
         fixed: 'left'
       },
       {
-        label: '状态',
+        label: '出库类型',
         width: 180,
-        prop: 'zhuangtai',
+        prop: 'chukuleixing',
         align: 'center'
       },
       {
-        label: '出库类型',
+        label: '状态',
         width: 180,
-        prop: 'chukuleixing',
+        prop: 'zhuangtai',
         align: 'center'
       },
       {
@@ -202,17 +249,13 @@ export default {
     }
   },
   mounted() {
-    if (this.$route.path) {
-      const path = this.$route.path.split('_')[1]
-      const tableName = path == 'receive' ? 'lingyongchuku' : (path == 'disposition' ? 'baofeichuzhi' : 'yingjichuku')
-      getOutboundsStatus({
-        table: tableName
-      })
-    }
-    this.window.width = screen.availWidth * 0.95
-    this.window.height = screen.availHeight * 0.95
-    this.window.top = (window.screen.height - 30 - this.window.height) / 2
-    this.window.left = (window.screen.width - 10 - this.window.width) / 2
+    // if (this.$route.path) {
+    //   const path = this.$route.path.split('_')[1]
+    //   const tableName = path == 'receive' ? 'lingyongchuku' : (path == 'disposition' ? 'baofeichuzhi' : 'yingjichuku')
+    //   getOutboundsStatus({
+    //     table: tableName
+    //   })
+    // }
     this.getUserName()
     this.getindex()
     getOatoken().then(res => {
@@ -220,6 +263,10 @@ export default {
     })
   },
   methods: {
+    showChukuDetail(id){
+      this.$refs['showChuku'].id = id
+      this.$refs['showChuku'].isShow = true
+    },
     async getUserName() {
       getInfo().then(res => {
         console.log('res', res)
@@ -244,7 +291,13 @@ export default {
         filter: [{ 'key': 'jilurenyuan', 'op': 'like', 'value': this.select.keyword },
           { 'key': 'chukuleixing', 'op': 'like', 'value': this.select.chukuleixing ? this.select.chukuleixing : '' },
           { 'key': 'created_at', 'op': 'like', 'value': this.select.created_at ? this.select.created_at : '' },
-          { 'key': 'chukushijian', 'op': 'like', 'value': this.select.chukushijian ? this.select.chukushijian : '' }]
+          { 'key': 'chukushijian', 'op': 'like', 'value': this.select.chukushijian ? this.select.chukushijian : '' },
+          {
+            'key': 'zhuangtai',
+            'op': 'like',
+            'value': this.select.zhuangtai ? this.select.zhuangtai : (this.select.zhuangtai===0?0:'')
+          }]
+
       })
       this.list = res.data
       this.total = res.total
@@ -270,64 +323,18 @@ export default {
       this.$refs['printoutbounds'].chukuType = leixing
       this.$refs['printoutbounds'].isShow = true
     },
-    async tofollow(id, row) {
-      console.log(row)
-      if (row.id_outbounds_items_outbounds_id_relation.length < 1) {
-        Message({
-          type: 'warning',
-          message: '请补充出库物资'
-        })
-        return
-      }
-      console.log(row)
-      // return
-      let wuzimingcheng = ''
-      let shuliang = ''
-      let guigexinghao = ''
-      row.id_outbounds_items_outbounds_id_relation.map(item => {
-        wuzimingcheng += item.zichanmingcheng + '、'
-        shuliang += item.jieyongshuliang + '、'
-        guigexinghao += item.guigexinghao + '、'
-      })
-
-      const default_json = {
-        // 'yewukeshi':row.jieyongbumen,
-        // 'bianhao':row.chukushijian+'-'+row.id,
-        // 'wuzimingcheng':row.id_outbounds_items_outbounds_id_relation[0].zichanmingcheng,
-        // 'lingyongshijian':row.chukushijian,
-        // 'shuliang':row.id_outbounds_items_outbounds_id_relation[0].jieyongshuliang,
-        // 'xinghaoguige':row.id_outbounds_items_outbounds_id_relation[0].guigexinghao,
-        // 'jingbanren':row.jilurenyuan,
-        // 'beizhu':row.beizhu,
-        // 'gudingzichanbianhao':row.gudingzichanbianhao,
-        // 'baofeiyuanyin':row.baofeiyuanyin,
-        'wuzimingcheng': wuzimingcheng,
-        'shuliang': shuliang,
-        'xinghaoguige': guigexinghao,
-        'yewukeshi': row.jieyongbumen,
-        'bianhao': row.chukushijian + '-' + row.id,
-        'lingyongshijian': row.chukushijian,
-        'jingbanren': row.jilurenyuan,
-        'beizhu': row.beizhu,
-        'baofeiyuanyin': row.baofeiyuanyin,
-        'link_id': row.id
-      }
+    async toOaFollow(id, type) {
       let typeid = ''
       const typeObj = JSON.parse(process.env.VUE_APP_OA_URL_TYPE)
+      console.log("typeObj",typeObj,type)
       for (var k in typeObj) {
-        if (k == row.chukuleixing) {
+        if (k == type) {
           typeid = parseInt(typeObj[k])
         }
       }
-      // let res = await getOatoken()
-      // = this.chukuType=='领用'?31:(this.chukuType=='处置'?32:33)
-      // http://suzhouhedaooa.langye.net/admin/flow/create/31?username=admin&default_json={%22bianhao%22:%22100%22}
       const url =
-          `${process.env.VUE_APP_OA_URL}/admin/flow/create/${typeid}?wuziguanli_oatoken=${this.wuziguanli_oatoken}&username=${this.userName}&default_json=${JSON.stringify(default_json)}`
-      const seeBuy = window.open(url, 'follow',
-        `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`
-      )
-      console.log(url)
+          `${process.env.VUE_APP_OA_URL}/admin/flow/create/${typeid}?wuziguanli_oatoken=${this.wuziguanli_oatoken}&username=${this.authName}&link_id=${id}`
+      const seeBuy = window.open(url, '_blank')
     },
     deleteChuku(row) {
       // return
diff --git a/src/views/stocks/component/addRuku copy.vue b/src/views/stocks/component/addRuku copy.vue
index 76fa44a..2432fcb 100644
--- a/src/views/stocks/component/addRuku copy.vue	
+++ b/src/views/stocks/component/addRuku copy.vue	
@@ -1,460 +1,141 @@
 <template>
-  <div>
-    <xy-dialog
-      ref="dialog"
-      :width="70"
-      :is-show.sync="isShow"
-      type="form"
-      :title="type === 'add' ? `新增${rukuTypeName}入库` : `编辑${rukuTypeName}入库`"
-      :form="form"
-      :rules="rules"
-      @submit="submit"
-    >
+  <el-dialog
+    :title="type === 'add' ? `新增${rukuTypeName}入库` : `编辑${rukuTypeName}入库`"
+    :visible.sync="isShow"
+    width="70%"
+    :before-close="handleClose"
+  >
+    <el-steps :active="activeStep" finish-status="success" simple>
+      <el-step title="基本信息" />
+      <el-step title="物资明细" />
+      <el-step title="完成" />
+    </el-steps>
 
-      <template v-if="form.rukuleixing=='采购'" v-slot:caigouhetong>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;" />采购合同：
-          </div>
-          <div class="xy-table-item-content">
+    <div class="step-content" style="margin-top: 20px;">
+      <!-- 第一步：基本信息 -->
+      <div v-show="activeStep === 0">
+        <el-form ref="basicForm" :model="form" :rules="rules" label-width="100px">
+          <el-form-item v-if="form.rukuleixing=='采购'" label="采购合同" prop="caigouhetong">
             <el-input
               v-model="form.caigouhetong"
               type="text"
               clearable
-              placeholder="请选择采购合同"
-              style="width: 300px;"
+              placeholder="请选择采购合同"
               @focus="isShowHt=true"
             />
-          </div>
-        </div>
-      </template>
-      <template v-if="form.rukuleixing=='请示'" v-slot:qingshiliucheng>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;" />请示流程：
-          </div>
-          <div class="xy-table-item-content">
+          </el-form-item>
+          <el-form-item v-if="form.rukuleixing=='请示'" label="请示流程" prop="qingshiliucheng">
             <el-input
               v-model="form.qingshiliucheng"
               type="text"
               clearable
-              placeholder="请选择请示流程"
-              style="width: 300px;"
+              placeholder="请选择请示流程"
               @focus="isShowQs=true"
-            />
-          </div>
-        </div>
-      </template>
-      <template v-if="form.rukuleixing=='应急采购'" v-slot:yingjicaigou>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;" />应急采购请示：
-          </div>
-          <div class="xy-table-item-content">
+            />
+          </el-form-item>
+          <el-form-item v-if="form.rukuleixing=='应急采购'" label="应急采购请示流程" prop="yingjicaigou">
             <el-input
               v-model="form.yingjicaigou"
               type="text"
               clearable
-              placeholder="请选择应急采购请示流程"
-              style="width: 300px;"
+              placeholder="请选择应急采购请示流程"
               @focus="isShowYj=true"
-            />
-          </div>
-        </div>
-      </template>
-      <template v-slot:gudingzichanbianhao>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;" />固定资产编号：
-          </div>
-          <div class="xy-table-item-content">
-            <el-input
-              v-model="form.gudingzichanbianhao"
-              type="text"
-              placeholder="请填写固定资产编号"
-              style="width: 300px;"
             />
-          </div>
-        </div>
-      </template>
-      <template v-slot:rukushijian>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>入库时间：
-          </div>
-          <div class="xy-table-item-content">
+          </el-form-item>
+          <el-form-item v-if="form.rukuleixing=='盘点'" label="盘点类型" prop="pandianleixing">
+            <el-select v-model="form.pandianleixing" style="width:100%" filterable placeholder="请选择盘点类型">
+              <el-option v-for="item in pandianList" :key="item.value" :label="item.value" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="入库日期" prop="rukushijian">
             <el-date-picker
               v-model="form.rukushijian"
-              style="width: 300px;"
               type="date"
-              placeholder="选择日期"
-              value-format="yyyy-MM-dd"
-            />
-          </div>
-        </div>
-      </template>
-      <!-- <template v-slot:rukuleixing>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>入库类型：
-          </div>
-          <div class="xy-table-item-content">
-            <el-select v-model="form.rukuleixing" style="width: 300px;" placeholder="请选择">
-              <el-option v-for="item in lexingoptions" :key="item.value" :label="item.label" :value="item.value">
-              </el-option>
-            </el-select>
-          </div>
-        </div>
-      </template> -->
-      <template v-slot:rukucangku>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;" />入库仓库：
-          </div>
-          <div class="xy-table-item-content">
-            <el-select v-model="form.rukucangku" filterable style="width: 300px;" placeholder="请选择入库仓库">
-              <el-option
-                v-for="item in cangkuList"
-                :key="item.cangkumingcheng"
-                :label="item.cangkumingcheng"
-                :value="item.cangkumingcheng"
-              />
-            </el-select>
-          </div>
-        </div>
-      </template>
-      <template v-if="rukuTypeName=='盘点'" v-slot:pandianleixing>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>盘点类型：
-          </div>
-          <div class="xy-table-item-content">
-            <el-select v-model="form.pandianleixing" filterable style="width: 300px;" placeholder="请选择盘点类型">
-              <el-option
-                v-for="item in pandianList"
-                :key="item.value"
-                :label="item.value"
-                :value="item.value"
-              />
-            </el-select>
-          </div>
-        </div>
-      </template>
-      <template v-slot:jingbanren>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>经办人：
-          </div>
-          <div class="xy-table-item-content">
-            <el-input v-model="form.jingbanren" placeholder="请输入经办人" clearable style="width: 300px;" />
-          </div>
-        </div>
-      </template>
-      <template v-slot:jilurenyuan>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>记录人员：
-          </div>
-          <div class="xy-table-item-content">
-            <el-input v-model="form.jilurenyuan" placeholder="请输入记录人员" clearable style="width: 300px;" />
-          </div>
-        </div>
-      </template>
-      <template v-slot:baoguanrenyuan>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;" />保管人员：
-          </div>
-          <div class="xy-table-item-content">
-            <el-input v-model="form.baoguanrenyuan" placeholder="请输入保管人员" clearable style="width: 300px;" />
-          </div>
-        </div>
-      </template>
-      <template v-slot:beizhu>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;" />备注：
-          </div>
-          <div class="xy-table-item-content">
-            <el-input
-              v-model="form.beizhu"
-              type="textarea"
-              placeholder="请输入备注"
-              clearable
-              style="width: 300px;"
+              placeholder="选择入库日期"
+              value-format="yyyy-MM-dd"
+              style="width: 100%;"
             />
-          </div>
-        </div>
-      </template>
-      <template v-if="rukuTypeName=='盘点' && form.pandianleixing!='正常盘点'" v-slot:zuozhengwenjian>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;" />佐证文件：
-          </div>
-          <div class="xy-table-item-content">
+          </el-form-item>
+          <el-form-item label="经办人" prop="jingbanren">
+            <el-input v-model="form.jingbanren" placeholder="请输入经办人" />
+          </el-form-item>
+          <el-form-item label="记录人" prop="jilurenyuan">
+            <el-input v-model="form.jilurenyuan" placeholder="请输入记录人" />
+          </el-form-item>
+          <el-form-item label="保管人" prop="baoguanrenyuan">
+            <el-input v-model="form.baoguanrenyuan" placeholder="请输入保管人" />
+          </el-form-item>
+          <el-form-item label="入库凭证" prop="zuozhengwenjian">
             <el-upload
               ref="upload"
               class="upload-demo"
               :action="action"
               multiple
-              :headers="headers"
+              :headers="headers"
               :before-upload="beforeUpload"
               :on-success="onSuccess"
               :on-error="onError"
-              :on-remove="onRemove"
+              :on-remove="onRemove"
               :file-list="fileList"
-              :auto-upload="false"
-            >
-              <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
-              <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
-              <div slot="tip" class="el-upload__tip">上传文件不超过500kb</div>
-            </el-upload>
-          </div>
-        </div>
-      </template>
-      <template v-slot:rukumingxi>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;" />入库明细 ：
-          </div>
-          <div class="xy-table-item-content">
-            <Button type="primary" icon="md-add" style="margin-bottom: 10px" @click="isShowMingxi=true">新增入库明细</Button>
-            <Button type="primary" icon="md-add" style="margin-bottom: 10px;margin-left: 10px" @click="importsRuku">导入</Button>
-            <xy-table style="width: 60%" :height="260" :is-page="false" :list="mingxiList" :table-item="mingxiTable">
-              <template v-slot:btns>
-                <el-table-column label="操作" width="90" header-align="center" align="center">
-                  <template v-slot:default="scope">
-                    <Poptip transfer confirm title="确认要删除吗？" @on-ok="delMingxiList(scope.$index,scope.row)">
-                      <Button size="small" type="error" ghost>删除</Button>
-                    </Poptip>
-                  </template>
-                </el-table-column>
-              </template>
-            </xy-table>
-          </div>
-        </div>
-      </template>
-    </xy-dialog>
-
-    <!-- 新增明细 -->
-    <Modal
-      v-model="isShowMingxi"
-      width="600"
-      title="新增明细"
-      :loading="showLoading"
-      @on-cancel="mingxiCancel"
-      @on-ok="mingxiConfirm"
-    >
-      <div class="mingxiwrap">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>种类编码：
-          </div>
-          <div class="xy-table-item-content" style="display: flex;align-items: center;">
-            <el-input
-              v-if="form.rukuleixing!='回库'"
-              v-model="mingxiObj.wuzibianma"
-              type="text"
-              placeholder="请选择种类编码"
-              style="width: 300px;"
-              @focus="showWuzi"
-            />
-            <Button
-              v-if="form.rukuleixing!='回库'"
-              type="primary"
-              icon="md-add"
-              style="margin-left: 10px"
-              @click="showMater"
-            >新增</Button>
-            <el-input
-              v-if="form.rukuleixing=='回库'"
-              ref="huikubianma"
-              v-model="mingxiObj.wuzibianma"
-              type="text"
-              placeholder="请扫码获取回库种类编码"
-              style="width: 300px;"
-              @change="getKucunShow"
-            />
-            <Button
-              v-if="form.rukuleixing=='回库'"
-              type="primary"
-              icon="md-add"
-              style="margin-left: 10px"
-              @click="showWuzi(&quot;回库&quot;)"
-            >选择</Button>
-          </div>
-        </div>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;" />物资名称：
-          </div>
-          <div class="xy-table-item-content">
-            <el-input
-              v-model="mingxiObj.zichanmingcheng"
-              type="text"
-              placeholder="请选择物资名称"
-              disabled
-              style="width: 300px;"
-              @focus="showWuzi"
-            />
-          </div>
-        </div>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;" />物资型号：
-          </div>
-          <div class="xy-table-item-content">
-            <el-input
-              v-model="mingxiObj.guigexinghao"
-              type="text"
-              placeholder="请选择物资型号"
-              disabled
-              style="width: 300px;"
-            />
-          </div>
-        </div>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;" />物资类型：
-          </div>
-          <div class="xy-table-item-content">
-            <el-input
-              v-model="mingxiObj.wuzileixing"
-              type="text"
-              placeholder="请选择物资类型"
-              disabled
-              style="width: 300px;"
-            />
-          </div>
-        </div>
-        <div v-if="form.rukuleixing!='回库'||form.rukuleixing!='盘点'" class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;" />物资分类：
-          </div>
-          <div class="xy-table-item-content">
-            <el-input
-              v-model="mingxiObj.fenlei"
-              type="text"
-              placeholder="请选择物资分类"
-              disabled
-              style="width: 300px;"
-            />
-          </div>
-        </div>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;" />计量单位：
-          </div>
-          <div class="xy-table-item-content">
-            <el-input
-              v-model="mingxiObj.jiliangdanwei"
-              type="text"
-              placeholder="请选择计量单位"
-              disabled
-              style="width: 300px;"
-            />
-          </div>
-        </div>
-        <div v-if="form.rukuleixing=='回库'" class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;" />在库数量：
-          </div>
-          <div class="xy-table-item-content">
-            <el-input
-              v-model="mingxiObj.zaikushuliang"
-              type="text"
-              placeholder="请选择计量单位"
-              disabled
-              style="width: 300px;"
-            />
-          </div>
-        </div>
-        <div v-if="mingxiObj.wuzileixing=='一类一码'" class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>入库批次：
-          </div>
-          <div class="xy-table-item-content">
-            <el-select
-              v-if="form.rukuleixing!='回库'"
-              ref="piciref"
-              v-model="mingxiObj.rukupici"
-              style="width: 300px;"
-              filterable
-              clearable
-              allow-create
-              default-first-option
-              placeholder="请选择或新增入库批次"
-              @change="selectPici"
+              :auto-upload="true"
             >
-              <el-option v-for="item in rukupiciList" :key="item.value" :label="item.value" :value="item.value" />
-            </el-select>
-            <el-input
-              v-else
-              v-model="mingxiObj.rukupici"
-              type="text"
-              disabled
-              placeholder="请输入入库批次"
-              style="width: 300px;"
-            />
-          </div>
-        </div>
+              <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+              <!-- <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button> -->
+              <!-- <div slot="tip" class="el-upload__tip">上传文件不超过500kb</div> -->
+            </el-upload>
+          </el-form-item>
 
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>入库数量：
-          </div>
-          <div class="xy-table-item-content">
-            <el-input
-              v-model="mingxiObj.rukushuliang"
-              type="text"
-              placeholder="请填写入库数量"
-              style="width: 300px;"
-            />
-          </div>
-        </div>
-        <div v-if="form.rukuleixing != '回库'" class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>生产日期：
-          </div>
-          <div class="xy-table-item-content">
-            <el-date-picker
-              v-model="mingxiObj.shengchanriqi"
-              style="width: 300px;"
-              type="date"
-              placeholder="选择生产日期"
-              value-format="yyyy-MM-dd"
-            />
-          </div>
-        </div>
+          <el-form-item label="备注" prop="beizhu">
+            <el-input v-model="form.beizhu" type="textarea" placeholder="请输入备注信息" :rows="3" />
+          </el-form-item>
+        </el-form>
+      </div>
 
+      <!-- 第二步：物资明细 -->
+      <div v-show="activeStep === 1">
+        <div class="operation-bar" style="margin-bottom: 20px;">
+          <el-button
+            size="mini"
+            type="primary"
+            @click="addStockItems"
+          >添加物资明细</el-button>
+          <el-button size="mini" type="primary" @click="importsRuku">导入</el-button>
+        </div>
+        <xy-table style="width: 100%" :height="260" :is-page="false" :list="mingxiList" :table-item="mingxiTable">
+          <template v-slot:btns>
+            <el-table-column label="操作" width="90" header-align="center" align="center">
+              <template v-slot:default="scope">
+                <!-- <Poptip transfer confirm title="确认要删除吗？" @on-ok="delMingxiList(scope.$index,scope.row)"> -->
+                <Button size="small" type="error" ghost @click="delMingxiList(scope.$index,scope.row)">删除</Button>
+                <!-- </Poptip> -->
+              </template>
+            </el-table-column>
+          </template>
+        </xy-table>
       </div>
 
-    </Modal>
-    <!-- 选择物资编号 -->
-    <Modal v-model="isShowWuzi" title="物资选择">
-      <div class="searchCompanys">
-        <el-input v-model="wuzibianmakeyword" style="margin-right:10px" clearable type="text" placeholder="请输入种类编码查找库存" @keyup.enter.native="getList" />
-        <el-input v-model="keyword" style="margin-right:10px" clearable type="text" placeholder="请输入物资名称查找" @keyup.enter.native="getList" />
-        <el-button type="primary" @click="getList">查询</el-button>
+      <!-- 第三步：完成 -->
+      <div v-show="activeStep === 2" class="step-complete">
+        <el-result icon="success" title="保存成功" sub-title="是否批量打印二维码？">
+          <template slot="extra">
+            <el-button type="primary" @click="handlePrint">打印二维码</el-button>
+            <el-button @click="handleClose">关闭</el-button>
+          </template>
+        </el-result>
       </div>
-      <Table
-        ref="currentRowTable"
-        highlight-row
-        :columns="wuziColumns"
-        :data="showList"
-        @on-current-change="wuziSelect"
-      />
-      <Page
-        :current="wuziPageIndex"
-        :total="showTotal"
-        simple
-        style="padding-top: 14px;display: flex;justify-content: center;"
-        @on-change="wuziPageChange"
-      />
-    </Modal>
+    </div>
+
+    <div slot="footer" class="dialog-footer">
+      <el-button v-if="activeStep > 0" @click="prevStep">上一步</el-button>
+      <el-button
+        v-if="activeStep < 2"
+        type="primary"
+        @click="nextStep"
+      >{{ activeStep === 1 ? '保存' : '下一步' }}</el-button>
+    </div>
 
     <!-- 选择采购合同 -->
-    <Modal v-model="isShowHt" title="合同选择" width="70%" @on-cancel="htCancel" @on-ok="htComfirm">
+    <Modal v-model="isShowHt" :z-index="9999" title="合同选择" width="70%" @on-cancel="htCancel" @on-ok="htComfirm">
       <div class="searchCompanys">
         <el-input v-model="htkeyword" type="text" placeholder="请输入关键词查找" @keyup.enter.native="getHt" />
         <el-button type="primary" @click="getHt">查询</el-button>
@@ -467,63 +148,66 @@
         style="padding-top: 14px;display: flex;justify-content: center;"
         @on-change="htPageChange"
       />
-    </Modal>
-    <!-- 选择请示流程 -->
-    <Modal v-model="isShowQs" title="请示选择" width="70%" @on-cancel="qsCancel" @on-ok="qsComfirm">
-      <div class="searchCompanys">
-        <el-input v-model="qskeyword" type="text" placeholder="请输入关键词查找" @keyup.enter.native="getQs" />
-        <el-button type="primary" @click="getQs">查询</el-button>
-      </div>
-      <Table ref="currentRowTable" highlight-row :columns="qsColumns" :data="qsList" @on-current-change="qsSelect" />
+    </Modal>
+    <!-- 选择请示流程 -->
+    <Modal v-model="isShowQs" :z-index="10000" title="请示选择" width="70%" @on-cancel="qsCancel" @on-ok="qsComfirm">
+      <div class="searchCompanys">
+        <el-input v-model="qskeyword" type="text" placeholder="请输入关键词查找" @keyup.enter.native="getQs" />
+        <el-button type="primary" @click="getQs">查询</el-button>
+      </div>
+      <Table ref="currentRowTable" highlight-row :columns="qsColumns" :data="qsList" @on-current-change="qsSelect" />
       <Page
         :current="qsPageIndex"
         :total="qsTotal"
-        simple
+        simple
         style="padding-top: 14px;display: flex;justify-content: center;"
         @on-change="qsPageChange"
-      />
-    </Modal>
-
-    <!-- 选择应急采购请示流程 -->
-    <Modal v-model="isShowYj" title="应急采购请示选择" width="70%" @on-cancel="yjCancel" @on-ok="yjComfirm">
-      <div class="searchCompanys">
-        <el-input v-model="yjkeyword" type="text" placeholder="请输入关键词查找" @keyup.enter.native="getYj" />
-        <el-button type="primary" @click="getYj">查询</el-button>
-      </div>
-      <Table ref="currentRowTable" highlight-row :columns="yjColumns" :data="yjList" @on-current-change="yjSelect" />
+      />
+    </Modal>
+
+    <!-- 选择应急采购请示流程 -->
+    <Modal v-model="isShowYj" :z-index="10000" title="应急采购请示选择" width="70%" @on-cancel="yjCancel" @on-ok="yjComfirm">
+      <div class="searchCompanys">
+        <el-input v-model="yjkeyword" type="text" placeholder="请输入关键词查找" @keyup.enter.native="getYj" />
+        <el-button type="primary" @click="getYj">查询</el-button>
+      </div>
+      <Table ref="currentRowTable" highlight-row :columns="yjColumns" :data="yjList" @on-current-change="yjSelect" />
       <Page
         :current="yjPageIndex"
         :total="qsTotal"
-        simple
+        simple
         style="padding-top: 14px;display: flex;justify-content: center;"
         @on-change="yjPageChange"
-      />
-    </Modal>
+      />
+    </Modal>
 
+    <!-- 合同 明细查看 -->
     <detailContract ref="detailContract" />
+    <!-- 导入明细 -->
     <imports
       ref="imports"
       :table-name="importstableName"
       :istrueimport="false"
       :form-info="importForm"
       @importdata="getimportData"
-    />
-
-    <addMater ref="addMater" @insert="insertMingxi" />
+    />
 
-  </div>
+    <!-- 新增入库物资 -->
+    <addStock ref="addStock" @refresh="addStockMingxi" />
+
+  </el-dialog>
 </template>
 
 <script>
 import {
   save,
   index,
-  show,
+  show,
   destroy
 } from '@/api/system/baseForm.js'
 import {
-  index as getContract,
-  getQingShi,
+  index as getContract,
+  getQingShi,
   getOatoken
 } from '@/api/contract.js'
 import {
@@ -531,175 +215,85 @@ import {
 } from 'element-ui'
 import detailContract from '../component/detailContract.vue'
 import imports from '@/views/component/imports.vue'
+import addStock from '../component/addStock.vue'
 import {
   index as fieldIndex
-} from '@/api/system/customFormField'
-import { getToken } from '@/utils/auth'
-import addMater from '@/views/materialfile/component/addMater.vue'
+} from '@/api/system/customFormField'
+import {
+  getToken
+} from '@/utils/auth'
+import addMater from '@/views/materialfile/component/addMater.vue'
+import {
+  getWzpc
+} from '@/api/mater.js'
 export default {
+  name: 'PurchaseDialog',
   components: {
-    detailContract,
+    detailContract,
     addMater,
-    imports
+    imports,
+    addStock
   },
   data() {
     return {
+      id: '',
       isShow: false,
       type: 'add',
-      id: '',
-      rukuType: '',
-      authName: '',
-      rukuTypeName: '盘点',
-      tableName: 'stocks',
-      importstableName: 'stocks_items',
+      tableName: 'stocks',
+      currentPici:'', // 这一次的批次号
+      rukuTypeName: '',
+      rukuType: '',
+      activeStep: 0,
+      fileList: [],
+      action: process.env.VUE_APP_UPLOAD_API,
+      headers: {
+        token: ''
+      },
       wuziguanli_oatoken: '',
-      customFormId: 8,
-      importForm: [],
-      cangkuList: [],
-      lexingoptions: [{
-        label: '盘点',
-        value: '盘点'
-      }, {
-        label: '采购',
-        value: '采购'
-      }, {
-        label: '回库',
-        value: '回库'
-      }],
-      rukupiciList: [],
-      pandianList: [{ label: '正常盘点', value: '正常盘点' }, { label: '外部调拨', value: '外部调拨' }, { label: '其他', value: '其他' }],
       form: {
-        caigouhetong: '',
-        qingshiliucheng: '',
+        caigouhetong: '',
+        qingshiliucheng: '',
         yingjicaigou: '',
         gudingzichanbianhao: '',
         rukushijian: '',
-        // caigouhetong:'',
-        rukuleixing: '',
+        rukuleixing: '',
         pandianleixing: '',
-        rukucangku: '',
+        // rukucangku: '',
         jingbanren: '',
         jilurenyuan: '',
         baoguanrenyuan: '',
-        beizhu: '',
-        zuozhengwenjian: '',
-        rukumingxi: ''
-      },
-      fileList: [],
-      action: process.env.VUE_APP_UPLOAD_API,
-      headers: {
-        token: ''
+        beizhu: '',
+        zuozhengwenjian: ''
       },
       rules: {
         rukushijian: [{
           required: true,
-          message: '请选择入库时间'
-        }],
-        // pandianleixing: [{
-        //   required: true,
-        //   message: '请选择盘点类型'
-        // }],
+          message: '请选择入库日期',
+          trigger: 'change'
+        }],
         jingbanren: [{
           required: true,
           message: '请填写经办人'
         }],
         jilurenyuan: [{
           required: true,
-          message: '请填写记录人员'
+          message: '请填写记录人'
+        }],
+        zuozhengwenjian: [{
+          required: true,
+          message: '请上传入库凭证'
         }]
       },
-      hetongoptions: [],
-      isShowMingxi: false,
-      showLoading: true,
-      mingxiObj: {
-        wuzibianma: '',
-        rukushuliang: ''
-      },
-      mingxiObjBefore: {},
-      mingxiList: [],
-      mingxiIndex: '',
-      mingxiTable: [{
-        label: '种类编码',
-        prop: 'wuzibianma',
-        width: 180
-      },
-      {
-        label: '物资名称',
-        prop: 'zichanmingcheng',
-        width: 180
-      },
-      {
-        label: '物资型号',
-        prop: 'guigexinghao',
-        width: 180
-      },
-      {
-        label: '物资类型',
-        prop: 'wuzileixing',
-        width: 180
-      },
-      {
-        label: '计量单位',
-        prop: 'jiliangdanwei',
-        width: 180
-      },
-      {
-        label: '入库数量',
-        prop: 'rukushuliang',
-        width: 180
-      }, {
-        label: '入库批次',
-        prop: 'rukupici',
-        width: 180
-      }, {
-        label: '在库数量',
-        prop: 'zaikushuliang',
-        width: 180
-      }, {
-        label: '生产日期',
-        prop: 'shengchanriqi',
-        width: 180
-      }
-      ],
-      // 物资
-      isShowWuzi: false,
-      wuziList: [],
-      kucunList: [],
-      showList: [],
-      wuziPageIndex: 1,
-      keyword: '',
-      wuzibianmakeyword: '',
-      showTotal: 0,
-      wuziTotal: 0,
-      kucunTotal: 0,
-      wuziColumns: [{
-        width: 60,
-        _isChecked: false,
-        key: 'isSelect',
-        resizable: true,
-        render: (h, params) => {
-          return h('div', [
-            h('Radio', {
-              props: {
-                value: params.row.isSelect
-              },
-              on: {
-                'on-change': (e) => {
-                  this.showList.forEach((items) => {
-                    this.$set(items, 'isSelect', false)
-                  })
-                  this.showList[params.index].isSelect = e
-                }
-              }
-            })
-          ])
-        }
+      // 盘点类型
+      pandianList: [{
+        label: '正常盘点',
+        value: '正常盘点'
       }, {
-        title: '名称',
-        key: 'names'
+        label: '外部调拨',
+        value: '外部调拨'
       }, {
-        title: '物资类型',
-        key: 'wuzileixing'
+        label: '其他',
+        value: '其他'
       }],
       // 合同
       isShowHt: false,
@@ -761,190 +355,500 @@ export default {
             }
           }, '查看详情')
         }
-      }],
-      // 请示流程
-      isShowQs: false,
-      qsList: [],
-      qskeyword: '',
-      qsPageIndex: 1,
-      qsTotal: 0,
-      editQs: '',
-      qsColumns: [{
-        width: 60,
-        _isChecked: false,
-        key: 'isSelect',
-        resizable: true,
-        render: (h, params) => {
-          return h('div', [
-            h('Radio', {
-              props: {
-                value: params.row.isSelect
-              },
-              on: {
-                'on-change': (e) => {
-                  this.qsList.forEach((items) => {
-                    this.$set(items, 'isSelect', false)
-                  })
-                  this.qsList[params.index].isSelect = e
-                }
-              }
-            })
-          ])
-        }
-      }, {
-        title: '名称',
-        key: 'title'
-      }, {
-        title: '查看',
-        key: '',
-        width: 100,
-        render: (h, params) => {
-          return h('span', {
-            style: {
-              color: '#0077CC',
-              cursor: 'pointer'
-            },
-            on: {
-              'click': (e) => {
-                this.toQsFollow(params.row.belongs_id)
-                // @click=","
-              }
-            }
-          }, '查看详情')
-        }
-      }],
-      // 应急采购请示流程
-      isShowYj: false,
-      yjList: [],
-      yjkeyword: '',
-      yjPageIndex: 1,
-      yjTotal: 0,
-      editYj: '',
-      yjColumns: [{
-        width: 60,
-        _isChecked: false,
-        key: 'isSelect',
-        resizable: true,
-        render: (h, params) => {
-          return h('div', [
-            h('Radio', {
-              props: {
-                value: params.row.isSelect
-              },
-              on: {
-                'on-change': (e) => {
-                  this.yjList.forEach((items) => {
-                    this.$set(items, 'isSelect', false)
-                  })
-                  this.yjList[params.index].isSelect = e
-                }
-              }
-            })
-          ])
-        }
-      }, {
-        title: '名称',
-        key: 'title'
-      }, {
-        title: '查看',
-        key: '',
-        width: 100,
-        render: (h, params) => {
-          return h('span', {
-            style: {
-              color: '#0077CC',
-              cursor: 'pointer'
-            },
-            on: {
-              'click': (e) => {
-                this.toYjFollow(params.row.belongs_id)
-                // @click=","
-              }
-            }
-          }, '查看详情')
-        }
-      }]
-    }
-  },
-  watch: {
-    isShow(newVal) {
-      if (newVal) {
-        this.form.rukuleixing = this.rukuType
-        this.rukuTypeName = this.rukuType == '回库' ? '归还' : this.rukuType
-        console.log(this.rukuTypeName)
-        if (this.rukuTypeName == '盘点') {
-          this.form.pandianleixing = '正常盘点'
+      }],
+      // 请示流程
+      isShowQs: false,
+      qsList: [],
+      qskeyword: '',
+      qsPageIndex: 1,
+      qsTotal: 0,
+      editQs: '',
+      qsColumns: [{
+        width: 60,
+        _isChecked: false,
+        key: 'isSelect',
+        resizable: true,
+        render: (h, params) => {
+          return h('div', [
+            h('Radio', {
+              props: {
+                value: params.row.isSelect
+              },
+              on: {
+                'on-change': (e) => {
+                  this.qsList.forEach((items) => {
+                    this.$set(items, 'isSelect', false)
+                  })
+                  this.qsList[params.index].isSelect = e
+                }
+              }
+            })
+          ])
         }
-        if (this.rukuType == '采购') {
-          this.getHt()
-        }
-        if (this.rukuType == '请示') {
-          this.getQs()
-        }
-        if (this.rukuType == '应急采购') {
-          this.getYj()
+      }, {
+        title: '名称',
+        key: 'title'
+      }, {
+        title: '查看',
+        key: '',
+        width: 100,
+        render: (h, params) => {
+          return h('span', {
+            style: {
+              color: '#0077CC',
+              cursor: 'pointer'
+            },
+            on: {
+              'click': (e) => {
+                this.toQsFollow(params.row.belongs_id)
+                // @click=","
+              }
+            }
+          }, '查看详情')
         }
-        if (this.type === 'editor') {
-          this.getDetail()
-        }
-        if (this.type == 'add') {
-          this.form.jingbanren = this.authName
+      }],
+      // 应急采购请示流程
+      isShowYj: false,
+      yjList: [],
+      yjkeyword: '',
+      yjPageIndex: 1,
+      yjTotal: 0,
+      editYj: '',
+      yjColumns: [{
+        width: 60,
+        _isChecked: false,
+        key: 'isSelect',
+        resizable: true,
+        render: (h, params) => {
+          return h('div', [
+            h('Radio', {
+              props: {
+                value: params.row.isSelect
+              },
+              on: {
+                'on-change': (e) => {
+                  this.yjList.forEach((items) => {
+                    this.$set(items, 'isSelect', false)
+                  })
+                  this.yjList[params.index].isSelect = e
+                }
+              }
+            })
+          ])
         }
-      } else {
-        this.id = ''
-        this.type = ''
-        this.authName = ''
-        this.mingxiList = []
-        this.fileList = []
-        this.$refs['dialog'].reset()
-      }
-    }
-  },
-  created() {
-    this.getCangku()
-    this.headers.token = getToken()
-    getOatoken().then(res => {
-      this.wuziguanli_oatoken = res.oatoken
-    })
-  },
-  methods: {
-    beforeUpload(file) {
-      if (file.size / 1000 > 500) {
-        this.$message({
-          type: 'warning',
-          message: '上传文件大小超过500kb！'
-        })
-        return false
-      }
-    },
-    onSuccess(response, file, fileList) {
-      console.log('fileList', fileList)
-      this.fileList = fileList
-    },
-
-    onRemove(file, fileList) {
-      this.fileList = fileList
-    },
-
-    onError(err, file, fileList) {
-      this.fileList = fileList
-      this.$message({
-        type: 'warning',
-        message: err
-      })
-    },
-    submitUpload() {
-      this.$refs.upload.submit()
-    },
-    // 导入入库明细
-    importsRuku() {
-      this.$refs['imports'].show()
-      this.getField()
-    },
+      }, {
+        title: '名称',
+        key: 'title'
+      }, {
+        title: '查看',
+        key: '',
+        width: 100,
+        render: (h, params) => {
+          return h('span', {
+            style: {
+              color: '#0077CC',
+              cursor: 'pointer'
+            },
+            on: {
+              'click': (e) => {
+                this.toYjFollow(params.row.belongs_id)
+                // @click=","
+              }
+            }
+          }, '查看详情')
+        }
+      }],
+      // 导入
+      importstableName: 'stocks_items',
+      importForm: [],
+      customFormId: 8,
+      mingxiList: [],
+      mingxiTable: [{
+        label: '序号',
+        type: 'index',
+        fixed: 'left',
+        width: 80
+      },
+      {
+        label: '物资名称',
+        width: 180,
+        prop: 'zichanmingcheng',
+        align: 'left'
+      },
+      {
+        label: '所属种类',
+        width: 180,
+        prop: 'fenleiName',
+        align: 'center'
+      },
+      {
+        label: '种类编码',
+        width: 120,
+        prop: 'wuzibianma',
+        align: 'center'
+      },
+      {
+        label: '物资类型',
+        width: 180,
+        prop: 'wuzileixing',
+        align: 'center'
+      },
+      {
+        label: '物资型号',
+        width: 180,
+        prop: 'guigexinghao',
+        align: 'left'
+      },
+      {
+        label: '物资规格',
+        width: 180,
+        prop: 'wuziguige',
+        align: 'left'
+      },
+      {
+        label: '单位',
+        width: 180,
+        prop: 'jiliangdanwei',
+        align: 'center'
+      }, {
+        label: '在库数量',
+        prop: 'zaikushuliang',
+        width: 180
+      },
+      {
+        label: '入库批次',
+        prop: 'rukupici',
+        width: 180
+      }, {
+        label: '入库数量',
+        prop: 'rukushuliang',
+        width: 180
+      }
+        // ,{
+        //   label: "物资状态",
+        //   prop: "wuzizhuangtai",
+        //   width: 180
+        // },{
+        //   label: "生产日期",
+        //   prop: "shengchanriqi",
+        //   width: 180
+        // },
+      ],
+      // 打印
+      printArr: ''
+    }
+  },
+  watch: {
+    isShow(newVal) {
+      if (newVal) {
+        this.form.rukuleixing = this.rukuType
+        this.rukuTypeName = this.rukuType == '回库' ? '归还' : this.rukuType
+        console.log(this.rukuTypeName)
+        if (this.rukuTypeName == '盘点') {
+          this.form.pandianleixing = '正常盘点'
+        }
+        if (this.rukuType == '采购') {
+          this.getHt()
+        }
+        if (this.rukuType == '请示') {
+          this.getQs()
+        }
+        if (this.rukuType == '应急采购') {
+          this.getYj()
+        }
+        if (this.type === 'editor') {
+          this.getDetail()
+        }
+        if (this.type == 'add') {
+          this.form.jingbanren = this.authName
+        }
+      } else {
+        this.resetForm()
+      }
+    }
+  },
+  created() {
+    this.headers.token = getToken()
+    getOatoken().then(res => {
+      this.wuziguanli_oatoken = res.oatoken
+    })
+  },
+  methods: {
+    // 佐证文件上传
+    beforeUpload(file) {
+      // if (file.size / 1000 > 500) {
+      //   this.$message({
+      //     type: "warning",
+      //     message: "上传文件大小超过500kb！",
+      //   });
+      //   return false;
+      // }
+    },
+    onSuccess(response, file, fileList) {
+      console.log('fileList', fileList)
+      this.fileList = fileList
+      const arr = []
+      for (var k of this.fileList) {
+        arr.push(k?.response?.id)
+      }
+      this.form.zuozhengwenjian = arr
+    },
+
+    onRemove(file, fileList) {
+      this.fileList = fileList
+      const arr = []
+      for (var k of this.fileList) {
+        arr.push(k?.response?.id)
+      }
+      this.form.zuozhengwenjian = arr
+    },
+
+    onError(err, file, fileList) {
+      this.fileList = fileList
+      this.$message({
+        type: 'warning',
+        message: err
+      })
+    },
+    submitUpload() {
+      this.$refs.upload.submit()
+    },
+    // 导入入库明细
+    importsRuku() {
+      this.$refs['imports'].show()
+      this.getField()
+    },
     getimportData(e) {
       console.log('e', e)
       this.mingxiList = e
     },
+    // 新增的明细 插入到mingxilist中
+    addStockItems(){
+      this.$refs.addStock.rukuleixing=this.form.rukuleixing
+      this.$refs.addStock.setPici(this.currentPici,this.form.rukushijian)
+      this.$refs.addStock.isShowMingxi=true
+    },
+    addStockMingxi(obj) {
+      this.mingxiList.push(obj)
+    },
+    // 关闭弹窗
+    handleClose() {
+      this.$confirm('确认关闭？未保存的数据将会丢失', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.isShow = false
+        this.$emit('refresh')
+        this.resetForm()
+      }).catch(() => {})
+    },
+    // 重置表单
+    resetForm() {
+      this.id = ''
+      this.type = ''
+      this.rukuType = ''
+      this.rukuTypeName = ''
+      this.authName = ''
+      this.mingxiList = []
+      this.fileList = []
+      this.activeStep = 0
+      this.form = {
+        caigouhetong: '',
+        qingshiliucheng: '',
+        yingjicaigou: '',
+        gudingzichanbianhao: '',
+        rukushijian: '',
+        rukuleixing: '',
+        pandianleixing: '',
+        // rukucangku: '',
+        jingbanren: '',
+        jilurenyuan: '',
+        baoguanrenyuan: '',
+        beizhu: '',
+        zuozhengwenjian: ''
+      }
+      if (this.$refs.basicForm) {
+        this.$refs.basicForm.resetFields()
+      }
+    },
+    // 获取批次
+    async getPici(){
+      if(this.form.rukuleixing!='回库'){
+        const res = await getWzpc()
+        this.currentPici = res.msg
+      }
+
+    },
+    // 上一步
+    prevStep() {
+      this.activeStep--
+    },
+    // 下一步
+    nextStep() {
+      if (this.activeStep === 0) {
+        // this.$refs.basicForm.validate(valid => {
+        //   if (valid) {
+        //     this.activeStep++
+        //   }
+        // })
+        this.getPici()
+        this.activeStep++
+      } else if (this.activeStep === 1) {
+        if (this.mingxiList.length === 0) {
+          this.$message.warning('请至少添加一条物资明细')
+          return
+        }
+        this.saveData()
+      }
+    },
+
+    // 保存数据
+    isHasEqual(arr, key, key1) {
+      if (arr.length === 0) {
+        return
+      }
+      for (let i = 0; i < arr.length; i++) {
+        if (arr.filter(item => item[key] == arr[i][key]).length > 1 && arr.filter(item => item[key1] == arr[i][key1])
+          .length > 1) {
+          return true
+        }
+      }
+      return false
+    },
+    saveData() {
+      this.form.id_stocks_items_stocks_id_relation = this.mingxiList
+      console.log('form', this.form)
+      const has = this.isHasEqual(this.form.id_stocks_items_stocks_id_relation, 'wuzibianma', 'rukupici')
+      if (has) {
+        Message({
+          type: 'warning',
+          message: '同一物资同一批次请不要重复录入'
+        })
+        return
+      }
+      this.form.zuozhengwenjian = []
+      for (var k of this.fileList) {
+        this.form.zuozhengwenjian.push(k?.response?.id)
+      }
+      if (this.type === 'add') {
+        delete this.form.id
+      }
+      save({
+        table_name: this.tableName,
+        ...this.form
+      }).then(res => {
+        this.$message.success('保存成功')
+        console.log('res', res)
+
+        if (this.type === 'editor' || this.form.rukuleixing === '回库') {
+          this.resetForm()
+          this.$emit('refresh')
+          this.isShow = false
+          return
+        }
+        if (res && res.inventorysIds && res.inventorysIds.length > 0) {
+          this.printArr = res.inventorysIds.join(',')
+        }
+
+        this.activeStep++
+      })
+    },
+    // 删除明细记录
+    async delMingxiList(index, row) {
+      this.$confirm('确认删除该数据', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async() => {
+        let isDel = false
+        let isDels = false
+        const id = row.id
+        const stocks_items_id = row.stocks_items_id
+        if (row.id) {
+          await destroy({
+            id: id,
+            table_name: 'stocks_item_links'
+          }).then(res => {
+            isDel = true
+          })
+          await destroy({
+            id: stocks_items_id,
+            table_name: 'stocks_items'
+          }).then(res => {
+            isDels = true
+          })
+          if (isDel && isDels) {
+            Message({
+              type: 'success',
+              message: '删除成功'
+            })
+            this.mingxiList.splice(index, 1)
+          } else {
+            Message({
+              type: 'warning',
+              message: '删除失败'
+            })
+          }
+        } else {
+          Message({
+            type: 'success',
+            message: '删除成功'
+          })
+          this.mingxiList.splice(index, 1)
+        }
+      }).catch(() => {})
+    },
+    // 打印二维码
+    handlePrint() {
+      // 这里添加打印二维码的逻辑
+      // this.$message.success('开始打印二维码')
+      this.isShow = false
+      this.resetForm()
+      window.open('/admin/print.html?ids=' + this.printArr, '_blank')
+    },
+    //
+    async getDetail() {
+      const res = await show({
+        id: this.id,
+        table_name: this.tableName
+      })
+      this.form = {
+        caigouhetong: res?.caigouhetong,
+        qingshiliucheng: res?.qingshiliucheng,
+        yingjicaigou: res?.qingshiliucheng,
+
+        rukushijian: res?.rukushijian,
+        rukuleixing: res?.rukuleixing,
+        pandianleixing: res?.pandianleixing,
+
+        jingbanren: res?.jingbanren,
+        jilurenyuan: res?.jilurenyuan,
+        baoguanrenyuan: res?.baoguanrenyuan,
+        beizhu: res?.beizhu,
+        zuozhengwenjian: res?.zuozhengwenjian
+      }
+      this.form.id = this.id
+      this.editHt = res?.caigouhetong
+      this.editQs = res?.qingshiliucheng
+      this.mingxiList = []
+      for (var r of res.id_stocks_item_links_stocks_id_relation) {
+        const yuanshishuju = JSON.parse(r.yuanshishuju)
+        yuanshishuju['id'] = r.id
+        yuanshishuju['stocks_items_id'] = r.stocks_items_id
+        this.mingxiList.push(yuanshishuju)
+      }
+      this.fileList = []
+      const _lists = res.zuozhengwenjian_upload_details ? res.zuozhengwenjian_upload_details : []
+      for (var f of _lists) {
+        this.fileList.push({
+          name: f?.original_name,
+          url: f?.url,
+          response: f
+        })
+      }
+      // this.isShow = true
+    },
     // 获取采购合同
     async getHt() {
       const res = await getContract({
@@ -991,481 +895,107 @@ export default {
       console.log('e', e)
       this.htPageIndex = e
       this.getHt()
-    },
-    // 获取请示流程
-    async getQs() {
-      const res = await getQingShi({
-        // table:'qingshiruku',
-        table: 'qingshi',
-        page: this.qsPageIndex,
-        status: 1,
-        keyword: this.qskeyword
-      })
-      for (var m of res.data.flow.data) {
-        m.isSelect = false
-      }
-      this.qsList = res.data.flow.data
-      this.qsTotal = res.data.flow.total
-      // this.hetongoptions = res.data
-    },
-    qsCancel() {
-      this.qsList.forEach((items) => {
-        this.$set(items, 'isSelect', false)
-      })
-      this.form.qingshiliucheng = this.editQs
-    },
-    qsSelect(e) {
-      this.qsList.forEach((items) => {
-        this.$set(items, 'isSelect', false)
-        if (items.id == e.id) {
-          this.$set(items, 'isSelect', true)
-        }
-      })
-    },
-    qsComfirm() {
-      this.qsList.forEach((items) => {
-        if (items.isSelect == true) {
-          this.form.qingshiliucheng = items.title
-          this.editQs = items.title
-        }
-      })
-    },
-    qsPageChange(e) {
-      this.qsPageIndex = e
-      this.getQs()
-    },
-    async toQsFollow(id) {
-      // let res = await getOatoken()
-
-      const url =
-          `${process.env.VUE_APP_OA_URL}/admin/flow/view/${id}?wuziguanli_oatoken=${this.wuziguanli_oatoken}`
-      console.log('url', url)
-      const seeBuy = window.open(url, 'seeBuy', 'location=0')
-    },
-    // 获取应急采购请示流程
-    async getYj() {
-      const res = await getQingShi({
-        table: 'yingjicaigou',
-        page: this.yjPageIndex,
-        status: 1,
-        keyword: this.yjkeyword
-      })
-      for (var m of res.data.flow.data) {
-        m.isSelect = false
-      }
-      this.yjList = res.data.flow.data
-      this.yjTotal = res.data.flow.total
-      // this.hetongoptions = res.data
-    },
-    yjCancel() {
-      this.yjList.forEach((items) => {
-        this.$set(items, 'isSelect', false)
-      })
-      this.form.yingjicaigou = this.editYj
-    },
-    yjSelect(e) {
-      this.yjList.forEach((items) => {
-        this.$set(items, 'isSelect', false)
-        if (items.id == e.id) {
-          this.$set(items, 'isSelect', true)
-        }
-      })
-    },
-    yjComfirm() {
-      this.yjList.forEach((items) => {
-        if (items.isSelect == true) {
-          this.form.yingjicaigou = items.title
-          this.editYj = items.title
-        }
-      })
-    },
-    yjPageChange(e) {
-      this.yjPageIndex = e
-      this.getYj()
-    },
-    async toYjFollow(id) {
-      // let res = await getOatoken()
-
-      const url =
-          `${process.env.VUE_APP_OA_URL}/admin/flow/view/${id}?wuziguanli_oatoken=${this.wuziguanli_oatoken}`
-      console.log('url', url)
-      const seeBuy = window.open(url, 'seeBuy', 'location=0')
     },
-    // 物资明细 回库从库存中选 其他从物资档案
-    mingxiConfirm() {
-      setTimeout(() => {
-        this.showLoading = false
-        this.$nextTick(() => {
-          this.showLoading = true
-        })
-      }, 500)
-      console.log('this.mingxiObj', this.mingxiObj.rukupici)
-      if (this.mingxiObj.wuzibianma == '' || this.mingxiObj.rukushuliang == '' || this.mingxiObj.rukupici == '') {
-        Message({
-          type: 'warning',
-          message: '请填写完整数据'
-        })
-        this.showLoading = false
-        return
-      }
-      if (this.mingxiIndex != '') {
-        this.mingxiList[this.mingxiIndex - 1] = this.mingxiObj
-      } else {
-        this.mingxiList.push(this.mingxiObj)
-      }
-      this.mingxiObj = {
-        wuzibianma: '',
-        rukushuliang: ''
+    // 获取请示流程
+    async getQs() {
+      const res = await getQingShi({
+        // table:'qingshiruku',
+        table: 'qingshi',
+        page: this.qsPageIndex,
+        status: 1,
+        keyword: this.qskeyword
+      })
+      for (var m of res.data.flow.data) {
+        m.isSelect = false
       }
-      this.mingxiObjBefore = {}
-      this.mingxiIndex = ''
-      this.isShowMingxi = false
-      this.showLoading = false
-      this.showList = []
-      this.showTotal = 0
-      this.wuziPageIndex = 1
+      this.qsList = res.data.flow.data
+      this.qsTotal = res.data.flow.total
+      // this.hetongoptions = res.data
     },
-    mingxiCancel() {
-      this.mingxiObj = {
-        wuzibianma: '',
-        rukushuliang: ''
-      }
-      this.mingxiObjBefore = {}
-      this.mingxiIndex = ''
-      this.isShowMingxi = false
-      this.showList = []
-      this.showTotal = 0
-      this.wuziPageIndex = 1
+    qsCancel() {
+      this.qsList.forEach((items) => {
+        this.$set(items, 'isSelect', false)
+      })
+      this.form.qingshiliucheng = this.editQs
     },
-    editMingxi(index) {
-      const before = this.mingxiList[index]
-      for (var m in this.mingxiList[index]) {
-        this.mingxiObjBefore[m] = this.mingxiList[index][m]
-      }
-      this.mingxiObj = this.mingxiList[index]
-      this.mingxiIndex = index + 1 // 为0时！=‘’为false
-      this.isShowMingxi = true
-    },
-    // 删除明细记录
-    async delMingxiList(index, row) {
-      let isDel = false
-      let isDels = false
-      const id = row.id
-      const stocks_items_id = row.stocks_items_id
-      if (row.id) {
-        await destroy({
-          id: id,
-          table_name: 'stocks_item_links'
-        }).then(res => {
-          isDel = true
-        })
-        await destroy({
-          id: stocks_items_id,
-          table_name: 'stocks_items'
-        }).then(res => {
-          isDels = true
-        })
-        if (isDel && isDels) {
-          Message({
-            type: 'success',
-            message: '删除成功'
-          })
-          this.mingxiList.splice(index, 1)
-        } else {
-          Message({
-            type: 'warning',
-            message: '删除失败'
-          })
-        }
-      } else {
-        Message({
-          type: 'success',
-          message: '删除成功'
-        })
-        this.mingxiList.splice(index, 1)
-      }
+    qsSelect(e) {
+      this.qsList.forEach((items) => {
+        this.$set(items, 'isSelect', false)
+        if (items.id == e.id) {
+          this.$set(items, 'isSelect', true)
+        }
+      })
     },
-    showWuzi(type) {
-      this.isShowWuzi = true
-      if (type == '回库') {
-        this.$nextTick(() => {
-          this.$refs.huikubianma.focus()
-        })
-        this.getKucun()
-      } else {
-        this.getWuzi()
-      }
-    },
-    // 新增物资档案
-    showMater() {
-      this.$refs['addMater'].isShow = true
-      this.$refs['addMater'].type = 'add'
-      this.$refs['addMater'].webType = 'insert'
-    },
-    insertMingxi(e) {
-      console.log('e', e)
-      this.mingxiObj.wuzibianma = e.wuzibianma
-      this.mingxiObj.zichanmingcheng = e.zichanmingcheng
-      this.mingxiObj.wuzileixing = e.wuzileixing
-      this.mingxiObj.guigexinghao = e.guigexinghao
-      this.mingxiObj.jiliangdanwei = e.jiliangdanwei
-      this.mingxiObj.fenlei = e.fenlei
-      this.mingxiObj.rukupici = '第一批'
+    qsComfirm() {
+      this.qsList.forEach((items) => {
+        if (items.isSelect == true) {
+          this.form.qingshiliucheng = items.title
+          this.editQs = items.title
+        }
+      })
     },
-    getList() {
-      if (this.form.rukuleixing == '回库') {
-        this.getKucun()
-      } else {
-        this.getWuzi()
-      }
+    qsPageChange(e) {
+      this.qsPageIndex = e
+      this.getQs()
     },
-    async getWuzi() {
-      const res = await index({
-        page_size: 10,
-        page: this.wuziPageIndex,
-        table_name: 'material_infos',
-        filter: [{
-          'key': 'zichanmingcheng',
-          'op': 'like',
-          'value': this.keyword
-        }, {
-          'key': 'wuzibianma',
-          'op': 'like',
-          'value': this.wuzibianmakeyword
-        }]
-      })
-      for (var m of res.data) {
-        m.names = m.wuzibianma + '--' + m.zichanmingcheng
-        m.isSelect = false
-      }
-      this.showList = res.data
-      this.showTotal = res.total
+    async toQsFollow(id) {
+      // let res = await getOatoken()
+
+      const url =
+          `${process.env.VUE_APP_OA_URL}/admin/flow/view/${id}?wuziguanli_oatoken=${this.wuziguanli_oatoken}`
+      console.log('url', url)
+      const seeBuy = window.open(url, 'seeBuy', 'location=0')
     },
-    async getKucun() {
-      const res = await index({
-        page_size: 10,
-        page: this.wuziPageIndex,
-        table_name: 'inventorys',
-        filter: [{
-          'key': 'zichanmingcheng',
-          'op': 'like',
-          'value': this.keyword
-        }, {
-          'key': 'wuzibianma',
-          'op': 'like',
-          'value': this.wuzibianmakeyword
-        }]
+    // 获取应急采购请示流程
+    async getYj() {
+      const res = await getQingShi({
+        table: 'yingjicaigou',
+        page: this.yjPageIndex,
+        status: 1,
+        keyword: this.yjkeyword
       })
-      for (var m of res.data) {
-        m.names = m.wuzibianma + '--' + m.zichanmingcheng
+      for (var m of res.data.flow.data) {
         m.isSelect = false
       }
-      this.showList = res.data
-      this.showTotal = res.total
-    },
-    //
-    getIds(url, name) {
-      var reg = new RegExp('(^|&)' + name.toLowerCase() + '=([^&]*)(&|$)')
-      var r = url.match(reg)
-      if (r != null) {
-        return unescape(r[2].replace(new RegExp(/(%25)/g), '%').replace(new RegExp(/(%25)/g), '%'))
-      }
-      return null
+      this.yjList = res.data.flow.data
+      this.yjTotal = res.data.flow.total
+      // this.hetongoptions = res.data
     },
-    async getKucunShow(e) {
-      console.log(e)
-      let id = ''
-      if (e) {
-        // id = e.split('-')[1]
-        id = e.substring(e.indexOf('=') + 1, e.indexOf('&'))
-        console.log('id', id)
-        this.$nextTick(() => {
-          this.$refs.huikubianma.blur()
-        })
-      } else {
-        return
-      }
-      const res = await show({
-        id: id,
-        table_name: 'inventorys'
+    yjCancel() {
+      this.yjList.forEach((items) => {
+        this.$set(items, 'isSelect', false)
       })
-      this.mingxiObj.wuzibianma = res.wuzibianma
-      this.mingxiObj.zichanmingcheng = res.zichanmingcheng
-      this.mingxiObj.guigexinghao = res.guigexinghao
-      this.mingxiObj.wuzileixing = res.wuzileixing
-      this.mingxiObj.jiliangdanwei = res.jiliangdanwei
-      this.mingxiObj.zaikushuliang = res.zaikushuliang
-      this.mingxiObj.rukupici = res.rukupici
-      this.mingxiObj.id = res.id
+      this.form.yingjicaigou = this.editYj
     },
-    async getPici() {
-      const res = await index({
-        page_size: 999,
-        page: 1,
-        table_name: 'inventorys',
-        filter: [{
-          'key': 'wuzibianma',
-          'op': 'eq',
-          'value': this.mingxiObj.wuzibianma
-        }]
-      })
-      this.rukupiciList = []
-      for (var m of res.data) {
-        this.rukupiciList.push({
-          value: m.rukupici,
-          label: m.rukupici
-        })
-      }
-    },
-    selectPici(e) {
-      console.log('pici', e)
-    },
-    wuziSelect(e) {
-      console.log(e)
-      this.showList.forEach((items) => {
+    yjSelect(e) {
+      this.yjList.forEach((items) => {
         this.$set(items, 'isSelect', false)
         if (items.id == e.id) {
           this.$set(items, 'isSelect', true)
         }
-      })
-      if (this.form.rukuleixing == '回库') {
-        this.mingxiObj.wuzibianma = e.wuzibianma
-        this.mingxiObj.zichanmingcheng = e.zichanmingcheng
-        this.mingxiObj.guigexinghao = e.guigexinghao
-        this.mingxiObj.wuzileixing = e.wuzileixing
-        this.mingxiObj.jiliangdanwei = e.jiliangdanwei
-        this.mingxiObj.zaikushuliang = e.zaikushuliang
-        this.mingxiObj.rukupici = e.rukupici
-        this.mingxiObj.id = e.id
-        this.mingxiObj.shengchanriqi = e.shengchanriqi
-      } else {
-        this.mingxiObj.wuzibianma = e.wuzibianma
-        this.mingxiObj.zichanmingcheng = e.zichanmingcheng
-        this.mingxiObj.wuzileixing = e.wuzileixing
-        this.mingxiObj.guigexinghao = e.guigexinghao
-        this.mingxiObj.jiliangdanwei = e.jiliangdanwei
-        this.mingxiObj.fenlei = e.fenlei
-        if (this.mingxiObj.wuzileixing == '一类一码') {
-          this.getPici()
-        }
-      }
-    },
-    wuziPageChange(e) {
-      console.log('e', e)
-      this.wuziPageIndex = e
-      this.getList()
+      })
     },
-
-    async getCangku() {
-      const res = await index({
-        page_size: 999,
-        page: 1,
-        table_name: 'materialstorages'
+    yjComfirm() {
+      this.yjList.forEach((items) => {
+        if (items.isSelect == true) {
+          this.form.yingjicaigou = items.title
+          this.editYj = items.title
+        }
       })
-      this.cangkuList = res.data
     },
-    async getDetail() {
-      const res = await show({
-        id: this.id,
-        table_name: this.tableName
-      })
-      this.form = {
-        caigouhetong: res?.caigouhetong,
-        qingshiliucheng: res?.qingshiliucheng,
-        gudingzichanbianhao: res?.gudingzichanbianhao,
-        rukushijian: res?.rukushijian,
-        rukuleixing: res?.rukuleixing,
-        pandianleixing: res?.pandianleixing,
-        rukucangku: res.rukucangku,
-        jingbanren: res?.jingbanren,
-        jilurenyuan: res?.jilurenyuan,
-        baoguanrenyuan: res?.baoguanrenyuan,
-        beizhu: res?.beizhu,
-        zuozhengwenjian: res?.zuozhengwenjian,
-        rukumingxi: ''
-      }
-      this.editHt = res?.caigouhetong
-      this.editQs = res?.qingshiliucheng
-      this.mingxiList = []
-      for (var r of res.id_stocks_item_links_stocks_id_relation) {
-        const yuanshishuju = JSON.parse(r.yuanshishuju)
-        yuanshishuju['id'] = r.id
-        yuanshishuju['stocks_items_id'] = r.stocks_items_id
-        this.mingxiList.push(yuanshishuju)
-      }
-      console.log('this.mingxiList', this.mingxiList)
-      this.fileList = []
-      const _lists = res.zuozhengwenjian_upload_details ? res.zuozhengwenjian_upload_details : []
-      for (var f of _lists) {
-        this.fileList.push({
-          name: f?.original_name,
-          url: f?.url,
-          response: f
-        })
-      }
-      // this.isShow = true
-    },
-
-    isHasEqual(arr, key, key1) {
-      if (arr.length === 0) {
-        return
-      }
-      for (let i = 0; i < arr.length; i++) {
-        if (arr.filter(item => item[key] == arr[i][key]).length > 1 && arr.filter(item => item[key1] == arr[i][key1]).length > 1) {
-          return true
-        }
-      }
-      return false
+    yjPageChange(e) {
+      this.yjPageIndex = e
+      this.getYj()
     },
-    submit() {
-      this.form.id_stocks_items_stocks_id_relation = this.mingxiList
-      console.log('form', this.form)
-      const has = this.isHasEqual(this.form.id_stocks_items_stocks_id_relation, 'wuzibianma', 'rukupici')
-      if (has) {
-        Message({
-          type: 'warning',
-          message: '同一物资同一批次请不要重复录入'
-        })
-        return
-      }
-      // return
-      console.log('fileList', this.fileList)
-      this.form.zuozhengwenjian = []
-      for (var k of this.fileList) {
-        this.form.zuozhengwenjian.push(k?.response?.id)
-      }
-
-      console.log(this.form.zuozhengwenjian)
-      // return
-      if (this.type === 'add') {
-        save({
-          table_name: this.tableName,
-          ...this.form
-        }).then(res => {
-          Message({
-            type: 'success',
-            message: '新增成功'
-          })
-          this.isShow = false
-          this.$emit('refresh')
-        })
-        return
-      }
-      if (this.type === 'editor') {
-        save({
-          id: this.id,
-          table_name: this.tableName,
-          ...this.form
-        }).then(res => {
-          Message({
-            type: 'success',
-            message: '编辑成功'
-          })
-          this.isShow = false
-          this.$emit('refresh')
-        })
-      }
+    async toYjFollow(id) {
+      // let res = await getOatoken()
+
+      const url =
+          `${process.env.VUE_APP_OA_URL}/admin/flow/view/${id}?wuziguanli_oatoken=${this.wuziguanli_oatoken}`
+      console.log('url', url)
+      const seeBuy = window.open(url, 'seeBuy', 'location=0')
     },
+    // 获取导入表 字段
     async getField() {
       const res = await fieldIndex({
         page: 1,
@@ -1508,88 +1038,25 @@ export default {
           return i
         })
     }
-  }
 
+  }
 }
 </script>
 
-<style scoped lang="scss">
-  .mingxiwrap {
-    display: flex;
-    flex-wrap: wrap;
-  }
-
-  .mingxiwrap .xy-table-item {
-    margin-bottom: 10px
+<style scoped>
+  .step-content {
+    min-height: 300px;
   }
 
-  .searchCompanys {
+  .operation-bar {
     display: flex;
-    justify-content: space-between;
-    margin-bottom: 15px;
-  }
-
-  ::v-deep .searchCompanys .el-input {
-    width: 82%
+    justify-content: flex-end;
   }
 
-  .xy-table-item-label {
-    width: 160px;
-  }
-
-  .img__delete {
-    transform: scale(0.8, 0.8);
-
-    position: absolute;
-    top: 4px;
-    right: 4px;
-  }
-
-  ::v-deep .avatar-uploader .el-upload {
-    border: 1px dashed #d9d9d9;
-    border-radius: 6px;
-    cursor: pointer;
-    position: relative;
-    overflow: hidden;
-  }
-
-  ::v-deep .avatar-uploader .el-upload:hover {
-    border-color: #409EFF;
-  }
-
-  ::v-deep .el-upload--picture-card {
-    font-size: 28px;
-    color: #8c939d;
-    width: 80px !important;
-    height: 80px !important;
-    line-height: 80px !important;
-    text-align: center;
-  }
-
-  ::v-deep .avatar-uploader-icon {
-    font-size: 28px;
-    color: #8c939d;
-    width: 80px !important;
-    height: 80px !important;
-    line-height: 80px !important;
-    text-align: center;
-  }
-
-  ::v-deep .avatar {
-    width: 80px !important;
-    display: block;
-    border-radius: 6px;
-  }
-
-  ::v-deep .xy-table-item-label {
-    width: 160px !important;
-  }
-
-  ::v-deep .el-date-editor .el-range-separator {
-    width: auto !important;
-  }
-
-  ::v-deep .el-input-number .el-input__inner {
-    text-align: left !important;
+  .step-complete {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 300px;
   }
 </style>
diff --git a/src/views/stocks/component/addRuku.vue b/src/views/stocks/component/addRuku.vue
index 2432fcb..8196073 100644
--- a/src/views/stocks/component/addRuku.vue
+++ b/src/views/stocks/component/addRuku.vue
@@ -1,10 +1,6 @@
 <template>
-  <el-dialog
-    :title="type === 'add' ? `新增${rukuTypeName}入库` : `编辑${rukuTypeName}入库`"
-    :visible.sync="isShow"
-    width="70%"
-    :before-close="handleClose"
-  >
+  <el-dialog :title="type === 'add' ? `新增${rukuType}` : `编辑${rukuType}`" :visible.sync="isShow" width="70%"
+    :before-close="handleClose">
     <el-steps :active="activeStep" finish-status="success" simple>
       <el-step title="基本信息" />
       <el-step title="物资明细" />
@@ -15,46 +11,14 @@
       <!-- 第一步：基本信息 -->
       <div v-show="activeStep === 0">
         <el-form ref="basicForm" :model="form" :rules="rules" label-width="100px">
-          <el-form-item v-if="form.rukuleixing=='采购'" label="采购合同" prop="caigouhetong">
-            <el-input
-              v-model="form.caigouhetong"
-              type="text"
-              clearable
-              placeholder="请选择采购合同"
-              @focus="isShowHt=true"
-            />
-          </el-form-item>
-          <el-form-item v-if="form.rukuleixing=='请示'" label="请示流程" prop="qingshiliucheng">
-            <el-input
-              v-model="form.qingshiliucheng"
-              type="text"
-              clearable
-              placeholder="请选择请示流程"
-              @focus="isShowQs=true"
-            />
-          </el-form-item>
-          <el-form-item v-if="form.rukuleixing=='应急采购'" label="应急采购请示流程" prop="yingjicaigou">
-            <el-input
-              v-model="form.yingjicaigou"
-              type="text"
-              clearable
-              placeholder="请选择应急采购请示流程"
-              @focus="isShowYj=true"
-            />
-          </el-form-item>
-          <el-form-item v-if="form.rukuleixing=='盘点'" label="盘点类型" prop="pandianleixing">
+          <el-form-item v-if="form.rukuleixing=='盘点入库'" label="盘点类型" prop="pandianleixing">
             <el-select v-model="form.pandianleixing" style="width:100%" filterable placeholder="请选择盘点类型">
               <el-option v-for="item in pandianList" :key="item.value" :label="item.value" :value="item.value" />
             </el-select>
           </el-form-item>
           <el-form-item label="入库日期" prop="rukushijian">
-            <el-date-picker
-              v-model="form.rukushijian"
-              type="date"
-              placeholder="选择入库日期"
-              value-format="yyyy-MM-dd"
-              style="width: 100%;"
-            />
+            <el-date-picker v-model="form.rukushijian" type="date" placeholder="选择入库日期" value-format="yyyy-MM-dd"
+              style="width: 100%;" />
           </el-form-item>
           <el-form-item label="经办人" prop="jingbanren">
             <el-input v-model="form.jingbanren" placeholder="请输入经办人" />
@@ -65,26 +29,13 @@
           <el-form-item label="保管人" prop="baoguanrenyuan">
             <el-input v-model="form.baoguanrenyuan" placeholder="请输入保管人" />
           </el-form-item>
-          <el-form-item label="入库凭证" prop="zuozhengwenjian">
-            <el-upload
-              ref="upload"
-              class="upload-demo"
-              :action="action"
-              multiple
-              :headers="headers"
-              :before-upload="beforeUpload"
-              :on-success="onSuccess"
-              :on-error="onError"
-              :on-remove="onRemove"
-              :file-list="fileList"
-              :auto-upload="true"
-            >
+          <el-form-item label="货物验收单" prop="zuozhengwenjian">
+            <el-upload ref="upload" class="upload-demo" :action="action" multiple :headers="headers"
+              :before-upload="beforeUpload" :on-success="onSuccess" :on-error="onError" :on-remove="onRemove"
+              :file-list="fileList" :auto-upload="true">
               <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
-              <!-- <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button> -->
-              <!-- <div slot="tip" class="el-upload__tip">上传文件不超过500kb</div> -->
             </el-upload>
           </el-form-item>
-
           <el-form-item label="备注" prop="beizhu">
             <el-input v-model="form.beizhu" type="textarea" placeholder="请输入备注信息" :rows="3" />
           </el-form-item>
@@ -94,12 +45,8 @@
       <!-- 第二步：物资明细 -->
       <div v-show="activeStep === 1">
         <div class="operation-bar" style="margin-bottom: 20px;">
-          <el-button
-            size="mini"
-            type="primary"
-            @click="addStockItems"
-          >添加物资明细</el-button>
-          <el-button size="mini" type="primary" @click="importsRuku">导入</el-button>
+          <el-button size="mini" type="primary" @click="addStockItems">添加物资明细</el-button>
+          <!-- <el-button size="mini" type="primary" @click="importsRuku">导入</el-button> -->
         </div>
         <xy-table style="width: 100%" :height="260" :is-page="false" :list="mingxiList" :table-item="mingxiTable">
           <template v-slot:btns>
@@ -116,81 +63,29 @@
 
       <!-- 第三步：完成 -->
       <div v-show="activeStep === 2" class="step-complete">
-        <el-result icon="success" title="保存成功" sub-title="是否批量打印二维码？">
+        <!-- <el-result icon="success" title="保存成功" sub-title="是否批量打印二维码？">
           <template slot="extra">
             <el-button type="primary" @click="handlePrint">打印二维码</el-button>
             <el-button @click="handleClose">关闭</el-button>
           </template>
+        </el-result> -->
+        <el-result icon="success" title="保存成功" sub-title="是否发起流程？">
+          <template slot="extra">
+            <el-button type="primary" @click="toOaFollow">发起{{rukuType}}流程</el-button>
+          </template>
         </el-result>
       </div>
     </div>
 
     <div slot="footer" class="dialog-footer">
-      <el-button v-if="activeStep > 0" @click="prevStep">上一步</el-button>
-      <el-button
-        v-if="activeStep < 2"
-        type="primary"
-        @click="nextStep"
-      >{{ activeStep === 1 ? '保存' : '下一步' }}</el-button>
+      <el-button v-if="activeStep < 2" @click="prevStep">上一步</el-button>
+      <el-button v-if="activeStep < 2" type="primary"
+        @click="nextStep">{{ activeStep === 1 ? '保存' : '下一步' }}</el-button>
     </div>
 
-    <!-- 选择采购合同 -->
-    <Modal v-model="isShowHt" :z-index="9999" title="合同选择" width="70%" @on-cancel="htCancel" @on-ok="htComfirm">
-      <div class="searchCompanys">
-        <el-input v-model="htkeyword" type="text" placeholder="请输入关键词查找" @keyup.enter.native="getHt" />
-        <el-button type="primary" @click="getHt">查询</el-button>
-      </div>
-      <Table ref="currentRowTable" highlight-row :columns="htColumns" :data="htList" @on-current-change="htSelect" />
-      <Page
-        :current="htPageIndex"
-        :total="htTotal"
-        simple
-        style="padding-top: 14px;display: flex;justify-content: center;"
-        @on-change="htPageChange"
-      />
-    </Modal>
-    <!-- 选择请示流程 -->
-    <Modal v-model="isShowQs" :z-index="10000" title="请示选择" width="70%" @on-cancel="qsCancel" @on-ok="qsComfirm">
-      <div class="searchCompanys">
-        <el-input v-model="qskeyword" type="text" placeholder="请输入关键词查找" @keyup.enter.native="getQs" />
-        <el-button type="primary" @click="getQs">查询</el-button>
-      </div>
-      <Table ref="currentRowTable" highlight-row :columns="qsColumns" :data="qsList" @on-current-change="qsSelect" />
-      <Page
-        :current="qsPageIndex"
-        :total="qsTotal"
-        simple
-        style="padding-top: 14px;display: flex;justify-content: center;"
-        @on-change="qsPageChange"
-      />
-    </Modal>
-
-    <!-- 选择应急采购请示流程 -->
-    <Modal v-model="isShowYj" :z-index="10000" title="应急采购请示选择" width="70%" @on-cancel="yjCancel" @on-ok="yjComfirm">
-      <div class="searchCompanys">
-        <el-input v-model="yjkeyword" type="text" placeholder="请输入关键词查找" @keyup.enter.native="getYj" />
-        <el-button type="primary" @click="getYj">查询</el-button>
-      </div>
-      <Table ref="currentRowTable" highlight-row :columns="yjColumns" :data="yjList" @on-current-change="yjSelect" />
-      <Page
-        :current="yjPageIndex"
-        :total="qsTotal"
-        simple
-        style="padding-top: 14px;display: flex;justify-content: center;"
-        @on-change="yjPageChange"
-      />
-    </Modal>
-
-    <!-- 合同 明细查看 -->
-    <detailContract ref="detailContract" />
     <!-- 导入明细 -->
-    <imports
-      ref="imports"
-      :table-name="importstableName"
-      :istrueimport="false"
-      :form-info="importForm"
-      @importdata="getimportData"
-    />
+    <imports ref="imports" :table-name="importstableName" :istrueimport="false" :form-info="importForm"
+      @importdata="getimportData" />
 
     <!-- 新增入库物资 -->
     <addStock ref="addStock" @refresh="addStockMingxi" />
@@ -199,848 +94,544 @@
 </template>
 
 <script>
-import {
-  save,
-  index,
-  show,
-  destroy
-} from '@/api/system/baseForm.js'
-import {
-  index as getContract,
-  getQingShi,
-  getOatoken
-} from '@/api/contract.js'
-import {
-  Message
-} from 'element-ui'
-import detailContract from '../component/detailContract.vue'
-import imports from '@/views/component/imports.vue'
-import addStock from '../component/addStock.vue'
-import {
-  index as fieldIndex
-} from '@/api/system/customFormField'
-import {
-  getToken
-} from '@/utils/auth'
-import addMater from '@/views/materialfile/component/addMater.vue'
-import {
-  getWzpc
-} from '@/api/mater.js'
-export default {
-  name: 'PurchaseDialog',
-  components: {
-    detailContract,
-    addMater,
-    imports,
-    addStock
-  },
-  data() {
-    return {
-      id: '',
-      isShow: false,
-      type: 'add',
-      tableName: 'stocks',
-      currentPici:'', // 这一次的批次号
-      rukuTypeName: '',
-      rukuType: '',
-      activeStep: 0,
-      fileList: [],
-      action: process.env.VUE_APP_UPLOAD_API,
-      headers: {
-        token: ''
-      },
-      wuziguanli_oatoken: '',
-      form: {
-        caigouhetong: '',
-        qingshiliucheng: '',
-        yingjicaigou: '',
-        gudingzichanbianhao: '',
-        rukushijian: '',
-        rukuleixing: '',
-        pandianleixing: '',
-        // rukucangku: '',
-        jingbanren: '',
-        jilurenyuan: '',
-        baoguanrenyuan: '',
-        beizhu: '',
-        zuozhengwenjian: ''
-      },
-      rules: {
-        rukushijian: [{
-          required: true,
-          message: '请选择入库日期',
-          trigger: 'change'
-        }],
-        jingbanren: [{
-          required: true,
-          message: '请填写经办人'
-        }],
-        jilurenyuan: [{
-          required: true,
-          message: '请填写记录人'
+  import {
+    save,
+    index,
+    show,
+    destroy
+  } from '@/api/system/baseForm.js'
+  import {
+    getOatoken
+  } from '@/api/contract.js'
+  import {
+    Message
+  } from 'element-ui'
+  import imports from '@/views/component/imports.vue'
+  import addStock from '../component/addStock.vue'
+  import {
+    index as fieldIndex
+  } from '@/api/system/customFormField'
+  import {
+    getToken
+  } from '@/utils/auth'
+  import addMater from '@/views/materialfile/component/addMater.vue'
+  import {
+    getWzpc
+  } from '@/api/mater.js'
+  export default {
+    name: 'PurchaseDialog',
+    components: {
+      addMater,
+      imports,
+      addStock
+    },
+    data() {
+      return {
+        activeStep: 0,
+        id: '',
+        isShow: false,
+        type: 'add',
+        tableName: 'stocks',
+        currentPici: '', // 这一次的批次号
+        rukuType: '', // 入库类型
+        fileList: [],
+        action: process.env.VUE_APP_UPLOAD_API,
+        headers: {
+          token: ''
+        },
+        link_id:'', // 保存后返回的这一条id
+        wuziguanli_oatoken: '',
+        form: {
+          rukushijian: '',
+          rukuleixing: '',
+          pandianleixing: '',
+          jingbanren: '',
+          jilurenyuan: '',
+          baoguanrenyuan: '',
+          beizhu: '',
+          zuozhengwenjian: ''
+        },
+        rules: {
+          rukushijian: [{
+            required: true,
+            message: '请选择入库日期',
+            trigger: 'change'
+          }],
+          jingbanren: [{
+            required: true,
+            message: '请填写经办人'
+          }],
+          jilurenyuan: [{
+            required: true,
+            message: '请填写记录人'
+          }],
+          zuozhengwenjian: [{
+            required: true,
+            message: '请上传货物验收单'
+          }]
+        },
+        // 盘点类型
+        pandianList: [{
+          label: '正常盘点',
+          value: '正常盘点'
+        }, {
+          label: '外部调拨',
+          value: '外部调拨'
+        }, {
+          label: '其他',
+          value: '其他'
         }],
-        zuozhengwenjian: [{
-          required: true,
-          message: '请上传入库凭证'
-        }]
-      },
-      // 盘点类型
-      pandianList: [{
-        label: '正常盘点',
-        value: '正常盘点'
-      }, {
-        label: '外部调拨',
-        value: '外部调拨'
-      }, {
-        label: '其他',
-        value: '其他'
-      }],
-      // 合同
-      isShowHt: false,
-      htList: [],
-      htPageIndex: 1,
-      htkeyword: '',
-      htTotal: 0,
-      editHt: '',
-      htColumns: [{
-        width: 60,
-        _isChecked: false,
-        key: 'isSelect',
-        resizable: true,
-        render: (h, params) => {
-          return h('div', [
-            h('Radio', {
-              props: {
-                value: params.row.isSelect
-              },
-              on: {
-                'on-change': (e) => {
-                  this.htList.forEach((items) => {
-                    this.$set(items, 'isSelect', false)
-                  })
-                  this.htList[params.index].isSelect = e
-                }
-              }
-            })
-          ])
-        }
-      }, {
-        title: '名称',
-        key: 'name'
-      }, {
-        title: '类型',
-        key: 'type_name',
-        width: 100
-      }, {
-        title: '状态',
-        key: 'status_name',
-        width: 100
-      }, {
-        title: '查看',
-        key: '',
-        width: 100,
-        render: (h, params) => {
-          return h('span', {
-            style: {
-              color: '#0077CC',
-              cursor: 'pointer'
-            },
-            on: {
-              'click': (e) => {
-                console.log('click', params.row.id)
-                this.$refs['detailContract'].getDetail(params.row.id)
-                this.$refs['detailContract'].isShowDetail = true
-                // @click=","
-              }
-            }
-          }, '查看详情')
+
+        // 导入
+        importstableName: 'stocks_items',
+        importForm: [],
+        customFormId: 8,
+        mingxiList: [],
+        mingxiTable: [{
+            label: '序号',
+            type: 'index',
+            fixed: 'left',
+            width: 80
+          },
+          {
+            label: '物资名称',
+            width: 180,
+            prop: 'zichanmingcheng',
+            align: 'left'
+          },
+          {
+            label: '所属种类',
+            width: 80,
+            prop: 'fenleiName',
+            align: 'center'
+          },
+          {
+            label: '种类编码',
+            width: 120,
+            prop: 'wuzibianma',
+            align: 'center'
+          },
+          {
+            label: '物资类型',
+            width: 120,
+            prop: 'wuzileixing',
+            align: 'center'
+          },
+          {
+            label: '物资型号',
+            width: 120,
+            prop: 'guigexinghao',
+            align: 'left'
+          },
+          {
+            label: '物资规格',
+            width: 120,
+            prop: 'wuziguige',
+            align: 'left'
+          },
+          {
+            label: '单位',
+            width: 80,
+            prop: 'jiliangdanwei',
+            align: 'center'
+          }, {
+            label: '在库数量',
+            prop: 'zaikushuliang',
+            width: 80
+          },
+          {
+            label: '入库批次',
+            prop: 'rukupici',
+            width: 120
+          }, {
+            label: '入库数量',
+            prop: 'rukushuliang',
+            width: 80
+          }
+          // ,{
+          //   label: "物资状态",
+          //   prop: "wuzizhuangtai",
+          //   width: 180
+          // },{
+          //   label: "生产日期",
+          //   prop: "shengchanriqi",
+          //   width: 180
+          // },
+        ],
+        // 打印
+        printArr: ''
+      }
+    },
+    watch: {
+      isShow(newVal) {
+        if (newVal) {
+          this.form.rukuleixing = this.rukuType
+          if (this.rukuType == '盘点入库') {
+            this.form.pandianleixing = '正常盘点'
+          }
+          if (this.type === 'editor') {
+            this.getDetail()
+          }
+          if (this.type == 'add') {
+            this.form.jingbanren = this.authName
+          }
+        } else {
+          this.resetForm()
         }
-      }],
-      // 请示流程
-      isShowQs: false,
-      qsList: [],
-      qskeyword: '',
-      qsPageIndex: 1,
-      qsTotal: 0,
-      editQs: '',
-      qsColumns: [{
-        width: 60,
-        _isChecked: false,
-        key: 'isSelect',
-        resizable: true,
-        render: (h, params) => {
-          return h('div', [
-            h('Radio', {
-              props: {
-                value: params.row.isSelect
-              },
-              on: {
-                'on-change': (e) => {
-                  this.qsList.forEach((items) => {
-                    this.$set(items, 'isSelect', false)
-                  })
-                  this.qsList[params.index].isSelect = e
-                }
-              }
-            })
-          ])
+      }
+    },
+    created() {
+      this.headers.token = getToken()
+      getOatoken().then(res => {
+        this.wuziguanli_oatoken = res.oatoken
+      })
+    },
+    methods: {
+      // 佐证文件上传
+      beforeUpload(file) {
+        // if (file.size / 1000 > 500) {
+        //   this.$message({
+        //     type: "warning",
+        //     message: "上传文件大小超过500kb！",
+        //   });
+        //   return false;
+        // }
+      },
+      onSuccess(response, file, fileList) {
+        console.log('fileList', fileList)
+        this.fileList = fileList
+        const arr = []
+        for (var k of this.fileList) {
+          arr.push(k?.response?.id)
         }
-      }, {
-        title: '名称',
-        key: 'title'
-      }, {
-        title: '查看',
-        key: '',
-        width: 100,
-        render: (h, params) => {
-          return h('span', {
-            style: {
-              color: '#0077CC',
-              cursor: 'pointer'
-            },
-            on: {
-              'click': (e) => {
-                this.toQsFollow(params.row.belongs_id)
-                // @click=","
-              }
-            }
-          }, '查看详情')
+        this.form.zuozhengwenjian = arr
+      },
+
+      onRemove(file, fileList) {
+        this.fileList = fileList
+        const arr = []
+        for (var k of this.fileList) {
+          arr.push(k?.response?.id)
         }
-      }],
-      // 应急采购请示流程
-      isShowYj: false,
-      yjList: [],
-      yjkeyword: '',
-      yjPageIndex: 1,
-      yjTotal: 0,
-      editYj: '',
-      yjColumns: [{
-        width: 60,
-        _isChecked: false,
-        key: 'isSelect',
-        resizable: true,
-        render: (h, params) => {
-          return h('div', [
-            h('Radio', {
-              props: {
-                value: params.row.isSelect
-              },
-              on: {
-                'on-change': (e) => {
-                  this.yjList.forEach((items) => {
-                    this.$set(items, 'isSelect', false)
-                  })
-                  this.yjList[params.index].isSelect = e
-                }
-              }
-            })
-          ])
+        this.form.zuozhengwenjian = arr
+      },
+
+      onError(err, file, fileList) {
+        this.fileList = fileList
+        this.$message({
+          type: 'warning',
+          message: err
+        })
+      },
+      // 获取批次
+      async getPici() {
+        if (this.form.rukuleixing != '回库') {
+          const res = await getWzpc()
+          this.currentPici = res.msg
         }
-      }, {
-        title: '名称',
-        key: 'title'
-      }, {
-        title: '查看',
-        key: '',
-        width: 100,
-        render: (h, params) => {
-          return h('span', {
-            style: {
-              color: '#0077CC',
-              cursor: 'pointer'
-            },
-            on: {
-              'click': (e) => {
-                this.toYjFollow(params.row.belongs_id)
-                // @click=","
-              }
+      },
+      // 上一步
+      prevStep() {
+        this.activeStep--
+      },
+      // 下一步
+      nextStep() {
+        if (this.activeStep === 0) {
+          this.$refs.basicForm.validate(valid => {
+            if (valid) {
+              this.getPici()
+              this.activeStep++
             }
-          }, '查看详情')
+          })
+          // this.getPici()
+          // this.activeStep++
+        } else if (this.activeStep === 1) {
+          if (this.mingxiList.length === 0) {
+            this.$message.warning('请至少添加一条物资明细')
+            return
+          }
+          this.saveData()
         }
-      }],
-      // 导入
-      importstableName: 'stocks_items',
-      importForm: [],
-      customFormId: 8,
-      mingxiList: [],
-      mingxiTable: [{
-        label: '序号',
-        type: 'index',
-        fixed: 'left',
-        width: 80
-      },
-      {
-        label: '物资名称',
-        width: 180,
-        prop: 'zichanmingcheng',
-        align: 'left'
-      },
-      {
-        label: '所属种类',
-        width: 180,
-        prop: 'fenleiName',
-        align: 'center'
-      },
-      {
-        label: '种类编码',
-        width: 120,
-        prop: 'wuzibianma',
-        align: 'center'
       },
-      {
-        label: '物资类型',
-        width: 180,
-        prop: 'wuzileixing',
-        align: 'center'
+      // 导入入库明细
+      importsRuku() {
+        this.$refs['imports'].show()
+        this.getField()
       },
-      {
-        label: '物资型号',
-        width: 180,
-        prop: 'guigexinghao',
-        align: 'left'
+      getimportData(e) {
+        console.log('e', e)
+        this.mingxiList = e
       },
-      {
-        label: '物资规格',
-        width: 180,
-        prop: 'wuziguige',
-        align: 'left'
+      // 新增的明细 插入到mingxilist中
+      addStockItems() {
+        this.$refs.addStock.rukuleixing = this.form.rukuleixing
+        this.$refs.addStock.setPici(this.currentPici, this.form.rukushijian)
+        this.$refs.addStock.isShowMingxi = true
       },
-      {
-        label: '单位',
-        width: 180,
-        prop: 'jiliangdanwei',
-        align: 'center'
-      }, {
-        label: '在库数量',
-        prop: 'zaikushuliang',
-        width: 180
+      addStockMingxi(obj) {
+        this.mingxiList.push(obj)
       },
-      {
-        label: '入库批次',
-        prop: 'rukupici',
-        width: 180
-      }, {
-        label: '入库数量',
-        prop: 'rukushuliang',
-        width: 180
-      }
-        // ,{
-        //   label: "物资状态",
-        //   prop: "wuzizhuangtai",
-        //   width: 180
-        // },{
-        //   label: "生产日期",
-        //   prop: "shengchanriqi",
-        //   width: 180
-        // },
-      ],
-      // 打印
-      printArr: ''
-    }
-  },
-  watch: {
-    isShow(newVal) {
-      if (newVal) {
-        this.form.rukuleixing = this.rukuType
-        this.rukuTypeName = this.rukuType == '回库' ? '归还' : this.rukuType
-        console.log(this.rukuTypeName)
-        if (this.rukuTypeName == '盘点') {
-          this.form.pandianleixing = '正常盘点'
-        }
-        if (this.rukuType == '采购') {
-          this.getHt()
+      // 保存数据 判断是否有相同的 物资
+      isHasEqual(arr, key, key1) {
+        if (arr.length === 0) {
+          return
         }
-        if (this.rukuType == '请示') {
-          this.getQs()
+        for (let i = 0; i < arr.length; i++) {
+          if (arr.filter(item => item[key] == arr[i][key]).length > 1 && arr.filter(item => item[key1] == arr[i][key1])
+            .length > 1) {
+            return true
+          }
         }
-        if (this.rukuType == '应急采购') {
-          this.getYj()
+        return false
+      },
+      saveData() {
+        this.form.id_stocks_items_stocks_id_relation = this.mingxiList
+        console.log('form', this.form)
+        // 是否有 重复的物资
+        const has = this.isHasEqual(this.form.id_stocks_items_stocks_id_relation, 'wuzibianma', 'rukupici')
+        if (has) {
+          Message({
+            type: 'warning',
+            message: '同一物资同一批次请不要重复录入'
+          })
+          return
         }
-        if (this.type === 'editor') {
-          this.getDetail()
+        this.form.zuozhengwenjian = []
+        for (var k of this.fileList) {
+          this.form.zuozhengwenjian.push(k?.response?.id)
         }
-        if (this.type == 'add') {
-          this.form.jingbanren = this.authName
+        if (this.type === 'add') {
+          this.form.zhuangtai = 0
+          delete this.form.id
         }
-      } else {
-        this.resetForm()
-      }
-    }
-  },
-  created() {
-    this.headers.token = getToken()
-    getOatoken().then(res => {
-      this.wuziguanli_oatoken = res.oatoken
-    })
-  },
-  methods: {
-    // 佐证文件上传
-    beforeUpload(file) {
-      // if (file.size / 1000 > 500) {
-      //   this.$message({
-      //     type: "warning",
-      //     message: "上传文件大小超过500kb！",
-      //   });
-      //   return false;
-      // }
-    },
-    onSuccess(response, file, fileList) {
-      console.log('fileList', fileList)
-      this.fileList = fileList
-      const arr = []
-      for (var k of this.fileList) {
-        arr.push(k?.response?.id)
-      }
-      this.form.zuozhengwenjian = arr
-    },
-
-    onRemove(file, fileList) {
-      this.fileList = fileList
-      const arr = []
-      for (var k of this.fileList) {
-        arr.push(k?.response?.id)
-      }
-      this.form.zuozhengwenjian = arr
-    },
-
-    onError(err, file, fileList) {
-      this.fileList = fileList
-      this.$message({
-        type: 'warning',
-        message: err
-      })
-    },
-    submitUpload() {
-      this.$refs.upload.submit()
-    },
-    // 导入入库明细
-    importsRuku() {
-      this.$refs['imports'].show()
-      this.getField()
-    },
-    getimportData(e) {
-      console.log('e', e)
-      this.mingxiList = e
-    },
-    // 新增的明细 插入到mingxilist中
-    addStockItems(){
-      this.$refs.addStock.rukuleixing=this.form.rukuleixing
-      this.$refs.addStock.setPici(this.currentPici,this.form.rukushijian)
-      this.$refs.addStock.isShowMingxi=true
-    },
-    addStockMingxi(obj) {
-      this.mingxiList.push(obj)
-    },
-    // 关闭弹窗
-    handleClose() {
-      this.$confirm('确认关闭？未保存的数据将会丢失', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.isShow = false
-        this.$emit('refresh')
-        this.resetForm()
-      }).catch(() => {})
-    },
-    // 重置表单
-    resetForm() {
-      this.id = ''
-      this.type = ''
-      this.rukuType = ''
-      this.rukuTypeName = ''
-      this.authName = ''
-      this.mingxiList = []
-      this.fileList = []
-      this.activeStep = 0
-      this.form = {
-        caigouhetong: '',
-        qingshiliucheng: '',
-        yingjicaigou: '',
-        gudingzichanbianhao: '',
-        rukushijian: '',
-        rukuleixing: '',
-        pandianleixing: '',
-        // rukucangku: '',
-        jingbanren: '',
-        jilurenyuan: '',
-        baoguanrenyuan: '',
-        beizhu: '',
-        zuozhengwenjian: ''
-      }
-      if (this.$refs.basicForm) {
-        this.$refs.basicForm.resetFields()
-      }
-    },
-    // 获取批次
-    async getPici(){
-      if(this.form.rukuleixing!='回库'){
-        const res = await getWzpc()
-        this.currentPici = res.msg
-      }
+        save({
+          table_name: this.tableName,
+          ...this.form
+        }).then(res => {
+          this.$message.success('保存成功')
+          console.log('res', res)
+          this.link_id = res.id
+          // if (this.type === 'editor' || this.form.rukuleixing === '回库') {
+          //   this.resetForm()
+          //   this.$emit('refresh')
+          //   this.isShow = false
+          //   return
+          // }
+          // if (res && res.inventorysIds && res.inventorysIds.length > 0) {
+          //   this.printArr = res.inventorysIds.join(',')
+          // }
+          // 盘点 回库 不用发起流程，直接关掉
+          if(this.rukuType==='盘点入库' || this.rukuType==='归还入库'){
+              this.resetForm()
+              this.$emit('refresh')
+              this.isShow = false
+          }else{
 
-    },
-    // 上一步
-    prevStep() {
-      this.activeStep--
-    },
-    // 下一步
-    nextStep() {
-      if (this.activeStep === 0) {
-        // this.$refs.basicForm.validate(valid => {
-        //   if (valid) {
-        //     this.activeStep++
-        //   }
-        // })
-        this.getPici()
-        this.activeStep++
-      } else if (this.activeStep === 1) {
-        if (this.mingxiList.length === 0) {
-          this.$message.warning('请至少添加一条物资明细')
-          return
-        }
-        this.saveData()
-      }
-    },
-
-    // 保存数据
-    isHasEqual(arr, key, key1) {
-      if (arr.length === 0) {
-        return
-      }
-      for (let i = 0; i < arr.length; i++) {
-        if (arr.filter(item => item[key] == arr[i][key]).length > 1 && arr.filter(item => item[key1] == arr[i][key1])
-          .length > 1) {
-          return true
-        }
-      }
-      return false
-    },
-    saveData() {
-      this.form.id_stocks_items_stocks_id_relation = this.mingxiList
-      console.log('form', this.form)
-      const has = this.isHasEqual(this.form.id_stocks_items_stocks_id_relation, 'wuzibianma', 'rukupici')
-      if (has) {
-        Message({
-          type: 'warning',
-          message: '同一物资同一批次请不要重复录入'
+            this.activeStep++
+          }
         })
-        return
-      }
-      this.form.zuozhengwenjian = []
-      for (var k of this.fileList) {
-        this.form.zuozhengwenjian.push(k?.response?.id)
-      }
-      if (this.type === 'add') {
-        delete this.form.id
-      }
-      save({
-        table_name: this.tableName,
-        ...this.form
-      }).then(res => {
-        this.$message.success('保存成功')
-        console.log('res', res)
-
-        if (this.type === 'editor' || this.form.rukuleixing === '回库') {
-          this.resetForm()
-          this.$emit('refresh')
-          this.isShow = false
-          return
-        }
-        if (res && res.inventorysIds && res.inventorysIds.length > 0) {
-          this.printArr = res.inventorysIds.join(',')
-        }
-
-        this.activeStep++
-      })
-    },
-    // 删除明细记录
-    async delMingxiList(index, row) {
-      this.$confirm('确认删除该数据', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(async() => {
-        let isDel = false
-        let isDels = false
-        const id = row.id
-        const stocks_items_id = row.stocks_items_id
-        if (row.id) {
-          await destroy({
-            id: id,
-            table_name: 'stocks_item_links'
-          }).then(res => {
-            isDel = true
-          })
-          await destroy({
-            id: stocks_items_id,
-            table_name: 'stocks_items'
-          }).then(res => {
-            isDels = true
-          })
-          if (isDel && isDels) {
+      },
+      // 删除明细记录
+      async delMingxiList(index, row) {
+        this.$confirm('确认删除该数据', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(async () => {
+          let isDel = false
+          let isDels = false
+          const id = row.id
+          const stocks_items_id = row.stocks_items_id
+          if (row.id) {
+            await destroy({
+              id: id,
+              table_name: 'stocks_item_links'
+            }).then(res => {
+              isDel = true
+            })
+            await destroy({
+              id: stocks_items_id,
+              table_name: 'stocks_items'
+            }).then(res => {
+              isDels = true
+            })
+            if (isDel && isDels) {
+              Message({
+                type: 'success',
+                message: '删除成功'
+              })
+              this.mingxiList.splice(index, 1)
+            } else {
+              Message({
+                type: 'warning',
+                message: '删除失败'
+              })
+            }
+          } else {
             Message({
               type: 'success',
               message: '删除成功'
             })
             this.mingxiList.splice(index, 1)
-          } else {
-            Message({
-              type: 'warning',
-              message: '删除失败'
-            })
           }
-        } else {
-          Message({
-            type: 'success',
-            message: '删除成功'
-          })
-          this.mingxiList.splice(index, 1)
+        }).catch(() => {})
+      },
+      // 打印二维码
+      handlePrint() {
+        // 这里添加打印二维码的逻辑
+        // this.$message.success('开始打印二维码')
+        this.isShow = false
+        this.resetForm()
+        window.open('/admin/print.html?ids=' + this.printArr, '_blank')
+      },
+      //  发起流程
+      toOaFollow() {
+        let typeid = ''
+        const typeObj = JSON.parse(process.env.VUE_APP_OA_URL_TYPE)
+        for (var k in typeObj) {
+          if (k == this.rukuType) {
+            typeid = parseInt(typeObj[k])
+          }
+        }
+        const url =
+            `${process.env.VUE_APP_OA_URL}/admin/flow/create/${typeid}?wuziguanli_oatoken=${this.wuziguanli_oatoken}&username=${this.authName}&link_id=${this.link_id}`
+        const seeBuy = window.open(url, '_blank')
+      },
+      // 关闭弹窗
+      handleClose() {
+        if (this.activeStep < 2) {
+          this.$confirm('确认关闭？未保存的数据将会丢失', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.isShow = false
+            this.$emit('refresh')
+            this.resetForm()
+          }).catch(() => {})
+        }else{
+          this.resetForm()
+          this.$emit('refresh')
+          this.isShow = false
         }
-      }).catch(() => {})
-    },
-    // 打印二维码
-    handlePrint() {
-      // 这里添加打印二维码的逻辑
-      // this.$message.success('开始打印二维码')
-      this.isShow = false
-      this.resetForm()
-      window.open('/admin/print.html?ids=' + this.printArr, '_blank')
-    },
-    //
-    async getDetail() {
-      const res = await show({
-        id: this.id,
-        table_name: this.tableName
-      })
-      this.form = {
-        caigouhetong: res?.caigouhetong,
-        qingshiliucheng: res?.qingshiliucheng,
-        yingjicaigou: res?.qingshiliucheng,
-
-        rukushijian: res?.rukushijian,
-        rukuleixing: res?.rukuleixing,
-        pandianleixing: res?.pandianleixing,
 
-        jingbanren: res?.jingbanren,
-        jilurenyuan: res?.jilurenyuan,
-        baoguanrenyuan: res?.baoguanrenyuan,
-        beizhu: res?.beizhu,
-        zuozhengwenjian: res?.zuozhengwenjian
-      }
-      this.form.id = this.id
-      this.editHt = res?.caigouhetong
-      this.editQs = res?.qingshiliucheng
-      this.mingxiList = []
-      for (var r of res.id_stocks_item_links_stocks_id_relation) {
-        const yuanshishuju = JSON.parse(r.yuanshishuju)
-        yuanshishuju['id'] = r.id
-        yuanshishuju['stocks_items_id'] = r.stocks_items_id
-        this.mingxiList.push(yuanshishuju)
-      }
-      this.fileList = []
-      const _lists = res.zuozhengwenjian_upload_details ? res.zuozhengwenjian_upload_details : []
-      for (var f of _lists) {
-        this.fileList.push({
-          name: f?.original_name,
-          url: f?.url,
-          response: f
-        })
-      }
-      // this.isShow = true
-    },
-    // 获取采购合同
-    async getHt() {
-      const res = await getContract({
-        page_size: 10,
-        page: this.htPageIndex,
-        keyword: this.htkeyword,
-        type: 2,
-        status: 2
-      })
-      for (var m of res.list.data) {
-        m.isSelect = false
-        m.type_name = m.type == 1 ? '服务' : (m.type == 2 ? '货物' : (m.type == 3 ? '工程' : '其他'))
-        m.status_name = m.status == 1 ? '待签订' : (m.status == 2 ? '已签订' : '')
-      }
-      console.log(res.list.data)
-      this.htList = res.list.data
-      this.htTotal = res.total
-      // this.hetongoptions = res.data
-    },
-    htCancel() {
-      this.htList.forEach((items) => {
-        this.$set(items, 'isSelect', false)
-      })
-      this.form.caigouhetong = this.editHt
-    },
-    htSelect(e) {
-      this.htList.forEach((items) => {
-        this.$set(items, 'isSelect', false)
-        if (items.id == e.id) {
-          this.$set(items, 'isSelect', true)
-        }
-      })
-    },
-    htComfirm() {
-      console.log('123')
-      this.htList.forEach((items) => {
-        if (items.isSelect == true) {
-          this.form.caigouhetong = items.name
-          this.editHt = items.name
-        }
-      })
-    },
-    htPageChange(e) {
-      console.log('e', e)
-      this.htPageIndex = e
-      this.getHt()
-    },
-    // 获取请示流程
-    async getQs() {
-      const res = await getQingShi({
-        // table:'qingshiruku',
-        table: 'qingshi',
-        page: this.qsPageIndex,
-        status: 1,
-        keyword: this.qskeyword
-      })
-      for (var m of res.data.flow.data) {
-        m.isSelect = false
-      }
-      this.qsList = res.data.flow.data
-      this.qsTotal = res.data.flow.total
-      // this.hetongoptions = res.data
-    },
-    qsCancel() {
-      this.qsList.forEach((items) => {
-        this.$set(items, 'isSelect', false)
-      })
-      this.form.qingshiliucheng = this.editQs
-    },
-    qsSelect(e) {
-      this.qsList.forEach((items) => {
-        this.$set(items, 'isSelect', false)
-        if (items.id == e.id) {
-          this.$set(items, 'isSelect', true)
+      },
+      // 重置表单
+      resetForm() {
+        this.id = ''
+        this.type = ''
+        this.rukuType = ''
+        this.authName = ''
+        this.mingxiList = []
+        this.fileList = []
+        this.activeStep = 0
+        this.link_id = ''
+        this.form = {
+          rukushijian: '',
+          rukuleixing: '',
+          pandianleixing: '',
+          jingbanren: '',
+          jilurenyuan: '',
+          baoguanrenyuan: '',
+          beizhu: '',
+          zuozhengwenjian: ''
         }
-      })
-    },
-    qsComfirm() {
-      this.qsList.forEach((items) => {
-        if (items.isSelect == true) {
-          this.form.qingshiliucheng = items.title
-          this.editQs = items.title
+        if (this.$refs.basicForm) {
+          this.$refs.basicForm.resetFields()
         }
-      })
-    },
-    qsPageChange(e) {
-      this.qsPageIndex = e
-      this.getQs()
-    },
-    async toQsFollow(id) {
-      // let res = await getOatoken()
+      },
+      //
+      async getDetail() {
+        const res = await show({
+          id: this.id,
+          table_name: this.tableName
+        })
+        this.form = {
+          rukushijian: res?.rukushijian,
+          rukuleixing: res?.rukuleixing,
+          pandianleixing: res?.pandianleixing,
 
-      const url =
-          `${process.env.VUE_APP_OA_URL}/admin/flow/view/${id}?wuziguanli_oatoken=${this.wuziguanli_oatoken}`
-      console.log('url', url)
-      const seeBuy = window.open(url, 'seeBuy', 'location=0')
-    },
-    // 获取应急采购请示流程
-    async getYj() {
-      const res = await getQingShi({
-        table: 'yingjicaigou',
-        page: this.yjPageIndex,
-        status: 1,
-        keyword: this.yjkeyword
-      })
-      for (var m of res.data.flow.data) {
-        m.isSelect = false
-      }
-      this.yjList = res.data.flow.data
-      this.yjTotal = res.data.flow.total
-      // this.hetongoptions = res.data
-    },
-    yjCancel() {
-      this.yjList.forEach((items) => {
-        this.$set(items, 'isSelect', false)
-      })
-      this.form.yingjicaigou = this.editYj
-    },
-    yjSelect(e) {
-      this.yjList.forEach((items) => {
-        this.$set(items, 'isSelect', false)
-        if (items.id == e.id) {
-          this.$set(items, 'isSelect', true)
+          jingbanren: res?.jingbanren,
+          jilurenyuan: res?.jilurenyuan,
+          baoguanrenyuan: res?.baoguanrenyuan,
+          beizhu: res?.beizhu,
+          zuozhengwenjian: res?.zuozhengwenjian
         }
-      })
-    },
-    yjComfirm() {
-      this.yjList.forEach((items) => {
-        if (items.isSelect == true) {
-          this.form.yingjicaigou = items.title
-          this.editYj = items.title
+        this.form.id = this.id
+        this.form.zhuangtai = res.zhuangtai?res.zhuangtai:0
+        this.mingxiList = []
+        for (var r of res.id_stocks_item_links_stocks_id_relation) {
+          const yuanshishuju = JSON.parse(r.yuanshishuju)
+          yuanshishuju['id'] = r.id
+          yuanshishuju['stocks_items_id'] = r.stocks_items_id
+          this.mingxiList.push(yuanshishuju)
         }
-      })
-    },
-    yjPageChange(e) {
-      this.yjPageIndex = e
-      this.getYj()
-    },
-    async toYjFollow(id) {
-      // let res = await getOatoken()
+        this.fileList = []
+        const _lists = res.zuozhengwenjian_upload_details ? res.zuozhengwenjian_upload_details : []
+        for (var f of _lists) {
+          this.fileList.push({
+            name: f?.original_name,
+            url: f?.url,
+            response: f
+          })
+        }
+      },
 
-      const url =
+      async toQsFollow(id) {
+        // let res = await getOatoken()
+        const url =
           `${process.env.VUE_APP_OA_URL}/admin/flow/view/${id}?wuziguanli_oatoken=${this.wuziguanli_oatoken}`
-      console.log('url', url)
-      const seeBuy = window.open(url, 'seeBuy', 'location=0')
-    },
-    // 获取导入表 字段
-    async getField() {
-      const res = await fieldIndex({
-        page: 1,
-        page_size: 999,
-        custom_form_id: this.customFormId,
-        sort_name: 'sort',
-        sort_type: 'asc'
-      })
-      if (res.data && res.data instanceof Array) {
-        res.data.forEach(i => {
-          if (i.field) {
-            if (
-              (i.edit_input === 'checkbox' || i.edit_input === 'radio' || i.edit_input === 'select') &&
+        console.log('url', url)
+        const seeBuy = window.open(url, 'seeBuy', 'location=0')
+      },
+
+
+      // 获取导入表 字段
+      async getField() {
+        const res = await fieldIndex({
+          page: 1,
+          page_size: 999,
+          custom_form_id: this.customFormId,
+          sort_name: 'sort',
+          sort_type: 'asc'
+        })
+        if (res.data && res.data instanceof Array) {
+          res.data.forEach(i => {
+            if (i.field) {
+              if (
+                (i.edit_input === 'checkbox' || i.edit_input === 'radio' || i.edit_input === 'select') &&
                 i.parameter_id
-            ) {
-              getparameter({
-                id: i.parameter_id
-              }).then((res) => {
-                i._paramters = res.detail ?? []
-              })
-            }
-            if (
-              (i.edit_input === 'checkbox' || i.edit_input === 'radio' || i.edit_input === 'select') &&
+              ) {
+                getparameter({
+                  id: i.parameter_id
+                }).then((res) => {
+                  i._paramters = res.detail ?? []
+                })
+              }
+              if (
+                (i.edit_input === 'checkbox' || i.edit_input === 'radio' || i.edit_input === 'select') &&
                 i.link_table_name
-            ) {
-              index({
-                page: 1,
-                page_size: 999,
-                table_name: i.link_table_name
-              }).then((res) => {
-                i._paramters = res.data ?? []
-              })
+              ) {
+                index({
+                  page: 1,
+                  page_size: 999,
+                  table_name: i.link_table_name
+                }).then((res) => {
+                  i._paramters = res.data ?? []
+                })
+              }
             }
-          }
-        })
+          })
+        }
+        this.importForm = res.data
+          ?.filter((i) => i.list_show)
+          .map((i) => {
+            return i
+          })
       }
-      this.importForm = res.data
-        ?.filter((i) => i.list_show)
-        .map((i) => {
-          return i
-        })
-    }
 
+    }
   }
-}
 </script>
 
 <style scoped>
diff --git a/src/views/stocks/component/showRuku.vue b/src/views/stocks/component/showRuku.vue
new file mode 100644
index 0000000..b6efdbb
--- /dev/null
+++ b/src/views/stocks/component/showRuku.vue
@@ -0,0 +1,336 @@
+<template>
+  <div>
+    <xy-dialog :is-show.sync="isShow" type="normal" title="查看" class="contract-detail">
+      <template v-slot:normalContent>
+        <el-descriptions title="基本信息" :column="2" border>
+            <el-descriptions-item label="入库类型">{{form.rukuleixing}}</el-descriptions-item>
+            <el-descriptions-item label="入库日期">{{form.rukushijian}}</el-descriptions-item>
+            <el-descriptions-item label="经办人">{{form.jingbanren}}</el-descriptions-item>
+            <el-descriptions-item label="记录人">{{form.jilurenyuan}}</el-descriptions-item>
+            <el-descriptions-item label="保管人" :span="2">{{form.baoguanrenyuan}}</el-descriptions-item>
+            <el-descriptions-item label="货物验收单" :span="2">
+              <div v-for="item in zuozhengList">
+                 <a style="color: blue;" :href="item.url" target="_blank">{{item.name}}</a>
+              </div>
+            </el-descriptions-item>
+            <el-descriptions-item label="备注" :span="2">{{form.beizhu}}</el-descriptions-item>
+        </el-descriptions>
+        <div style="margin: 10px 0;font-weight: bold;color:#303133;font-size: 16px;">
+          物资明细
+        </div>
+        <xy-table style="width: 100%" :height="260" :is-page="false" :list="mingxiList" :table-item="mingxiTable">
+          <template v-slot:btns>
+            <div></div>
+          </template>
+        </xy-table>
+        <div style="margin: 10px 0;font-weight: bold;color:#303133;font-size: 16px;">
+          现场实物图
+        </div>
+        <div>
+          <!-- 确认入库 -->
+          <el-upload v-if="form.zhuangtai===2" ref="upload" list-type="picture-card" class="upload-demo" :action="action" multiple :headers="headers"
+            :before-upload="beforeUpload" :on-success="onSuccess" :on-error="onError" :on-remove="onRemove"
+            :file-list="fileList" :auto-upload="true">
+            <i class="el-icon-plus"></i>
+          </el-upload>
+          <div v-else>
+            <template v-for="(item,index) in fileList">
+              <el-image
+                  style="width: 100px; height: 100px"
+                  :src="item.url"
+                  :key="index"
+                  :initial-index="index">
+                </el-image>
+            </template>
+
+          </div>
+
+        </div>
+      </template>
+      <template v-slot:footerContent>
+        <Button @click="isShow=false">关闭</Button>
+        <Button type="primary" v-if="form.zhuangtai===2" @click="submit">入库</Button>
+      </template>
+    </xy-dialog>
+  </div>
+</template>
+
+<script>
+  import {
+    save,
+    index,
+    show,
+    destroy
+  } from '@/api/system/baseForm.js'
+  import {
+    Message
+  } from 'element-ui'
+
+  import {
+    getToken
+  } from '@/utils/auth'
+  export default {
+    components: {},
+    data() {
+      return {
+        id: '',
+        isShow: false,
+        tableName: 'stocks',
+        zuozhengList:[],
+        fileList: [],
+        action: process.env.VUE_APP_UPLOAD_API,
+        headers: {
+          token: ''
+        },
+        form: {
+          rukushijian: '',
+          rukuleixing: '',
+          pandianleixing: '',
+          jingbanren: '',
+          jilurenyuan: '',
+          baoguanrenyuan: '',
+          beizhu: '',
+          zuozhengwenjian: '',
+          rukutupian:''
+        },
+        mingxiList: [],
+        mingxiTable: [{
+            label: '序号',
+            type: 'index',
+            fixed: 'left',
+            width: 80
+          },
+          {
+            label: '物资名称',
+            width: 180,
+            prop: 'zichanmingcheng',
+            align: 'left'
+          },
+          {
+            label: '所属种类',
+            width: 80,
+            prop: 'fenleiName',
+            align: 'center'
+          },
+          {
+            label: '种类编码',
+            width: 120,
+            prop: 'wuzibianma',
+            align: 'center'
+          },
+          {
+            label: '物资类型',
+            width: 120,
+            prop: 'wuzileixing',
+            align: 'center'
+          },
+          {
+            label: '物资型号',
+            width: 120,
+            prop: 'guigexinghao',
+            align: 'left'
+          },
+          {
+            label: '物资规格',
+            width: 120,
+            prop: 'wuziguige',
+            align: 'left'
+          },
+          {
+            label: '单位',
+            width: 80,
+            prop: 'jiliangdanwei',
+            align: 'center'
+          }, {
+            label: '在库数量',
+            prop: 'zaikushuliang',
+            width: 80
+          },
+          {
+            label: '入库批次',
+            prop: 'rukupici',
+            width: 120
+          }, {
+            label: '入库数量',
+            prop: 'rukushuliang',
+            width: 80
+          }
+          // ,{
+          //   label: "物资状态",
+          //   prop: "wuzizhuangtai",
+          //   width: 180
+          // },{
+          //   label: "生产日期",
+          //   prop: "shengchanriqi",
+          //   width: 180
+          // },
+        ],
+        // 打印
+        printArr: ''
+      }
+    },
+    watch: {
+      isShow(newVal) {
+        if (newVal) {
+          this.getDetail()
+        }else{
+          this.id = ''
+          this.fileList = []
+          this.zuozhengList = []
+          this.form = {
+            rukushijian: '',
+            rukuleixing: '',
+            pandianleixing: '',
+            jingbanren: '',
+            jilurenyuan: '',
+            baoguanrenyuan: '',
+            beizhu: '',
+            zuozhengwenjian: '',
+            rukutupian:''
+          }
+
+        }
+      }
+    },
+    created() {
+      this.headers.token = getToken()
+    },
+    methods: {
+      // 佐证文件上传
+      beforeUpload(file) {
+        // if (file.size / 1000 > 500) {
+        //   this.$message({
+        //     type: "warning",
+        //     message: "上传文件大小超过500kb！",
+        //   });
+        //   return false;
+        // }
+      },
+      onSuccess(response, file, fileList) {
+        console.log('fileList', fileList)
+        this.fileList = fileList
+        const arr = []
+        for (var k of this.fileList) {
+          arr.push(k?.response?.id)
+        }
+        this.form.rukutupian = arr
+      },
+
+      onRemove(file, fileList) {
+        this.fileList = fileList
+        const arr = []
+        for (var k of this.fileList) {
+          arr.push(k?.response?.id)
+        }
+        this.form.rukutupian = arr
+      },
+
+      onError(err, file, fileList) {
+        this.fileList = fileList
+        this.$message({
+          type: 'warning',
+          message: err
+        })
+      },
+
+      // 打印二维码
+      handlePrint() {
+        // 这里添加打印二维码的逻辑
+        // this.$message.success('开始打印二维码')
+        this.isShow = false
+        this.resetForm()
+        window.open('/admin/print.html?ids=' + this.printArr, '_blank')
+      },
+      submit(){
+        if(this.fileList.length<1){
+          Message({
+            type:'warning',
+            message:'请上传现场实物图'
+          })
+          return
+        }else{
+          this.form.rukutupian = []
+          for (var k of this.fileList) {
+            this.form.rukutupian.push(k?.response?.id)
+          }
+        }
+        save({
+          ...this.form,
+          zhuangtai:3,
+          id: this.id,
+          table_name: this.tableName,
+
+        }).then(res => {
+          this.$message.success('入库成功')
+          this.$emit('refresh')
+          this.isShow = false
+        })
+      },
+      //
+      async getDetail() {
+        const res = await show({
+          id: this.id,
+          table_name: this.tableName
+        })
+        this.form = {
+          rukushijian: res?.rukushijian,
+          rukuleixing: res?.rukuleixing,
+          pandianleixing: res?.pandianleixing,
+          jingbanren: res?.jingbanren,
+          jilurenyuan: res?.jilurenyuan,
+          baoguanrenyuan: res?.baoguanrenyuan,
+          beizhu: res?.beizhu,
+          zuozhengwenjian: res?.zuozhengwenjian,
+          rukutupian:res?.rukutupian
+        }
+        this.form.id = this.id
+        this.form.zhuangtai = res.zhuangtai?res.zhuangtai:0
+        this.mingxiList = []
+        for (var r of res.id_stocks_item_links_stocks_id_relation) {
+          const yuanshishuju = JSON.parse(r.yuanshishuju)
+          yuanshishuju['id'] = r.id
+          yuanshishuju['stocks_items_id'] = r.stocks_items_id
+          this.mingxiList.push(yuanshishuju)
+        }
+        this.zuozhengList = []
+        const _lists = res.zuozhengwenjian_upload_details ? res.zuozhengwenjian_upload_details : []
+        for (var f of _lists) {
+          this.zuozhengList.push({
+            name: f?.original_name,
+            url: f?.url,
+            response: f
+          })
+        }
+
+        this.fileList = []
+        const ruku_lists = res.rukutupian_upload_details ? res.rukutupian_upload_details : []
+        for (var f of ruku_lists) {
+          this.fileList.push({
+            name: f?.original_name,
+            url: f?.url,
+            response: f
+          })
+        }
+
+      },
+    }
+  }
+</script>
+
+<style scoped>
+  .step-content {
+    min-height: 300px;
+  }
+
+  .operation-bar {
+    display: flex;
+    justify-content: flex-end;
+  }
+
+  .step-complete {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 300px;
+  }
+</style>
diff --git a/src/views/stocks/index.vue b/src/views/stocks/index.vue
index ff1a3ba..8d0b35c 100644
--- a/src/views/stocks/index.vue
+++ b/src/views/stocks/index.vue
@@ -1,10 +1,11 @@
 <template>
   <div>
-    <div class="button-wrap">
-      <Button type="primary" @click="editorRuku('','add','采购')">采购入库</Button>
-      <Button type="primary" @click="editorRuku('','add','请示')">请示入库</Button>
-      <Button type="primary" @click="editorRuku('','add','盘点')">盘点入库</Button>
-      <Button type="primary" @click="editorRuku('','add','回库')">归还入库</Button>
+    <div class="button-wrap" v-if="roleName=='系统管理员'||isCkName=='仓库管理员'">
+      <Button type="primary" @click="editorRuku('','add','采购入库')">采购入库</Button>
+      <Button type="primary" @click="editorRuku('','add','请示入库')">请示入库</Button>
+      <Button type="primary" @click="editorRuku('','add','调拨入库')">调拨入库</Button>
+      <Button type="primary" @click="editorRuku('','add','盘点入库')">盘点入库</Button>
+      <Button type="primary" @click="editorRuku('','add','归还入库')">归还入库</Button>
     </div>
     <div ref="lxHeader">
       <lx-header icon="md-apps" text="入库管理" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
@@ -14,6 +15,9 @@
             <Select v-model="select.rukuleixing" style="width: 200px;margin-right: 10px;" placeholder="入库类型" clearable>
               <Option v-for="item in rukuTypeList" :key="item.id" :value="item.id">{{ item.value }}</Option>
             </Select>
+            <Select v-model="select.zhuangtai" style="width: 200px;margin-right: 10px;" placeholder="状态" clearable>
+              <Option v-for="item in statusList" :key="item.id" :value="item.id">{{ item.value }}</Option>
+            </Select>
             <Button type="primary" @click="getindex">查询</Button>
           </div>
         </slot>
@@ -29,7 +33,7 @@
       @pageIndexChange="pageChange"
     >
 
-      <template v-slot:guanlianjilu>
+     <!-- <template v-slot:guanlianjilu>
         <el-table-column label="关联记录" width="260" header-align="left">
           <template slot-scope="scope">
             <div v-for="item in rukuTypeList">
@@ -40,15 +44,48 @@
 
           </template>
         </el-table-column>
-      </template>
+      </template> -->
+      <template v-slot:zhuangtai>
+         <el-table-column label="状态" width="120" align="center" header-align="left">
+           <template slot-scope="scope">
+             <div v-for="item in statusList">
+               <el-tag :type="item.type" v-if="scope.row.zhuangtai==item.id">
+                 {{ item.value }} {{scope.row.zhuangtai}}
+               </el-tag>
+             </div>
+           </template>
+         </el-table-column>
+       </template>
       <template v-slot:btns>
-        <el-table-column fixed="right" label="操作" width="120" header-align="center">
+        <el-table-column label="操作" width="240" header-align="center">
+          <!-- 1 盘点 和 归还不用发起流程 不用确认入库 -->
+          <!-- 2 待处理 或 退回 可编辑 -->
+          <!-- 3 待处理 可删除 -->
+          <!-- 4 退回 或 待处理 可发起流程 -->
+          <!-- 5 待入库 可确认入库 -->
+          <!-- 6 已入库 只有查看 -->
           <template slot-scope="scope">
-            <div v-if="scope.row.jingbanren==authName||roleName=='系统管理员'||isCkName=='仓库管理员'">
-              <Button type="primary" size="small" @click="editorRuku(scope.row.id,'editor',scope.row.rukuleixing)">编辑</Button>
-              <Poptip transfer confirm title="确认要删除该入库记录？入库明细将一同删除。" @on-ok="deleteRuku(scope.row)">
-                <Button type="error" style="margin-left: 10px;" size="small" ghost>删除</Button>
-              </Poptip>
+            <div v-if="roleName=='系统管理员'||isCkName=='仓库管理员'">
+              <template v-if="scope.row.zhuangtai===3 || scope.row.zhuangtai===1">
+                <Button style="margin-right: 10px;" type="primary" size="small"
+                 @click="showRukuDetail(scope.row.id)">查看</Button>
+              </template>
+              <template v-else>
+                <Button v-if="scope.row.zhuangtai===0 || scope.row.zhuangtai===4" style="margin-right: 10px;" type="primary" size="small"
+                @click="editorRuku(scope.row.id,'editor',scope.row.rukuleixing)">编辑</Button>
+
+                <Button v-if="scope.row.zhuangtai===0 || scope.row.zhuangtai===4" style="margin-right: 10px;" type="primary" size="small"
+                 @click="toOaFollow(scope.row.id,scope.row.rukuleixing)">发起流程</Button>
+
+                <Button v-if="scope.row.zhuangtai===2" style="margin-right: 10px;" type="primary" size="small"
+                @click="showRukuDetail(scope.row.id)">确认入库</Button>
+
+                <Poptip v-if="scope.row.zhuangtai===0" transfer confirm title="确认要删除该入库记录？入库明细将一同删除。"
+                @on-ok="deleteRuku(scope.row)">
+                  <Button type="error" size="small" ghost>删除</Button>
+                </Poptip>
+              </template>
+
             </div>
           </template>
         </el-table-column>
@@ -56,7 +93,7 @@
 
     </xy-table>
     <addRuku ref="addRuku" @refresh="getindex" />
-
+    <showRuku ref="showRuku" @refresh="getindex"></showRuku>
     <imports ref="imports" :table-name="customForm.tableName" :form-info="form" @refresh="getindex" />
 
   </div>
@@ -67,7 +104,12 @@ import {
   index,
   destroy
 } from '@/api/system/baseForm.js'
-import addRuku from './component/addRuku.vue'
+import addRuku from './component/addRuku.vue'
+import showRuku from './component/showRuku.vue'
+
+  import {
+    getOatoken
+  } from '@/api/contract.js'
 import {
   Message
 } from 'element-ui'
@@ -84,28 +126,34 @@ import {
 export default {
   components: {
     addRuku,
-    imports
+    imports,
+    showRuku
   },
   data() {
     return {
       authName: '',
       roleName: '',
       isCkName: '',
+      wuziguanli_oatoken:'',
       loading: false,
       select: {
         pageSize: 10,
         pageIndex: 1,
         keyword: '',
-        rukuleixing: ''
+        rukuleixing: '',
+        zhuangtai:''
       },
       rukuTypeList: [{
-        id: '采购',
+        id: '采购入库',
         value: '采购入库',
         prop: 'caigouhetong'
       }, {
-        id: '请示',
+        id: '请示入库',
         value: '请示入库',
         prop: 'qingshiliucheng'
+      }, {
+        id: '调拨入库',
+        value: '调拨入库',
       }, {
         id: '盘点',
         value: '盘点入库'
@@ -113,6 +161,27 @@ export default {
         id: '回库',
         value: '归还入库'
       }],
+      statusList:[{
+        id:0,
+        value:'待处理',
+        type:'info'
+      },{
+        id:1,
+        value:'待办结',
+        type:'warning'
+      },{
+        id:2,
+        value:'待入库',
+        type:''
+      },{
+        id:3,
+        value:'已入库',
+        type:'success'
+      },{
+        id:4,
+        value:'退回',
+        type:'danger'
+      }],
       // rukuTypeList:{
       //   purchase:'采购',
       //   return:'回库',
@@ -137,7 +206,7 @@ export default {
       },
       {
         label: '入库日期',
-        width: 180,
+        width: 120,
         prop: 'rukushijian',
         align: 'center',
         formatter: (cell, data, value) => {
@@ -146,31 +215,37 @@ export default {
       },
       {
         label: '入库类型',
-        width: 180,
+        width: 120,
         prop: 'rukuleixing',
         align: 'center'
       },
       {
-        label: '关联记录',
-        width: 240,
-        prop: 'guanlianjilu',
-        align: 'left'
-      },
+        label: '状态',
+        width: 120,
+        prop: 'zhuangtai',
+        align: 'center'
+      },
+      // {
+      //   label: '关联记录',
+      //   width: 240,
+      //   prop: 'guanlianjilu',
+      //   align: 'left'
+      // },
       {
         label: '经办人',
-        width: 180,
+        width: 120,
         prop: 'jingbanren',
         align: 'center'
       },
       {
         label: '记录人',
-        width: 180,
+        width: 120,
         prop: 'jilurenyuan',
         align: 'center'
       },
       {
         label: '保管人',
-        width: 180,
+        width: 120,
         prop: 'baoguanrenyuan',
         align: 'center'
       },
@@ -182,7 +257,7 @@ export default {
       // },
       {
         label: '备注',
-        width: 240,
+        // width: 240,
         prop: 'beizhu',
         align: 'left'
       }
@@ -190,32 +265,11 @@ export default {
     }
   },
   mounted() {
-    // if(this.$route.path){
-    //   let path = this.$route.path.split("_")[1]
-    //   console.log(path)
-    //   for(var k in this.rukuTypeList){
-    //     if(path==k){
-    //       this.rukuType = this.rukuTypeList[k]
-    //       if(this.rukuType=='采购'||this.rukuType=='请示'||this.rukuType=='应急采购'){
-    //         let rowname = ''
-    //         rowname = this.rukuType=='采购'? 'caigouhetong':(this.rukuType=='请示'?'qingshiliucheng':(this.rukuType=='应急采购'?'yingjicaigou':''))
-    //         this.table.unshift(          {
-    //       label: "关联记录",
-    //       width: 240,
-    //       prop: 'caigouhetong',
-    //       align: 'left',
-    //       customFn: (row) => {
-    //         return ( <div>
-    //           {row[rowname]}
-    //         </div> )
-    //       }
-    //     })
-    //       }
-    //     }
-    //   }
-    // }
     this.getUserName()
-    this.getindex()
+    this.getindex()
+    getOatoken().then(res => {
+      this.wuziguanli_oatoken = res.oatoken
+    })
   },
   methods: {
     async getUserName() {
@@ -246,7 +300,13 @@ export default {
           'key': 'rukuleixing',
           'op': 'eq',
           'value': this.select.rukuleixing ? this.select.rukuleixing : ''
-        }
+        },
+        {
+          'key': 'zhuangtai',
+          'op': 'like',
+          'value': this.select.zhuangtai ? this.select.zhuangtai : (this.select.zhuangtai===0?0:'')
+        }
+
         ]
       })
       this.list = res.data
@@ -266,6 +326,25 @@ export default {
       this.$refs['addRuku'].authName = this.authName
       this.$refs['addRuku'].rukuType = rukuleixing
       this.$refs['addRuku'].isShow = true
+    },
+    // 查看 或者确认入库
+    showRukuDetail(id){
+      this.$refs['showRuku'].id = id
+      this.$refs['showRuku'].isShow = true
+    },
+    //  发起流程
+    toOaFollow(id,type) {
+      let typeid = ''
+      const typeObj = JSON.parse(process.env.VUE_APP_OA_URL_TYPE)
+      console.log("typeObj",typeObj,type)
+      for (var k in typeObj) {
+        if (k == type) {
+          typeid = parseInt(typeObj[k])
+        }
+      }
+      const url =
+          `${process.env.VUE_APP_OA_URL}/admin/flow/create/${typeid}?wuziguanli_oatoken=${this.wuziguanli_oatoken}&username=${this.authName}&link_id=${id}`
+      const seeBuy = window.open(url, '_blank')
     },
     deleteRuku(row) {
       console.log(row.id)