Merge branch 'master' of http://121.40.234.130:8899/root/hl_one

mes/qd/src/views/wms/storage_manage/product/productCheck/StructIvt.vue

@@ -27,7 +27,7 @@
               v-model="query.bill_code"
               clearable
               size="mini"
-              placeholder="单据号"
+              placeholder="库区/货位"
               style="width: 200px;"
               class="filter-item"
               @keyup.enter.native="crud.toQuery"

mes/qd/src/views/wms/storage_manage/product/productCheck/index.vue

@@ -131,7 +131,7 @@
         >
           异常处理
         </el-button>
-        <el-button
+        <!--<el-button
           slot="right"
           class="filter-item"
           type="success"
@@ -141,7 +141,7 @@
           @click="downdtl"
         >
           导出Excel
-        </el-button>
+        </el-button>-->
       </crudOperation>
       <!--表格渲染-->
       <el-table

mes/qd/src/views/wms/storage_manage/product/productIvtFlow/index.vue

@@ -0,0 +1,172 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="80px"
+          label-suffix=":"
+        >
+          <el-form-item label="所属仓库">
+            <el-select
+              v-model="query.stor_id"
+              clearable
+              size="mini"
+              placeholder="所属仓库"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in storlist"
+                :key="item.stor_id"
+                :label="item.stor_name"
+                :value="item.stor_id"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="变动类型">
+            <el-select
+              v-model="query.change_type_scode"
+              clearable
+              size="mini"
+              placeholder="变动类型"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.CHANGE_TYPE_SCODE"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="仓位编码">
+            <el-input
+              v-model="query.struct_code"
+              size="mini"
+              clearable
+              placeholder="仓位编码、名称"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="物料编码">
+            <el-input
+              v-model="query.material_code"
+              size="mini"
+              clearable
+              placeholder="物料编码、名称、规格"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="单据号">
+            <el-input
+              v-model="query.bill_code"
+              size="mini"
+              clearable
+              placeholder="单据号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        size="mini"
+        :data="crud.data"
+        highlight-current-row
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column show-overflow-tooltip min-width="120" prop="stor_name" label="仓库名称" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="sect_name" label="库区名称" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="struct_code" label="仓位编码" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="struct_name" label="仓位名称" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="material_code" label="物料编码" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="material_name" label="物料名称" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="material_spec" label="物料规格" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="change_type_scode" label="变动类型" :formatter="formatType" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="bill_code" label="单据号" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="change_person_name" label="变动人" />
+        <el-table-column show-overflow-tooltip min-width="150" prop="change_time" label="变动时间" />
+        <el-table-column show-overflow-tooltip prop="change_qty" label="变动数" :formatter="crud.formatNum3" />
+        <el-table-column show-overflow-tooltip prop="result_qty" label="结存数" :formatter="crud.formatNum3" />
+        <el-table-column show-overflow-tooltip prop="unit_name" label="单位" />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import CRUD, { crud, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import DateRangePicker from '@/components/DateRangePicker/index'
+import crudStorattr, { getStor } from '@/views/wms/storage_manage/basedata/basedata'
+import ProductivtFlow from '@/views/wms/storage_manage/product/productIvtFlow/productivtFlow'
+
+export default {
+  name: 'ProductIn',
+  dicts: ['CHANGE_TYPE_SCODE'],
+  components: { crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
+  cruds() {
+    return CRUD({
+      title: '成品库存变动查询',
+      optShow: { add: false, reset: true },
+      idField: 'stockrecord_id',
+      url: '/api/stIvtStructivtflowCp',
+      crudMethod: { ...ProductivtFlow },
+      props: { size: 20 }
+    })
+  },
+  mixins: [presenter(), header(), crud()],
+  // 数据字典
+  data() {
+    return {
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      permission: {},
+      storlist: [],
+      storId: null
+    }
+  },
+  mounted: function() {
+    const that = this
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 180 + 'px;'
+    }
+  },
+  created() {
+    crudStorattr.getStor({ 'stor_type': '4' }).then(res => {
+      this.storlist = res.content
+    })
+  },
+  methods: {
+    formatType(row) {
+      return this.dict.label.CHANGE_TYPE_SCODE[row.change_type_scode]
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 10px;
+}
+</style>

mes/qd/src/views/wms/storage_manage/product/productIvtFlow/productivtFlow.js

@@ -0,0 +1,31 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: '/api/stIvtStructivtflowCp',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: '/api/stIvtStructivtflowCp/delete',
+    method: 'post',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: '/api/stIvtStructivtflowCp/update',
+    method: 'post',
+    data
+  })
+}
+
+export default {
+  add,
+  edit,
+  del
+}

