修改

mes/qd/src/api/wms/statistics/report.js

@@ -1,34 +1,25 @@
 import request from '@/utils/request'
 
-export function add(data) {
+export function getHeader() {
   return request({
-    url: 'api/rawUatWcQuery',
+    url: 'api/statistical/getHeader',
+    method: 'get'
+  })
+}
+
+export function getHeader2() {
+  return request({
+    url: 'api/statistical/getHeader2',
+    method: 'get'
+  })
+}
+
+export function materPlanDtlQuery(data) {
+  return request({
+    url: 'api/statistical/materPlanDtlQuery',
     method: 'post',
     data
   })
 }
 
-export function del(ids) {
+export default { getHeader, getHeader2, materPlanDtlQuery }
-  return request({
-    url: 'api/rawUatWcQuery/',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/rawUatWcQuery',
-    method: 'put',
-    data
-  })
-}
-
-export function getHeader(material_type_id) {
-  return request({
-    url: 'api/rawUatWcQuery/getHeader/' + material_type_id,
-    method: 'get'
-  })
-}
-
-export default { add, edit, del, getHeader }

mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue

@@ -282,11 +282,7 @@ export default {
   data() {
     return {
       height: document.documentElement.clientHeight - 180 + 'px;',
-      permission: {
+      permission: {},
-        add: ['admin', 'workorder:add'],
-        edit: ['admin', 'workorder:edit'],
-        del: ['admin', 'workorder:del']
-      },
       divShow: false,
       sub_flag: true,
       dissub_flag: true,

mes/qd/src/views/wms/sb/inbill/index.vue

@@ -184,6 +184,8 @@
             {{ fun(scope.row.total_qty) }}
           </template>
         </el-table-column>
+        <el-table-column label="源单号" align="center" prop="source_bill_code" width="150"/>
+        <el-table-column label="源单类型" align="center" prop="source_type_name" width="150"/>
         <el-table-column label="备注" align="center" prop="remark"/>
         <el-table-column label="制单人" align="center" prop="input_optname"/>
         <el-table-column label="制单时间" align="center" prop="input_time" width="150"/>
@@ -249,11 +251,7 @@ export default {
   data() {
     return {
       height: document.documentElement.clientHeight - 180 + 'px;',
-      permission: {
+      permission: {},
-        add: ['admin', 'user:add'],
-        edit: ['admin', 'user:edit'],
-        del: ['admin', 'user:del']
-      },
       audit_flag: true,
       dis_flag: true,
       disShow: false,

mes/qd/src/views/wms/sb/outbill/IvtDialog.vue

@@ -24,7 +24,7 @@
           @keyup.enter.native="crud.toQuery"
         />
       </el-form-item>
-      <rrOperation/>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="queryBtn">查询</el-button>
     </el-form>
 
     <!--表格渲染-->
@@ -39,10 +39,10 @@
       @current-change="clickChange"
       :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
     >
-      <el-table-column v-if="!isSingle" type="selection" width="55" />
+      <el-table-column v-if="!isSingle" type="selection" width="55"/>
       <el-table-column v-if="isSingle" label="选择" width="55">
         <template slot-scope="scope">
-          <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
+          <el-radio v-model="tableRadio" :label="scope.row"><i/></el-radio>
         </template>
       </el-table-column>
       <el-table-column prop="material_code" label="物料编码" min-width="150" show-overflow-tooltip/>
@@ -126,6 +126,11 @@ export default {
         this.tableDtl = res
       })
     },
+    queryBtn() {
+      sparePartout.getIvt(this.queryrow).then(res => {
+        this.tableDtl = res
+      })
+    },
     queryClassId() {
       const param = {
         'class_idStr': this.class_idStr

mes/qd/src/views/wms/sb/outbill/index.vue

@@ -235,11 +235,7 @@ export default {
   data() {
     return {
       height: document.documentElement.clientHeight - 180 + 'px;',
-      permission: {
+      permission: {},
-        add: ['admin', 'user:add'],
-        edit: ['admin', 'user:edit'],
-        del: ['admin', 'user:del']
-      },
       audit_flag: true,
       dis_flag: true,
       disShow: false,

mes/qd/src/views/wms/sb/scrap/index.vue

@@ -235,11 +235,7 @@ export default {
   data() {
     return {
       height: document.documentElement.clientHeight - 180 + 'px;',
-      permission: {
+      permission: {},
-        add: ['admin', 'user:add'],
-        edit: ['admin', 'user:edit'],
-        del: ['admin', 'user:del']
-      },
       audit_flag: true,
       dis_flag: true,
       disShow: false,

mes/qd/src/views/wms/statistics/ioStorQuery2/index.vue

@@ -154,7 +154,7 @@
               @change="crud.toQuery"
             />
           </el-form-item>
-          <rrOperation />
+          <rrOperation/>
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -170,17 +170,6 @@
         >
           单据明细
         </el-button>
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="success"
-          :disabled="work_flag"
-          icon="el-icon-position"
-          size="mini"
-          @click="taskOpen"
-        >
-          作业明细
-        </el-button>
       </crudOperation>
       <!--表格渲染-->
       <el-table
@@ -197,34 +186,39 @@
         @select-all="onSelectAll"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column type="index" label="序号" width="50" align="center" />
+        <el-table-column type="index" label="序号" width="50" align="center"/>
-        <el-table-column show-overflow-tooltip prop="bill_code" width="130" label="订单编码" />
+        <el-table-column prop="biz_date" width="100" align="center" label="业务日期"/>
-        <el-table-column show-overflow-tooltip :formatter="stateFormat" width="100" prop="bill_status" label="单据状态" />
+        <el-table-column show-overflow-tooltip :formatter="bill_typeFormat" align="center" width="130" prop="bill_type" label="单据类型"/>
-        <el-table-column prop="stor_name" label="仓库" width="100" />
+        <el-table-column prop="io_type" :formatter="ioFormat" label="出入库类型" width="100" align="center"/>
-        <el-table-column prop="io_type" label="出入库类型" :formatter="ioFormat" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="stor_name" label="仓库" show-overflow-tooltip width="80" align="center"/>
-        <el-table-column show-overflow-tooltip prop="bill_type" :formatter="bill_typeFormat" min-width="120" label="业务类型" />
+        <el-table-column prop="input_optname" label="业务员" align="center"/>
-        <el-table-column show-overflow-tooltip width="135" prop="biz_date" label="业务日期" />
+        <el-table-column min-width="200" prop="name" label="部门" align="center"/>
-        <el-table-column show-overflow-tooltip :formatter="create_modeFormat" prop="create_mode" label="生成方式" width="100" />
+        <el-table-column min-width="200" align="center" prop="supp_name" label="供应商"/>
-        <el-table-column label="明细数" align="center" prop="detail_count" width="100" />
+        <el-table-column label="上级物料分类编码" prop="parent_class_code" width="150" align="center"/>
-        <el-table-column label="总重量" align="center" prop="total_qty">
+        <el-table-column label="上级物料分类名称" prop="parent_class_name" width="150" align="center"/>
+        <el-table-column label="物料分类编码" prop="class_code" align="center" width="120"/>
+        <el-table-column label="物料分类名称" prop="class_name" align="center" width="120"/>
+        <el-table-column label="单据号" prop="bill_code" align="center" width="120"/>
+        <el-table-column label="物料编码" prop="material_code" align="center" min-width="150"/>
+        <el-table-column label="物料名称" prop="material_name" align="center" min-width="150"/>
+        <el-table-column label="批次" prop="pcsn" min-width="100"/>
+        <el-table-column label="主单位" prop="qty_unit_name" width="100"/>
+        <el-table-column label="入库主数量" align="center" prop="total_qty" width="100">
           <template slot-scope="scope">
-            {{ fun(scope.row.total_qty) }}
+            {{ fun(scope.row.in_qty) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="出库主数量" align="center" prop="total_qty" width="100">
+          <template slot-scope="scope">
+            {{ fun(scope.row.out_qty) }}
           </template>
         </el-table-column>
-        <el-table-column label="制单人" align="center" prop="input_optname" />
-        <el-table-column label="制单时间" align="center" prop="input_time" width="150" />
-        <el-table-column label="修改人" align="center" prop="update_optname" />
-        <el-table-column label="修改时间" align="center" prop="update_time" width="150" />
-        <el-table-column label="确认人" align="center" prop="confirm_optname" width="150" />
-        <el-table-column label="确认时间" align="center" prop="confirm_time" width="150" />
-        <el-table-column label="回传人" align="center" prop="upload_optname" width="150" />
-        <el-table-column label="回传时间" align="center" prop="upload_time" width="150" />
       </el-table>
       <!--分页组件-->
-      <pagination />
+      <pagination/>
     </div>
-    <DivDialog :dialog-show.sync="divShow" :open-array="openParam" :rowmst="mstrow" @DivChanged="querytable" />
+    <DivDialog :dialog-show.sync="divShow" :open-array="openParam" :rowmst="mstrow" @DivChanged="querytable"/>
-    <TaskDialog :dialog-show.sync="taskShow" :open-array="openParam" :rowmst="mstrow" @TaskChanged="querytable" />
+    <TaskDialog :dialog-show.sync="taskShow" :open-array="openParam" :rowmst="mstrow" @TaskChanged="querytable"/>
   </div>
 </template>
 
@@ -240,21 +234,23 @@ import crudStorattr from '@/api/wms/basedata/st/storattr'
 import crudRawAssist from '@/api/wms/st/core/inbill/rawassist'
 
 export default {
-  name: 'IoStorQuery',
+  name: 'IoStorQuery2',
   components: { crudOperation, rrOperation, pagination, TaskDialog, DivDialog },
   cruds() {
-    return CRUD({ title: '出入库单报表',
+    return CRUD({
+      title: '出入库单报表',
       props: {
         // 每页数据条数
         size: 20
-      },idField: 'iostorinv_id', url: 'api/checkoutbill', crudMethod: { ...checkoutbill },
+      }, idField: 'iostorinv_id', url: 'api/statistical/ioStorQuery',
       optShow: {
         add: false,
         edit: false,
         del: false,
         reset: true,
         download: false
-      }})
+      }
+    })
   },
   mixins: [presenter(), header(), crud()],
   // 数据字典
@@ -262,8 +258,7 @@ export default {
   data() {
     return {
       height: document.documentElement.clientHeight - 180 + 'px;',
-      permission: {
+      permission: {},
-      },
       divShow: false,
       taskShow: false,
       dis_flag: true,

mes/qd/src/views/wms/statistics/materPlan/index.vue

@@ -11,80 +11,14 @@
           label-width="80px"
           label-suffix=":"
         >
-
           <el-form-item label="到货日期">
-            <date-range-picker v-model="query.createTime" class="date-item" />
+            <date-range-picker v-model="query.createTime" class="date-item"/>
           </el-form-item>
-
+          <rrOperation/>
-          <el-form-item label="单据编号">
-            <el-input
-              v-model="query.receive_code"
-              clearable
-              size="mini"
-              placeholder="请输入单据编号"
-              style="width: 230px;"
-              class="filter-item"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-
-          <el-form-item label="物料编码">
-            <el-input
-              v-model="query.material_code"
-              clearable
-              size="mini"
-              placeholder="请输入物料编码、名称"
-              style="width: 230px;"
-              class="filter-item"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-
-          <el-form-item label="批次">
-            <label slot="label">批&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;次:</label>
-            <el-input
-              v-model="query.pcsn"
-              clearable
-              size="mini"
-              placeholder="请输入批次"
-              style="width: 230px;"
-              class="filter-item"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-
-          <el-form-item label="单据状态">
-            <el-select
-              v-model="query.bill_status"
-              clearable
-              size="mini"
-              placeholder="请选择"
-              class="filter-item"
-              style="width: 210px;"
-              @change="hand"
-            >
-              <el-option
-                v-for="item in statusList"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <rrOperation />
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="success"
-          icon="el-icon-check"
-          size="mini"
-          @click="downdtl"
-        >
-          导出Excel
-        </el-button>
       </crudOperation>
       <!--表格渲染-->
       <el-table
@@ -96,19 +30,33 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column type="index" label="序号" width="100" align="center" />
+        <el-table-column type="index" label="序号" width="100" align="center"/>
         <template v-for="(col,index) in cols">
-          <el-table-column v-if="col" :prop="col.prop" :label="col.label" width="120px" show-overflow-tooltip />
+          <el-table-column v-if="col" :prop="col.prop" :label="col.label" width="120px" show-overflow-tooltip/>
+        </template>
+      </el-table>
+
+      <el-table
+        ref="dtl_table"
+        v-loading="crud.loading"
+        :data="dtlList"
+        size="mini"
+        :max-height="590"
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column type="index" label="序号" width="100" align="center"/>
+        <template v-for="(col,index) in cols2">
+          <el-table-column v-if="col" :prop="col.prop" :label="col.label" width="120px" show-overflow-tooltip/>
         </template>
       </el-table>
       <!--分页组件-->
-      <pagination />
     </div>
   </div>
 </template>
 
 <script>
-import crudRawuatwcquery from '@/api/wms/statistics/rawuatwcquery'
+import report from '@/api/wms/statistics/report'
 import CRUD, { presenter, header, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
@@ -116,23 +64,23 @@ import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import DateRangePicker from '@/components/DateRangePicker'
 import crudInspectionsheetmst from '@/api/wms/ql/inspectionsheetmst'
-import {download} from "@/api/data";
+import { download } from '@/api/data'
-import {downloadFile} from "@/utils";
+import { downloadFile } from '@/utils'
+import Date from '@/utils/datetime'
 
+const start = new Date()
 export default {
-  name: 'RawUatCbQuery',
+  name: 'MaterPlanQuery',
   components: { pagination, crudOperation, rrOperation, udOperation, DateRangePicker },
   mixins: [presenter(), header(), crud()],
   cruds() {
     return CRUD({
-      title: '原材料碳化钨查询',
+      title: '粉料计划表',
-      url: 'api/rawUatWcQuery',
+      url: 'api/statistical/materPlanQuery',
-      idField: 'performance_id',
+      idField: '1',
-      sort: 'performance_id,desc',
+      sort: '1,desc',
-      crudMethod: { ...crudRawuatwcquery },
+      query: {
-      props: {
+        createTime: [new Date(), start.daysLater(30)]
-        // 每页数据条数
-        size: 20
       },
       optShow: {
         add: false,
@@ -146,11 +94,12 @@ export default {
   data() {
     return {
       cols: [],
+      cols2: [],
+      dtlList: [],
       statusList: [],
-      permission: {
+      permission: {},
-      },
+      rules: {}
-      rules: {
+    }
-      }}
   },
   beforeCreate() {
   },
@@ -160,19 +109,24 @@ export default {
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
-      var str = this.$route.path
+      debugger
-      // var material_type_id = str.substring(str.length - 2)
+      report.getHeader().then(res => {
-      // 截取最后一个/之后的内容
-      var index = str.lastIndexOf('\/')
-      str = str.substring(index + 1, str.length)
-      const material_type_id = str
-      crudRawuatwcquery.getHeader(material_type_id).then(res => {
         this.cols = res
       })
+      report.getHeader2().then(res => {
+        this.cols2 = res
+      })
+      if (this.crud.query.createTime) {
+        this.crud.query.begin_time = this.crud.query.createTime[0]
+        this.crud.query.end_time = this.crud.query.createTime[1]
+      }
+      const data = this.crud.query
+      report.materPlanDtlQuery(data).then(res => {
+        this.dtlList = res.content
+      })
       crudInspectionsheetmst.getStatus().then(res => {
         this.statusList = res
       })
-      this.query.material_type_id = str
       return true
     },
     hand(value) {

mes/qd/src/views/wms/statistics/productInstor/index.vue

@@ -11,41 +11,6 @@
           label-width="90px"
           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.bill_type"
-              clearable
-              filterable
-              size="mini"
-              placeholder="业务类型"
-              class="filter-item"
-              @change="crud.toQuery"
-            >
-              <el-option
-                v-for="item in billtypelist"
-                :key="item.code"
-                :label="item.name"
-                :value="item.code"
-              />
-            </el-select>
-          </el-form-item>
           <el-form-item label="单据日期">
             <el-date-picker
               v-model="query.createTime"
@@ -76,21 +41,7 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="工令">
+          <rrOperation/>
-            <el-input v-model="query.source_bill_code"  size="mini" placeholder="工令号" disabled class="input-with-select">
-              <el-button slot="append" icon="el-icon-search" @click="queryMater" />
-            </el-input>
-          </el-form-item>
-          <el-form-item label="人员">
-            <el-input
-              v-model="query.username"
-              size="mini"
-              clearable
-              placeholder="人员"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <rrOperation />
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -107,26 +58,25 @@
         :highlight-current-row="true"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column type="index" label="序号" width="50" align="center" />
+        <el-table-column type="index" label="序号" width="50" align="center"/>
-        <el-table-column prop="material_code" label="物料编码" width="150" align="center" />
+        <el-table-column prop="material_code" label="物料编码" width="150" align="center"/>
-        <el-table-column prop="material_name" label="物料名称" width="150" align="center" />
+        <el-table-column prop="old_mark" label="粉料牌号" width="150" align="center"/>
-        <el-table-column min-width="90" prop="pcsn" label="批次号" align="center" />
+        <el-table-column min-width="90" prop="pcsn" label="批次号" align="center"/>
-        <el-table-column prop="sum_plan_qty" label="计划重量(KG)" :formatter="crud.formatNum3" width="150"  align="center" />
+        <el-table-column prop="qty" label="入库重量" :formatter="crud.formatNum3" width="150" align="center"/>
-        <el-table-column prop="sum_real_qty" label="实际重量(KG)" :formatter="crud.formatNum3" width="150"  align="center" />
+        <el-table-column prop="create_time" label="入库时间" width="150" align="center"/>
-        <el-table-column prop="quality_scode" label="品质类型" align="center" width="110px" :formatter="quality_scodeFormat" />
+        <el-table-column prop="create_name" label="操作工" align="center" width="110px"/>
-        <el-table-column prop="ivt_level" label="库存等级" align="center" width="100px" :formatter="ivt_levelFormat" />
+        <el-table-column prop="planend_time" label="计划完工时间" align="center" width="150px"/>
-        <el-table-column prop="is_active" label="是否可用" align="center" width="110px" :formatter="is_activeFormat" />
+        <el-table-column prop="realend_time" label="实际完工时间" align="center" width="150px"/>
-        <el-table-column min-width="120" prop="qty_unit_name" label="单位" align="center" />
+        <el-table-column prop="off_days" label="提前天数" align="center"/>
       </el-table>
       <!--分页组件-->
-      <pagination />
+      <pagination/>
     </div>
-    <StructIvt :dialog-show.sync="structshow" @StructIvtClosed="queryTableDtl" />
+    <StructIvt :dialog-show.sync="structshow" @StructIvtClosed="queryTableDtl"/>
   </div>
 </template>
 
 <script>
-import checkoutbill from '@/api/wms/st/core/outbill/checkoutbill'
 import CRUD, { crud, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
@@ -136,22 +86,28 @@ import Date from '@/utils/datetime'
 import StructIvt from '@/views/wms/statistics/outStorQuery/StructIvt'
 import crudRawAssist from '@/api/wms/st/core/inbill/rawassist'
 
+const start = new Date()
 export default {
-  name: 'outStorQuery',
+  name: 'ProductInstor',
   components: { StructIvt, crudOperation, rrOperation, pagination },
   cruds() {
-    return CRUD({ title: '生产配粉领料',
+    return CRUD({
+      title: 'PG粉当月入库查询',
       props: {
         // 每页数据条数
         size: 20
-      },idField: 'iostorinv_id', url: 'api/checkoutbill/queryDtl', crudMethod: { ...checkoutbill },
+      }, idField: 'material_id', url: 'api/statistical/productInstor',
       optShow: {
         add: false,
         edit: false,
         del: false,
         reset: true,
         download: false
-      }})
+      },
+      query: {
+        createTime: [start.monthBegin(), new Date()]
+      }
+    })
   },
   mixins: [presenter(), header(), crud()],
   // 数据字典
@@ -159,8 +115,7 @@ export default {
   data() {
     return {
       height: document.documentElement.clientHeight - 180 + 'px;',
-      permission: {
+      permission: {},
-      },
       structshow: false,
       currentRow: null,
       storlist: [],
@@ -180,8 +135,6 @@ export default {
     crudRawAssist.getType({ 'io_code': '0103', 'io_flag': '01' }).then(res => {
       this.billtypelist = res
     })
-    this.crud.query.createTime = [new Date(), new Date()]
-    this.crud.toQuery()
   },
   methods: {
     onInput() {
@@ -190,25 +143,16 @@ export default {
     async queryMater() {
       this.structshow = true
     },
-    quality_scodeFormat(row, column) {
-      return this.dict.label.ST_QUALITY_SCODE[row.quality_scode]
-    },
-    ivt_levelFormat(row, column) {
-      return this.dict.label.ST_IVT_LEVEL[row.ivt_level]
-    },
-    is_activeFormat(row, column) {
-      return this.dict.label.is_usable[row.is_active]
-    },
     queryTableDtl(rows) {
       let devices = ''
       for (let i = 0; i < rows.length; i++) {
-        if ( i === 0 ) {
+        if (i === 0) {
           devices = rows[i].workorder_code
-        }else{
+        } else {
           devices = devices + ',' + rows[i].workorder_code
         }
       }
-      if(rows.length > 0){
+      if (rows.length > 0) {
         this.crud.query.source_bill_code = devices
         this.crud.toQuery()
       }