diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/productWarehouse/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/productWarehouse/index.vue
index 4fda4426..b548dc78 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/productWarehouse/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/productWarehouse/index.vue
@@ -33,10 +33,10 @@
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
               <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-              <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">
+              <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
                 展开
               </el-button>
-              <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
+              <el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
                 收起
               </el-button>
             </el-form-item>
@@ -59,51 +59,70 @@
             </el-tooltip>
           </div>
         </div>
-        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod">
-          <el-table-column prop="name" label="商品名称" align="left">
-          </el-table-column>
-          <el-table-column prop="code" label="商品编码" align="left">
+        <JNPF-table v-loading="listLoading" :border="true" :data="list" @sort-change='sortChange'
+          :span-method="arraySpanMethod">
+          <el-table-column align="left" width="230" fixed="left">
+            <template slot-scope="scope" v-if="!scope.row.top">
+              <el-row>
+                <el-col :span="8">
+                  <div class="demo-image__preview">
+                    <el-image style="width: 50px; height: 50px" :src="fnGetPhotoSrc(scope.row.photo)"
+                      :preview-src-list="[]">
+                    </el-image>
+                  </div>
+                </el-col>
+                <el-col :span="16">
+                  <el-row>
+                    <el-col :span="24">{{ scope.row.name }}</el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col :span="24">{{ scope.row.code }}</el-col>
+                  </el-row>
+                </el-col>
+              </el-row>
+            </template>
           </el-table-column>
-          <el-table-column prop="productTypeId" label="商品类型" align="left">
+          <el-table-column prop="productTypeId" label="商品类型" align="left" width="130">
           </el-table-column>
-          <el-table-column prop="shortName" label="商品简称" align="left">
+          <el-table-column prop="shortName" label="商品简称" align="left" width="130">
           </el-table-column>
-          <el-table-column prop="spec" label="商品规格" align="left">
+          <el-table-column prop="spec" label="商品规格" align="left" width="130">
           </el-table-column>
-          <el-table-column prop="barCode" label="商品条码" align="left">
+          <el-table-column prop="barCode" label="商品条码" align="left" width="190">
           </el-table-column>
-          <el-table-column prop="inventoryType" label="存货类型" align="left">
+          <el-table-column prop="inventoryType" label="存货类型" align="left" width="130">
           </el-table-column>
-          <el-table-column prop="brandId" label="品牌" align="left">
+          <el-table-column prop="brandId" label="品牌" align="left" width="130">
           </el-table-column>
-          <el-table-column prop="productCategoryId" label="商品分类" align="left">
+          <el-table-column prop="productCategoryId" label="商品分类" align="left" width="130">
           </el-table-column>
-          <el-table-column prop="area" label="产地" align="left">
+          <el-table-column prop="area" label="产地" align="left" width="190">
           </el-table-column>
-          <el-table-column prop="firstSupplierId" label="首选供应商" align="left">
+          <el-table-column prop="firstSupplierId" label="首选供应商" align="left" width="130">
           </el-table-column>
-          <el-table-column prop="deliveryType" label="配送方式" align="left">
+          <el-table-column prop="deliveryType" label="配送方式" align="left" width="130">
           </el-table-column>
           <el-table-column prop="flowState" label="状态" width="100">
             <template slot-scope="scope" v-if="!scope.row.top">
-              <el-tag v-if="scope.row.flowState==1">等待审核</el-tag>
-              <el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
-              <el-tag type="danger" v-else-if="scope.row.flowState==3">审核驳回</el-tag>
-              <el-tag type="info" v-else-if="scope.row.flowState==4">流程撤回</el-tag>
-              <el-tag type="info" v-else-if="scope.row.flowState==5">审核终止</el-tag>
+              <el-tag v-if="scope.row.flowState == 1">等待审核</el-tag>
+              <el-tag type="success" v-else-if="scope.row.flowState == 2">审核通过</el-tag>
+              <el-tag type="danger" v-else-if="scope.row.flowState == 3">审核驳回</el-tag>
+              <el-tag type="info" v-else-if="scope.row.flowState == 4">流程撤回</el-tag>
+              <el-tag type="info" v-else-if="scope.row.flowState == 5">审核终止</el-tag>
               <el-tag type="warning" v-else>等待提交</el-tag>
             </template>
           </el-table-column>
           <el-table-column label="操作" fixed="right" width="150">
             <template slot-scope="scope">
-              <el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
+              <el-button type="text" :disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
                 @click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" :disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1"