mes/qd/src/views/wms/storage_manage/product/productMoreOrless/AddDialog.vue

@@ -149,12 +149,7 @@
       :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
     >
       <el-table-column type="index" label="序号" width="55" align="center"/>
-      <el-table-column prop="storagevehicle_code" label="载具号" align="center" min-width="200" show-overflow-tooltip>
-        <template scope="scope">
-          <el-input v-show="!scope.row.edit" v-model="scope.row.storagevehicle_code" class="input-with-select"/>
-          <span v-show="scope.row.edit">{{ scope.row.storagevehicle_code }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column prop="storagevehicle_code" label="载具号" align="center" min-width="200" show-overflow-tooltip/>
       <el-table-column prop="bucketunique" label="箱号" align="center" min-width="200" show-overflow-tooltip>
         <template scope="scope">
           <el-input v-show="!scope.row.edit" v-model="scope.row.bucketunique" class="input-with-select"/>
@@ -462,10 +457,6 @@ export default {
           this.crud.notify('物料不可为空！', CRUD.NOTIFICATION_TYPE.INFO)
           return false
         }
-        if (!row.storagevehicle_code) {
-          this.crud.notify('载具号不可为空！', CRUD.NOTIFICATION_TYPE.INFO)
-          return false
-        }
         if (this.form.mol_type === '0' && (parseFloat(row.ivt_qty) < parseFloat(row.mol_qty))) {
           this.crud.notify('不允许损数量大于库存数量！', CRUD.NOTIFICATION_TYPE.INFO)
           return false

mes/qd/src/views/wms/storage_manage/product/productMoreOrless/StructDiv.vue

@@ -12,7 +12,7 @@
     <el-row>
       <el-col :span="6">
         <el-cascader
-          v-model="query.sect"
+          v-model="defaultList"
           placeholder="所属库区"
           :options="sects"
           :props="{ checkStrictly: true }"
@@ -101,6 +101,7 @@ export default {
     return {
       sects: [],
       classes: [],
+      defaultList: ['1528627995269533696', '1528631043496742912'],
       dialogVisible: false,
       sect: {},
       mol_type: '',
@@ -141,6 +142,8 @@ export default {
           this.query.sect_id = this.sect[1]
         }
       }
+      this.query.stor_id = this.defaultList[0]
+      this.query.sect_id = this.defaultList[1]
       this.query.is_used = '1'
       this.query.is_delete = '0'
       this.crud.toQuery()

mes/qd/src/views/wms/storage_manage/product/productOut/DivDialog.vue

@@ -26,6 +26,7 @@
           <el-form-item label="库区" prop="gender2">
             <el-cascader
               placeholder="请选择"
+              v-model="defaultList"
               :options="sects"
               :props="{ checkStrictly: true }"
               clearable
@@ -268,6 +269,7 @@ export default {
       tabledis: [],
       currentRow: {},
       currentDis: {},
+      defaultList: ['1528627995269533696', '1528631043496742912'],
       form: {
         gender2: ''
       },
@@ -310,6 +312,8 @@ export default {
       crudPoint.getPoint({ 'area_type': area_type }).then(res => {
         this.pointList = res
       })
+      this.mstrow.stor_id = this.defaultList[0]
+      this.mstrow.sect_id = this.defaultList[1]
     },
     close() {
       this.$refs['form2'].resetFields()
@@ -417,7 +421,7 @@ export default {
       }
 
       this.loadingAlldiv = true
-      productOut.allDivIvt({ 'iostorinvdtl_id': this.currentRow.iostorinvdtl_id, 'sect_id': this.mstrow.sect_id, 'stor_id': this.mstrow.stor_id, 'type': false }).then(res => {
+      productOut.allDivIvt({ 'iostorinvdtl_id': this.currentRow.iostorinvdtl_id, 'iostorinv_id': this.currentRow.iostorinv_id, 'sect_id': this.mstrow.sect_id, 'stor_id': this.mstrow.stor_id, 'type': false }).then(res => {
         this.crud.notify('分配成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.queryTableDtl()
         this.loadingAlldiv = false

mes/qd/src/views/wms/storage_manage/rawproduct/rawproductIvtFlow/index.vue

@@ -0,0 +1,172 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="80px"
+          label-suffix=":"
+        >
+          <el-form-item label="所属仓库">
+            <el-select
+              v-model="query.stor_id"
+              clearable
+              size="mini"
+              placeholder="所属仓库"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in storlist"
+                :key="item.stor_id"
+                :label="item.stor_name"
+                :value="item.stor_id"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="变动类型">
+            <el-select
+              v-model="query.change_type_scode"
+              clearable
+              size="mini"
+              placeholder="变动类型"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.CHANGE_TYPE_SCODE"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="仓位编码">
+            <el-input
+              v-model="query.struct_code"
+              size="mini"
+              clearable
+              placeholder="仓位编码、名称"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="物料编码">
+            <el-input
+              v-model="query.material_code"
+              size="mini"
+              clearable
+              placeholder="物料编码、名称、规格"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="单据号">
+            <el-input
+              v-model="query.bill_code"
+              size="mini"
+              clearable
+              placeholder="单据号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        size="mini"
+        :data="crud.data"
+        highlight-current-row
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column show-overflow-tooltip min-width="120" prop="stor_name" label="仓库名称" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="sect_name" label="库区名称" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="struct_code" label="仓位编码" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="struct_name" label="仓位名称" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="material_code" label="物料编码" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="material_name" label="物料名称" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="material_spec" label="物料规格" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="change_type_scode" label="变动类型" :formatter="formatType" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="bill_code" label="单据号" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="change_person_name" label="变动人" />
+        <el-table-column show-overflow-tooltip min-width="150" prop="change_time" label="变动时间" />
+        <el-table-column show-overflow-tooltip prop="change_qty" label="变动数" :formatter="crud.formatNum3" />
+        <el-table-column show-overflow-tooltip prop="result_qty" label="结存数" :formatter="crud.formatNum3" />
+        <el-table-column show-overflow-tooltip prop="unit_name" label="单位" />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import CRUD, { crud, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import DateRangePicker from '@/components/DateRangePicker/index'
+import crudStorattr, { getStor } from '@/views/wms/storage_manage/basedata/basedata'
+import ProductivtFlow from '@/views/wms/storage_manage/rawproduct/rawproductIvtFlow/productivtFlow'
+
+export default {
+  name: 'ProductIn',
+  dicts: ['CHANGE_TYPE_SCODE'],
+  components: { crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
+  cruds() {
+    return CRUD({
+      title: '原材料库存变动查询',
+      optShow: { add: false, reset: true },
+      idField: 'stockrecord_id',
+      url: '/api/stIvtStructivtflowYl',
+      crudMethod: { ...ProductivtFlow },
+      props: { size: 20 }
+    })
+  },
+  mixins: [presenter(), header(), crud()],
+  // 数据字典
+  data() {
+    return {
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      permission: {},
+      storlist: [],
+      storId: null
+    }
+  },
+  mounted: function() {
+    const that = this
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 180 + 'px;'
+    }
+  },
+  created() {
+    crudStorattr.getStor({ 'stor_type': '3' }).then(res => {
+      this.storlist = res.content
+    })
+  },
+  methods: {
+    formatType(row) {
+      return this.dict.label.CHANGE_TYPE_SCODE[row.change_type_scode]
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 10px;
+}
+</style>

mes/qd/src/views/wms/storage_manage/rawproduct/rawproductIvtFlow/productivtFlow.js

@@ -0,0 +1,31 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: '/api/stIvtStructivtflowYl',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: '/api/stIvtStructivtflowYl/delete',
+    method: 'post',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: '/api/stIvtStructivtflowYl/update',
+    method: 'post',
+    data
+  })
+}
+
+export default {
+  add,
+  edit,
+  del
+}

mes/qd/src/views/wms/storage_manage/semiproduct/semiproductCheck/StructIvt.vue

@@ -27,7 +27,7 @@
               v-model="query.bill_code"
               clearable
               size="mini"
-              placeholder="单据号"
+              placeholder="库区/货位"
               style="width: 200px;"
               class="filter-item"
               @keyup.enter.native="crud.toQuery"

mes/qd/src/views/wms/storage_manage/semiproduct/semiproductCheck/index.vue

@@ -131,7 +131,7 @@
         >
           异常处理
         </el-button>
-        <el-button
+        <!--<el-button
           slot="right"
           class="filter-item"
           type="success"
@@ -141,7 +141,7 @@
           @click="downdtl"
         >
           导出Excel
-        </el-button>
+        </el-button>-->
       </crudOperation>
       <!--表格渲染-->
       <el-table

mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvt/index.vue

@@ -133,7 +133,7 @@ export default {
     }
   },
   created() {
-    crudStorattr.getStor({ 'stor_type': '4' }).then(res => {
+    crudStorattr.getStor({ 'stor_type': '2' }).then(res => {
       this.storlist = res.content
     })
   },

mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvtFlow/index.vue

@@ -0,0 +1,172 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="80px"
+          label-suffix=":"
+        >
+          <el-form-item label="所属仓库">
+            <el-select
+              v-model="query.stor_id"
+              clearable
+              size="mini"
+              placeholder="所属仓库"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in storlist"
+                :key="item.stor_id"
+                :label="item.stor_name"
+                :value="item.stor_id"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="变动类型">
+            <el-select
+              v-model="query.change_type_scode"
+              clearable
+              size="mini"
+              placeholder="变动类型"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.CHANGE_TYPE_SCODE"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="仓位编码">
+            <el-input
+              v-model="query.struct_code"
+              size="mini"
+              clearable
+              placeholder="仓位编码、名称"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="物料编码">
+            <el-input
+              v-model="query.material_code"
+              size="mini"
+              clearable
+              placeholder="物料编码、名称、规格"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="单据号">
+            <el-input
+              v-model="query.bill_code"
+              size="mini"
+              clearable
+              placeholder="单据号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        size="mini"
+        :data="crud.data"
+        highlight-current-row
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column show-overflow-tooltip min-width="120" prop="stor_name" label="仓库名称" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="sect_name" label="库区名称" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="struct_code" label="仓位编码" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="struct_name" label="仓位名称" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="material_code" label="物料编码" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="material_name" label="物料名称" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="material_spec" label="物料规格" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="change_type_scode" label="变动类型" :formatter="formatType" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="bill_code" label="单据号" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="change_person_name" label="变动人" />
+        <el-table-column show-overflow-tooltip min-width="150" prop="change_time" label="变动时间" />
+        <el-table-column show-overflow-tooltip prop="change_qty" label="变动数" :formatter="crud.formatNum3" />
+        <el-table-column show-overflow-tooltip prop="result_qty" label="结存数" :formatter="crud.formatNum3" />
+        <el-table-column show-overflow-tooltip prop="unit_name" label="单位" />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import CRUD, { crud, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import DateRangePicker from '@/components/DateRangePicker/index'
+import crudStorattr, { getStor } from '@/views/wms/storage_manage/basedata/basedata'
+import ProductivtFlow from '@/views/wms/storage_manage/semiproduct/semiproductIvtFlow/productivtFlow'
+
+export default {
+  name: 'ProductIn',
+  dicts: ['CHANGE_TYPE_SCODE'],
+  components: { crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
+  cruds() {
+    return CRUD({
+      title: '半成品库存变动查询',
+      optShow: { add: false, reset: true },
+      idField: 'stockrecord_id',
+      url: '/api/stIvtStructivtflowBcp',
+      crudMethod: { ...ProductivtFlow },
+      props: { size: 20 }
+    })
+  },
+  mixins: [presenter(), header(), crud()],
+  // 数据字典
+  data() {
+    return {
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      permission: {},
+      storlist: [],
+      storId: null
+    }
+  },
+  mounted: function() {
+    const that = this
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 180 + 'px;'
+    }
+  },
+  created() {
+    crudStorattr.getStor({ 'stor_type': '2' }).then(res => {
+      this.storlist = res.content
+    })
+  },
+  methods: {
+    formatType(row) {
+      return this.dict.label.CHANGE_TYPE_SCODE[row.change_type_scode]
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 10px;
+}
+</style>

mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvtFlow/productivtFlow.js

@@ -0,0 +1,31 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: '/api/stIvtStructivtflowBcp',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: '/api/stIvtStructivtflowBcp/delete',
+    method: 'post',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: '/api/stIvtStructivtflowBcp/update',
+    method: 'post',
+    data
+  })
+}
+
+export default {
+  add,
+  edit,
+  del
+}

mes/qd/src/views/wms/storage_manage/semiproduct/semiproductMoreOrless/StructDiv.vue

@@ -12,7 +12,7 @@
     <el-row>
       <el-col :span="6">
         <el-cascader
-          v-model="query.sect"
+          v-model="defaultList"
           placeholder="所属库区"
           :options="sects"
           :props="{ checkStrictly: true }"
@@ -101,6 +101,7 @@ export default {
     return {
       sects: [],
       classes: [],
+      defaultList: ['15286279952695336962', '1528631044482404352'],
       dialogVisible: false,
       sect: {},
       mol_type: '',
@@ -143,6 +144,8 @@ export default {
       }
       this.query.is_used = '1'
       this.query.is_delete = '0'
+      this.query.stor_id = this.defaultList[0]
+      this.query.sect_id = this.defaultList[1]
       this.crud.toQuery()
     },
     sectQueryChange(val) {

mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/AddDialog.vue

@@ -254,7 +254,7 @@ export default {
       })
     },
     [CRUD.HOOK.afterToView]() {
-      shutframe.getOutBillDtl2({ 'shutframeinv_id': this.form.shutframeinv_id }).then(res => {
+      shutframe.getOutBillDtl({ 'shutframeinv_id': this.form.shutframeinv_id }).then(res => {
         this.form.tableData = res
       })
     },