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

mes/qd/src/views/wms/sb/run/devicerunrecord/index.vue

@@ -12,7 +12,7 @@
           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" value-format="yyyy-MM-dd" />
           </el-form-item>
           <el-form-item label="设备类别">
             <treeselect

mes/qd/src/views/wms/sb/run/devicescrap/index.vue

@@ -12,7 +12,7 @@
           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" value-format="yyyy-MM-dd"/>
           </el-form-item>
           <el-form-item label="设备类别">
             <treeselect
@@ -114,6 +114,17 @@
         >
           报废
         </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+          :disabled="crud.selections.length !== 1"
+          @click="downloadWord"
+        >
+          下载Word
+        </el-button>
       </crudOperation>
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
@@ -161,6 +172,8 @@ import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
 import DateRangePicker from '@/components/DateRangePicker'
+import {download} from "@/api/data";
+import {downloadFile} from "@/utils";
 
 const defaultForm = { status: null }
 export default {
@@ -253,9 +266,9 @@ export default {
     scrap() {
       const _selectData = this.$refs.table.selection
       const data = _selectData[0]
-      if (data.is_active !== '1') {
-        return this.crud.notify('设备未启用或不存在', CRUD.NOTIFICATION_TYPE.INFO)
-      }
+      // if (data.status !== '10') {
+      //   return this.crud.notify('设备未启用或不存在', CRUD.NOTIFICATION_TYPE.INFO)
+      // }
       if (data.device_is_delete === '1') {
         return this.crud.notify('设备不存在或被删除', CRUD.NOTIFICATION_TYPE.INFO)
       }
@@ -267,6 +280,15 @@ export default {
       } else {
         return this.crud.notify('设备状态不为正常或者闲置', CRUD.NOTIFICATION_TYPE.INFO)
       }
+    },
+    downloadWord() {
+      const _selectData = this.$refs.table.selection
+      const data = _selectData[0]
+      download('/api/devicescrap/downloadWord', { 'devicerecord_id': data.devicerecord_id }).then(result => {
+        const name = data.device_name + '报废档案'
+        this.crud.toQuery()
+        downloadFile(result, name, 'docx')
+      })
     }
   }
 }

mes/qd/src/views/wms/sb/stat/deviceivtquery/index.vue

@@ -55,8 +55,9 @@
         <el-table-column type="selection" width="55" />
         <el-table-column prop="sect_code" label="库区编码" />
         <el-table-column prop="sect_name" label="库区名称" />
-        <el-table-column prop="material_code" label="物料编码" />
-        <el-table-column prop="material_name" label="名称" />
+        <el-table-column prop="material_code" label="物料编码" show-overflow-tooltip/>
+        <el-table-column prop="material_name" label="名称" show-overflow-tooltip/>
+        <el-table-column prop="sparepart_only_id" label="备件唯一码" show-overflow-tooltip/>
         <el-table-column prop="material_model" label="型号" />
         <el-table-column prop="material_spec" label="技术规格" />
         <el-table-column prop="pcsn" label="批次" />

mes/qd/src/views/wms/sb/stat/devicesafetyqtyquery/index.vue

@@ -28,23 +28,10 @@
               placeholder="编码、名称"
             />
           </el-form-item>
+          <el-form-item label="仅显示预警" label-width="120px">
+            <el-switch v-model="query.is_all" active-value="1" inactive-value="0" @change="crud.toQuery()"/>
+          </el-form-item>
 
-<!--          <el-form-item label="库存类型">
-            <el-select
-              v-model="query.type"
-              clearable
-              size="mini"
-              placeholder="请选择"
-              class="filter-item"
-              @change="hand"
-            >
-              <el-option
-                v-for="item in deviceTypeList"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>-->
           <rrOperation />
         </el-form>
 
@@ -68,9 +55,9 @@
         <el-table-column prop="material_code" label="物料编码" />
         <el-table-column prop="material_name" label="物料名称" />
         <el-table-column prop="class_name" label="物料分类" />
-        <el-table-column prop="safe_ivt_up" label="安全库存上限" />
-        <el-table-column prop="safe_ivt_down" label="安全库存下限" />
-        <el-table-column prop="ivt_qty" label="库存" />
+        <el-table-column prop="safe_ivt_up" label="安全库存上限" :formatter="crud.formatNum2" />
+        <el-table-column prop="safe_ivt_down" label="安全库存下限" :formatter="crud.formatNum2" />
+        <el-table-column prop="ivt_qty" label="库存" :formatter="crud.formatNum2" />
         <el-table-column prop="qty_unit_name" label="单位" />
       </el-table>
       <!--分页组件-->
@@ -186,16 +173,6 @@ export default {
         })
       }
     },
-    formatUp(row, cloum) {
-      if (row.safe_ivt_up === '') {
-        return '999999'
-      }
-    },
-    formatDown(row, cloum) {
-      if (row.safe_ivt_down === '') {
-        return '0'
-      }
-    },
     cellStyle({ row, column, rowIndex, columnIndex }) {
       const safe_ivt_down = parseInt(row.safe_ivt_down)
       const safe_ivt_up = parseInt(row.safe_ivt_up)