-                v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
+              <el-button type="text" class="JNPF-table-delBtn"
+                :disabled="[1, 2, 3, 5].indexOf(scope.row.flowState) > -1" v-has="'btn_remove'"
+                @click="handleDel(scope.row.id)">删除
               </el-button>
               <el-button size="mini" type="text" :disabled="!scope.row.flowState"
-                @click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
+                @click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
             </template>
           </el-table-column>
         </JNPF-table>
@@ -120,600 +139,611 @@
     <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
       class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
       <el-scrollbar class="template-list">
-        <div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{item.fullName}}
+        <div class="template-item" v-for=" item  in  flowList " :key="item.id" @click="selectFlow(item)">{{
+        item.fullName
+      }}
         </div>
       </el-scrollbar>
     </el-dialog>
 
     <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
-    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
+    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
     <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
-    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
+    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery " />
   </div>
 </template>
 
 <script>
-  import request from '@/utils/request'
-  import {
-    mapGetters
-  } from "vuex";
-  import {
-    getDictionaryDataSelector
-  } from '@/api/systemData/dictionary'
-  import {
-    getFormById
-  } from '@/api/workFlow/FormDesign'
-  import {
-    getFlowList
-  } from '@/api/workFlow/FlowEngine'
-  import FlowBox from '@/views/workFlow/components/FlowBox'
-  import ExportBox from '@/components/ExportBox'
-  import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
-  import {
-    getDataInterfaceRes
-  } from '@/api/systemData/dataInterface'
-  import {
-    getConfigData
-  } from '@/api/onlineDev/visualDev'
-  import {
-    getDefaultCurrentValueUserIdAsync
-  } from '@/api/permission/user'
-  import {
-    getDefaultCurrentValueDepartmentIdAsync
-  } from '@/api/permission/organize'
-  import columnList from './columnList'
-  import {
-    thousandsFormat
-  } from "@/components/Generator/utils/index"
-  import SuperQuery from '@/components/SuperQuery'
-  import superQueryJson from './superQueryJson'
+import request from '@/utils/request'
+import {
+  mapGetters
+} from "vuex";
+import {
+  getDictionaryDataSelector
+} from '@/api/systemData/dictionary'
+import {
+  getFormById
+} from '@/api/workFlow/FormDesign'
+import {
+  getFlowList
+} from '@/api/workFlow/FlowEngine'
+import FlowBox from '@/views/workFlow/components/FlowBox'
+import ExportBox from '@/components/ExportBox'
+import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
+import {
+  getDataInterfaceRes
+} from '@/api/systemData/dataInterface'
+import {
+  getConfigData
+} from '@/api/onlineDev/visualDev'
+import {
+  getDefaultCurrentValueUserIdAsync
+} from '@/api/permission/user'
+import {
+  getDefaultCurrentValueDepartmentIdAsync
+} from '@/api/permission/organize'
+import columnList from './columnList'
+import {
+  thousandsFormat
+} from "@/components/Generator/utils/index"
+import SuperQuery from '@/components/SuperQuery'
+import superQueryJson from './superQueryJson'
 
-  export default {
-    components: {
-      FlowBox,
-      ExportBox,
-      ToFormDetail,
-      SuperQuery
-    },
-    data() {
-      return {
+export default {
+  components: {
+    FlowBox,
+    ExportBox,
+    ToFormDetail,
+    SuperQuery
+  },
+  data() {
+    return {
 
-        keyword: '',
-        expandsTree: true,
-        refreshTree: true,
-        toFormDetailVisible: false,
-        expandObj: {},
-        columnOptions: [],
-        mergeList: [],
-        exportList: [],
-        columnList,
+      keyword: '',
+      expandsTree: true,
+      refreshTree: true,
+      toFormDetailVisible: false,
+      expandObj: {},
+      columnOptions: [],
+      mergeList: [],
+      exportList: [],
+      columnList,
 
-        showAll: false,
-        superQueryVisible: false,
-        superQueryJson,
-        uploadBoxVisible: false,
-        detailVisible: false,
-        query: {
-          code: undefined,
-          name: undefined,
-          productTypeId: undefined,
-          inventoryType: undefined,
-        },
-        treeProps: {
-          children: 'children',
-          label: 'fullName',
-          value: 'id',
-          isLeaf: 'isLeaf'
-        },
-        list: [],
-        listLoading: true,
-        total: 0,
-        queryData: {},
-        listQuery: {
-          superQueryJson: '',
-          currentPage: 1,
-          pageSize: 20,
-          sort: "desc",
-          sidx: "",
-        },
-        formVisible: false,
-        flowVisible: false,
-        flowListVisible: false,
-        flowList: [],
-        exportBoxVisible: false,
-        productTypeIdOptions: [],
-        productTypeIdProps: {
-          "label": "fullName",
-          "value": "enCode"
-        },
-        inventoryTypeOptions: [],
-        inventoryTypeProps: {
-          "label": "fullName",
-          "value": "enCode"
-        },
-        productCategoryIdOptions: [],
-        productCategoryIdProps: {
-          "label": "F_FullName",
-          "value": "id"
-        },
-        dangerousFlagOptions: [],
-        dangerousFlagProps: {
-          "label": "fullName",
-          "value": "enCode"
-        },
-        importedFlagOptions: [],
-        importedFlagProps: {
-          "label": "fullName",
-          "value": "enCode"
-        },
-        processedFlagOptions: [],
-        processedFlagProps: {
-          "label": "fullName",
-          "value": "enCode"
-        },
-        outsourcedFlagOptions: [],
-        outsourcedFlagProps: {
-          "label": "fullName",
-          "value": "enCode"
-        },
-        outputTaxRateOptions: [],
-        outputTaxRateProps: {
-          "label": "fullName",
-          "value": "enCode"
-        },
-        inputTaxRateOptions: [],
-        inputTaxRateProps: {
-          "label": "fullName",
-          "value": "enCode"
-        },
-        deliveryTypeOptions: [],
-        deliveryTypeProps: {
-          "label": "fullName",
-          "value": "enCode"
-        },
-        manyUnitFlagOptions: [],
-        manyUnitFlagProps: {
-          "label": "fullName",
-          "value": "enCode"
-        },
-        inventoryUnitIdOptions: [{
-          "fullName": "选项一",
-          "id": "1"
-        }, {
-          "fullName": "选项二",
-          "id": "2"
-        }],
-        inventoryUnitIdProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        orderMainUnitIdOptions: [{
-          "fullName": "选项一",
-          "id": "1"
-        }, {
-          "fullName": "选项二",
-          "id": "2"
-        }],
-        orderMainUnitIdProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        salesMainUnitIdOptions: [{
-          "fullName": "选项一",
-          "id": "1"
-        }, {
-          "fullName": "选项二",
-          "id": "2"
-        }],
-        salesMainUnitIdProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        operateUnitIdOptions: [{
-          "fullName": "选项一",
-          "id": "1"
-        }, {
-          "fullName": "选项二",
-          "id": "2"
-        }],
-        operateUnitIdProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        pricingUnitIdOptions: [{
-          "fullName": "选项一",
-          "id": "1"
-        }, {
-          "fullName": "选项二",
-          "id": "2"
-        }],
-        pricingUnitIdProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        jnpf_jg_product_business_jnpf_businessLineIdOptions: [],
-        jnpf_jg_product_business_jnpf_businessLineIdProps: {
-          "label": "name",
-          "value": "id"
-        },
-        tableField141_productUnitwarehouseIdOptions: [],
-        tableField141_productUnitwarehouseIdProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        interfaceRes: {
-          brandId: [],
-          firstSupplierId: [],
-        },
-      }
-    },
-    computed: {
-      ...mapGetters(['userInfo']),
-      menuId() {
-        return this.$route.meta.modelId || ''
-      }
-    },
-    created() {
-      getFormById("518014334211720453").then(res1 => {
-        let flowId = res1.data && res1.data.id
-        getFlowList(flowId, '1').then(res2 => {
-          this.flowList = res2.data
-          this.getColumnList(),
-            this.initSearchDataAndListData()
-          this.getproductTypeIdOptions();
-          this.getinventoryTypeOptions();
-          this.queryData = JSON.parse(JSON.stringify(this.query))
-        }).catch((e) => {
-          this.$message({
-            type: 'error',
-            message: e.message
-          });
-          this.$router.push('/404');
-        })
-      })
-    },
-    methods: {
-      toDetail(defaultValue, modelId) {
-        if (!defaultValue) return
-        getConfigData(modelId).then(res => {
-          if (!res.data || !res.data.formData) return
-          let formData = JSON.parse(res.data.formData)
-          formData.popupType = 'general'
-          this.toFormDetailVisible = true
-          this.$nextTick(() => {
-            this.$refs.toFormDetail.init(formData, modelId, defaultValue)
-          })
-        })
+      showAll: false,
+      superQueryVisible: false,
+      superQueryJson,
+      uploadBoxVisible: false,
+      detailVisible: false,
+      query: {
+        code: undefined,
+        name: undefined,
+        productTypeId: undefined,
+        inventoryType: undefined,
       },
-      toggleTreeExpand(expands) {
-        this.refreshTree = false
-        this.expandsTree = expands
-        this.$nextTick(() => {
-          this.refreshTree = true
-          this.$nextTick(() => {
-            this.$refs.treeBox.setCurrentKey(null)
-          })
-        })
+      treeProps: {
+        children: 'children',
+        label: 'fullName',
+        value: 'id',
+        isLeaf: 'isLeaf'
       },
-      filterNode(value, data) {
-        if (!value) return true;
-        return data[this.treeProps.label].indexOf(value) !== -1;
+      list: [],
+      listLoading: true,
+      total: 0,
+      queryData: {},
+      listQuery: {
+        superQueryJson: '',
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
       },
-      loadNode(node, resolve) {
-        const nodeData = node.data
-        const config = {
-          treeInterfaceId: "",
-          treeTemplateJson: []
-        }
-        if (config.treeInterfaceId) {
-          //这里是为了拿到参数中关联的字段的值，后端自行拿
-          if (config.treeTemplateJson && config.treeTemplateJson.length) {
-            for (let i = 0; i < config.treeTemplateJson.length; i++) {
-              const element = config.treeTemplateJson[i];
-              element.defaultValue = nodeData[element.relationField] || ''
-            }
-          }
-          //参数
-          let query = {
-            paramList: config.treeTemplateJson || [],
-          }
-          //接口
-          getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
-            let data = res.data
-            if (Array.isArray(data)) {
-              resolve(data);
-            } else {
-              resolve([]);
-            }
-          })
-        }
+      formVisible: false,
+      flowVisible: false,
+      flowListVisible: false,
+      flowList: [],
+      exportBoxVisible: false,
+      productTypeIdOptions: [],
+      productTypeIdProps: {
+        "label": "fullName",
+        "value": "enCode"
       },
-      getColumnList() {
-        // 没有开启权限
-        this.columnOptions = this.transformColumnList(this.columnList)
-      },
-      transformColumnList(columnList) {
-        let list = []
-        for (let i = 0; i < columnList.length; i++) {
-          const e = columnList[i];
-          if (!e.prop.includes('-')) {
-            list.push(e)
-          } else {
-            let prop = e.prop.split('-')[0]
-            let label = e.label.split('-')[0]
-            let vModel = e.prop.split('-')[1]
-            let newItem = {
-              align: "center",
-              jnpfKey: "table",
-              prop,
-              label,
-              children: []
-            }
-            e.vModel = vModel
-            if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
-            if (!list.some(o => o.prop === prop)) list.push(newItem)
-            for (let i = 0; i < list.length; i++) {
-              if (list[i].prop === prop) {
-                list[i].children.push(e)
-                break
-              }
-            }
-          }
-        }
-        this.getMergeList(list)
-        this.getExportList(list)
-        return list
+      inventoryTypeOptions: [],
+      inventoryTypeProps: {
+        "label": "fullName",
+        "value": "enCode"
       },
-      arraySpanMethod({
-        column
-      }) {
-        for (let i = 0; i < this.mergeList.length; i++) {
-          if (column.property == this.mergeList[i].prop) {
-            return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
-          }
-        }
+      productCategoryIdOptions: [],
+      productCategoryIdProps: {
+        "label": "F_FullName",
+        "value": "id"
       },
-      getMergeList(list) {
-        let newList = JSON.parse(JSON.stringify(list))
-        newList.forEach(item => {
-          if (item.children && item.children.length) {
-            let child = {
-              prop: item.prop + '-child-first'
-            }
-            item.children.unshift(child)
-          }
-        })
-        newList.forEach(item => {
-          if (item.children && item.children.length) {
-            item.children.forEach((child, index) => {
-              if (index == 0) {
-                this.mergeList.push({
-                  prop: child.prop,
-                  rowspan: 1,
-                  colspan: item.children.length
-                })
-              } else {
-                this.mergeList.push({
-                  prop: child.prop,
-                  rowspan: 0,
-                  colspan: 0
-                })
-              }
-            })
-          } else {
-            this.mergeList.push({
-              prop: item.prop,
-              rowspan: 1,
-              colspan: 1
-            })
-          }
-        })
+      dangerousFlagOptions: [],
+      dangerousFlagProps: {
+        "label": "fullName",
+        "value": "enCode"
       },
-      getExportList(list) {
-        let exportList = []
-        for (let i = 0; i < list.length; i++) {
-          if (list[i].jnpfKey === 'table') {
-            for (let j = 0; j < list[i].children.length; j++) {
-              exportList.push(list[i].children[j])
-            }
-          } else {
-            exportList.push(list[i])
-          }
-        }
-        this.exportList = exportList
+      importedFlagOptions: [],
+      importedFlagProps: {
+        "label": "fullName",
+        "value": "enCode"
       },
-      getproductTypeIdOptions() {
-        getDictionaryDataSelector('521699870097015173').then(res => {
-          this.productTypeIdOptions = res.data.list
-        })
+      processedFlagOptions: [],
+      processedFlagProps: {
+        "label": "fullName",
+        "value": "enCode"
       },
-      getinventoryTypeOptions() {
-        getDictionaryDataSelector('521705509590401413').then(res => {
-          this.inventoryTypeOptions = res.data.list
-        })
+      outsourcedFlagOptions: [],
+      outsourcedFlagProps: {
+        "label": "fullName",
+        "value": "enCode"
       },
-      goDetail(id) {
-        this.detailVisible = true
-        this.$nextTick(() => {
-          this.$refs.Detail.init(id)
-        })
+      outputTaxRateOptions: [],
+      outputTaxRateProps: {
+        "label": "fullName",
+        "value": "enCode"
       },
-      sortChange({
-        column,
-        prop,
-        order
-      }) {
-        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-        this.listQuery.sidx = !order ? '' : prop
-        this.initData()
+      inputTaxRateOptions: [],
+      inputTaxRateProps: {
+        "label": "fullName",
+        "value": "enCode"
       },
-      async initSearchDataAndListData() {
-        await this.initSearchData()
-        this.initData()
+      deliveryTypeOptions: [],
+      deliveryTypeProps: {
+        "label": "fullName",
+        "value": "enCode"
       },
-      //初始化查询的默认数据
-      async initSearchData() {},
-      initData() {
-        this.listLoading = true;
-        let _query = {
-          ...this.listQuery,
-          ...this.query,
-          keyword: this.keyword,
-          dataType: 0,
-          menuId: this.menuId,
-          moduleId: '518014334211720453',
-          type: 1,
-        };
-        request({
-          url: `/api/scm/ProductWarehouse/getList`,
-          method: 'post',
-          data: _query
-        }).then(res => {
-          var _list = res.data.list;
-          this.list = _list.map(o => ({
-            ...o,
-            ...this.expandObj,
-          }))
-          this.total = res.data.pagination.total
-          this.listLoading = false
-        })
+      manyUnitFlagOptions: [],
+      manyUnitFlagProps: {
+        "label": "fullName",
+        "value": "enCode"
       },
-      handleDel(id) {
-        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-          type: 'warning'
-        }).then(() => {
-          request({
-            url: `/api/scm/ProductWarehouse/${id}`,
-            method: 'DELETE'
-          }).then(res => {
-            this.$message({
-              type: 'success',
-              message: res.msg,
-              onClose: () => {
-                this.initData()
-              }
-            });
-          })
-        }).catch(() => {});
+      inventoryUnitIdOptions: [{
+        "fullName": "选项一",
+        "id": "1"
+      }, {
+        "fullName": "选项二",
+        "id": "2"
+      }],
+      inventoryUnitIdProps: {
+        "label": "fullName",
+        "value": "id"
       },
-      handelUpload() {
-        this.uploadBoxVisible = true
-        this.$nextTick(() => {
-          this.$refs.UploadBox.init("", "scm/ProductWarehouse")
-        })
+      orderMainUnitIdOptions: [{
+        "fullName": "选项一",
+        "id": "1"
+      }, {
+        "fullName": "选项二",
+        "id": "2"
+      }],
+      orderMainUnitIdProps: {
+        "label": "fullName",
+        "value": "id"
       },
-      openSuperQuery() {
-        this.superQueryVisible = true
-        this.$nextTick(() => {
-          this.$refs.SuperQuery.init()
-        })
+      salesMainUnitIdOptions: [{
+        "fullName": "选项一",
+        "id": "1"
+      }, {
+        "fullName": "选项二",
+        "id": "2"
+      }],
+      salesMainUnitIdProps: {
+        "label": "fullName",
+        "value": "id"
       },
-      superQuery(queryJson) {
-        this.listQuery.superQueryJson = queryJson
-        this.listQuery.currentPage = 1
-        this.initData()
+      operateUnitIdOptions: [{
+        "fullName": "选项一",
+        "id": "1"
+      }, {
+        "fullName": "选项二",
+        "id": "2"
+      }],
+      operateUnitIdProps: {
+        "label": "fullName",
+        "value": "id"
       },
-      addOrUpdateHandle(row, flowState) {
-        if (!row) {
-          this.addHandle();
-        } else {
-          this.updateHandle(row, flowState)
-        }
+      pricingUnitIdOptions: [{
+        "fullName": "选项一",
+        "id": "1"
+      }, {
+        "fullName": "选项二",
+        "id": "2"
+      }],
+      pricingUnitIdProps: {
+        "label": "fullName",
+        "value": "id"
       },
-      exportData() {
-        this.exportBoxVisible = true
-        this.$nextTick(() => {
-          this.$refs.ExportBox.init(this.exportList)
-        })
+      jnpf_jg_product_business_jnpf_businessLineIdOptions: [],
+      jnpf_jg_product_business_jnpf_businessLineIdProps: {
+        "label": "name",
+        "value": "id"
       },
-      download(data) {
-        let query = {
-          ...data,
-          ...this.listQuery,
-          ...this.query,
-          menuId: this.menuId
-        }
-        request({
-          url: `/api/scm/ProductWarehouse/Actions/Export`,
-          method: 'post',
-          data: query
-        }).then(res => {
-          if (!res.data.url) return
-          this.jnpf.downloadFile(res.data.url)
-          this.$refs.ExportBox.visible = false
-          this.exportBoxVisible = false
-        })
+      tableField141_productUnitwarehouseIdOptions: [],
+      tableField141_productUnitwarehouseIdProps: {
+        "label": "fullName",
+        "value": "id"
       },
-      search() {
-        this.listQuery.currentPage = 1
-        this.listQuery.pageSize = 20
-        this.listQuery.sort = "desc"
-        this.listQuery.sidx = ""
-        this.initData()
+      interfaceRes: {
+        brandId: [],
+        firstSupplierId: [],
       },
-      //流程改造后相关调用方法
-      updateHandle(row, flowState) {
-        let data = {
-          id: row.id,
-          flowId: row.flowId || this.flowList[0].id,
-          opType: flowState ? 0 : '-1',
-          status: flowState
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo']),
+    menuId() {
+      return this.$route.meta.modelId || ''
+    }
+  },
+  created() {
+    getFormById("518014334211720453").then(res1 => {
+      let flowId = res1.data && res1.data.id
+      getFlowList(flowId, '1').then(res2 => {
+        this.flowList = res2.data
+        this.getColumnList(),
+          this.initSearchDataAndListData()
+        this.getproductTypeIdOptions();
+        this.getinventoryTypeOptions();
+        this.queryData = JSON.parse(JSON.stringify(this.query))
+      }).catch((e) => {
+        this.$message({
+          type: 'error',
+          message: e.message
+        });
+        this.$router.push('/404');
+      })
+    })
+  },
+  methods: {
+    fnGetPhotoSrc(photo) {
+      let resUrl = ''
+      if (photo) {
+        if (photo.length > 0) {
+          resUrl = this.define.APIURl + photo[0]['url']
         }
-        this.flowVisible = true
+      }
+      return resUrl
+    },
+    toDetail(defaultValue, modelId) {
+      if (!defaultValue) return
+      getConfigData(modelId).then(res => {
+        if (!res.data || !res.data.formData) return
+        let formData = JSON.parse(res.data.formData)
+        formData.popupType = 'general'
+        this.toFormDetailVisible = true
         this.$nextTick(() => {
-          this.$refs.FlowBox.init(data)
+          this.$refs.toFormDetail.init(formData, modelId, defaultValue)
         })
-      },
-      toApprovalDetail(row) {
-        let data = {
-          id: row.id,
-          flowId: row.flowId,
-          opType: 0,
-          status: row.currentState
-        }
-        this.formVisible = true
+      })
+    },
+    toggleTreeExpand(expands) {
+      this.refreshTree = false
+      this.expandsTree = expands
+      this.$nextTick(() => {
+        this.refreshTree = true
         this.$nextTick(() => {
-          this.$refs.FlowBox.init(data)
+          this.$refs.treeBox.setCurrentKey(null)
         })
-      },
-      addHandle() {
-        if (!this.flowList.length) {
-          this.$message({
-            type: 'error',
-            message: '流程不存在'
-          });
-        } else if (this.flowList.length === 1) {
-          this.selectFlow(this.flowList[0])
+      })
+    },
+    filterNode(value, data) {
+      if (!value) return true;
+      return data[this.treeProps.label].indexOf(value) !== -1;
+    },
+    loadNode(node, resolve) {
+      const nodeData = node.data
+      const config = {
+        treeInterfaceId: "",
+        treeTemplateJson: []
+      }
+      if (config.treeInterfaceId) {
+        //这里是为了拿到参数中关联的字段的值，后端自行拿
+        if (config.treeTemplateJson && config.treeTemplateJson.length) {
+          for (let i = 0; i < config.treeTemplateJson.length; i++) {
+            const element = config.treeTemplateJson[i];
+            element.defaultValue = nodeData[element.relationField] || ''
+          }
+        }
+        //参数
+        let query = {
+          paramList: config.treeTemplateJson || [],
+        }
+        //接口
+        getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
+          let data = res.data
+          if (Array.isArray(data)) {
+            resolve(data);
+          } else {
+            resolve([]);
+          }
+        })
+      }
+    },
+    getColumnList() {
+      // 没有开启权限
+      this.columnOptions = this.transformColumnList(this.columnList)
+    },
+    transformColumnList(columnList) {
+      let list = []
+      for (let i = 0; i < columnList.length; i++) {
+        const e = columnList[i];
+        if (!e.prop.includes('-')) {
+          list.push(e)
         } else {
-          this.flowListVisible = true
+          let prop = e.prop.split('-')[0]
+          let label = e.label.split('-')[0]
+          let vModel = e.prop.split('-')[1]
+          let newItem = {
+            align: "center",
+            jnpfKey: "table",
+            prop,
+            label,
+            children: []
+          }
+          e.vModel = vModel
+          if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
+          if (!list.some(o => o.prop === prop)) list.push(newItem)
+          for (let i = 0; i < list.length; i++) {
+            if (list[i].prop === prop) {
+              list[i].children.push(e)
+              break
+            }
+          }
         }
-      },
-      //选择流程发起
-      selectFlow(item) {
-        let data = {
-          id: '',
-          formType: 1,
-          flowId: item.id,
-          opType: '-1'
+      }
+      this.getMergeList(list)
+      this.getExportList(list)
+      return list
+    },
+    arraySpanMethod({
+      column
+    }) {
+      for (let i = 0; i < this.mergeList.length; i++) {
+        if (column.property == this.mergeList[i].prop) {
+          return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
         }
-        this.flowListVisible = false
-        this.flowVisible = true
-        this.$nextTick(() => {
-          this.$refs.FlowBox.init(data)
+      }
+    },
+    getMergeList(list) {
+      let newList = JSON.parse(JSON.stringify(list))
+      newList.forEach(item => {
+        if (item.children && item.children.length) {
+          let child = {
+            prop: item.prop + '-child-first'
+          }
+          item.children.unshift(child)
+        }
+      })
+      newList.forEach(item => {
+        if (item.children && item.children.length) {
+          item.children.forEach((child, index) => {
+            if (index == 0) {
+              this.mergeList.push({
+                prop: child.prop,
+                rowspan: 1,
+                colspan: item.children.length
+              })
+            } else {
+              this.mergeList.push({
+                prop: child.prop,
+                rowspan: 0,
+                colspan: 0
+              })
+            }
+          })
+        } else {
+          this.mergeList.push({
+            prop: item.prop,
+            rowspan: 1,
+            colspan: 1
+          })
+        }
+      })
+    },
+    getExportList(list) {
+      let exportList = []
+      for (let i = 0; i < list.length; i++) {
+        if (list[i].jnpfKey === 'table') {
+          for (let j = 0; j < list[i].children.length; j++) {
+            exportList.push(list[i].children[j])
+          }
+        } else {
+          exportList.push(list[i])
+        }
+      }
+      this.exportList = exportList
+    },
+    getproductTypeIdOptions() {
+      getDictionaryDataSelector('521699870097015173').then(res => {
+        this.productTypeIdOptions = res.data.list
+      })
+    },
+    getinventoryTypeOptions() {
+      getDictionaryDataSelector('521705509590401413').then(res => {
+        this.inventoryTypeOptions = res.data.list
+      })
+    },
+    goDetail(id) {
+      this.detailVisible = true
+      this.$nextTick(() => {
+        this.$refs.Detail.init(id)
+      })
+    },
+    sortChange({
+      column,
+      prop,
+      order
+    }) {
+      this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+      this.listQuery.sidx = !order ? '' : prop
+      this.initData()
+    },
+    async initSearchDataAndListData() {
+      await this.initSearchData()
+      this.initData()
+    },
+    //初始化查询的默认数据
+    async initSearchData() { },
+    initData() {
+      this.listLoading = true;
+      let _query = {
+        ...this.listQuery,
+        ...this.query,
+        keyword: this.keyword,
+        dataType: 0,
+        menuId: this.menuId,
+        moduleId: '518014334211720453',
+        type: 1,
+      };
+      request({
+        url: `/api/scm/ProductWarehouse/getList`,
+        method: 'post',
+        data: _query
+      }).then(res => {
+        var _list = res.data.list;
+        this.list = _list.map(o => ({
+          ...o,
+          ...this.expandObj,
+        }))
+        this.total = res.data.pagination.total
+        this.listLoading = false
+      })
+    },
+    handleDel(id) {
+      this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+        type: 'warning'
+      }).then(() => {
+        request({
+          url: `/api/scm/ProductWarehouse/${id}`,
+          method: 'DELETE'
+        }).then(res => {
+          this.$message({
+            type: 'success',
+            message: res.msg,
+            onClose: () => {
+              this.initData()
+            }
+          });
         })
-      },
-      refresh(isrRefresh) {
-        this.formVisible = false
-        if (isrRefresh) this.reset()
-      },
-      reset() {
-        this.query = JSON.parse(JSON.stringify(this.queryData))
-        this.search()
-      },
-      colseFlow(isrRefresh) {
-        this.flowVisible = false
-        if (isrRefresh) this.reset()
-      },
-    }
+      }).catch(() => { });
+    },
+    handelUpload() {
+      this.uploadBoxVisible = true
+      this.$nextTick(() => {
+        this.$refs.UploadBox.init("", "scm/ProductWarehouse")
+      })
+    },
+    openSuperQuery() {
+      this.superQueryVisible = true
+      this.$nextTick(() => {
+        this.$refs.SuperQuery.init()
+      })
+    },
+    superQuery(queryJson) {
+      this.listQuery.superQueryJson = queryJson
+      this.listQuery.currentPage = 1
+      this.initData()
+    },
+    addOrUpdateHandle(row, flowState) {
+      if (!row) {
+        this.addHandle();
+      } else {
+        this.updateHandle(row, flowState)
+      }
+    },
+    exportData() {
+      this.exportBoxVisible = true
+      this.$nextTick(() => {
+        this.$refs.ExportBox.init(this.exportList)
+      })
+    },
+    download(data) {
+      let query = {
+        ...data,
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId
+      }
+      request({
+        url: `/api/scm/ProductWarehouse/Actions/Export`,
+        method: 'post',
+        data: query
+      }).then(res => {
+        if (!res.data.url) return
+        this.jnpf.downloadFile(res.data.url)
+        this.$refs.ExportBox.visible = false
+        this.exportBoxVisible = false
+      })
+    },
+    search() {
+      this.listQuery.currentPage = 1
+      this.listQuery.pageSize = 20
+      this.listQuery.sort = "desc"
+      this.listQuery.sidx = ""
+      this.initData()
+    },
+    //流程改造后相关调用方法
+    updateHandle(row, flowState) {
+      let data = {
+        id: row.id,
+        flowId: row.flowId || this.flowList[0].id,
+        opType: flowState ? 0 : '-1',
+        status: flowState
+      }
+      this.flowVisible = true
+      this.$nextTick(() => {
+        this.$refs.FlowBox.init(data)
+      })
+    },
+    toApprovalDetail(row) {
+      let data = {
+        id: row.id,
+        flowId: row.flowId,
+        opType: 0,
+        status: row.currentState
+      }
+      this.formVisible = true
+      this.$nextTick(() => {
+        this.$refs.FlowBox.init(data)
+      })
+    },
+    addHandle() {
+      if (!this.flowList.length) {
+        this.$message({
+          type: 'error',
+          message: '流程不存在'
+        });
+      } else if (this.flowList.length === 1) {
+        this.selectFlow(this.flowList[0])
+      } else {
+        this.flowListVisible = true
+      }
+    },
+    //选择流程发起
+    selectFlow(item) {
+      let data = {
+        id: '',
+        formType: 1,
+        flowId: item.id,
+        opType: '-1'
+      }
+      this.flowListVisible = false
+      this.flowVisible = true
+      this.$nextTick(() => {
+        this.$refs.FlowBox.init(data)
+      })
+    },
+    refresh(isrRefresh) {
+      this.formVisible = false
+      if (isrRefresh) this.reset()
+    },
+    reset() {
+      this.query = JSON.parse(JSON.stringify(this.queryData))
+      this.search()
+    },
+    colseFlow(isrRefresh) {
+      this.flowVisible = false
+      if (isrRefresh) this.reset()
+    },
   }
+}
 </script>