盘点列表修改

src/api/pages/app/mould-check-item.js

@@ -0,0 +1,10 @@
+/**
+ * @desc   : 盘点模具服务
+ * @author : 于继渤
+ * @date   : 2022年12月13日14:59:59
+ */
+export default {
+  mouldCheckItemService: {
+    prefix:'/mdm-server/app/mst/mould_check_item/',
+  }
+}

src/api/pages/app/mould-check.js

@@ -0,0 +1,10 @@
+/**
+ * @desc   : 盘点模具服务
+ * @author : 于继渤
+ * @date   : 2022年12月13日14:59:59
+ */
+export default {
+  mouldCheckService: {
+    prefix:'/mdm-server/app/mst/mould_check/',
+  }
+}

src/components-app/base/dk-app-table/dk-app-table.vue

@@ -110,7 +110,7 @@
 
     </div>
 
-
+    <van-empty v-if="tableRowData.length <=0" :description="description" />
   </div>
 </template>
 
@@ -119,11 +119,14 @@
 import index1 from '@/assets/images/index1.png'
 import index2 from '@/assets/images/index2.png'
 import index3 from '@/assets/images/index3.png'
-
+import {appOthers} from "@/locale/lang/zh-CN";
 export default {
   name: "dk-app-table",
   props: {
-
+    description:{
+      type:String,
+      default:appOthers.appNoData //暂无数据
+    },
     checkboxFlag: {  //复选框标识 true 为显示
       type: Boolean,
       default: false

src/locale/lang/zh-CN.js

@@ -687,6 +687,7 @@ export const appColumns ={
   AppOpRemarks:'操作备注',
   appOpCreateUserName:'创建者',
   appOpCreateTime:'创建时间',
+  appMakeTime:'制单时间',
   appCheckName:'盘点单名',
   appCheckCode:'盘点单号',
 
@@ -726,5 +727,6 @@ export const appOthers ={
   appCounted:'已盘点',
   appInventorySurplus:'盘盈',
   appInventoryLossReporting:'盘亏报损',
+  appNoData:'暂无数据',
 }
 

src/view-app/mold-management/mold-inventory/detail.vue

@@ -60,9 +60,11 @@
 <script>
 
 import {appColumns} from "@/locale/lang/zh-CN";
+import {appIndexMixin} from '@/mixins/appindex.js'
 
 export default {
   name: "mold-inventory-detail",
+  mixins: [appIndexMixin],
   data() {
     return {
       active: 0,
@@ -139,7 +141,40 @@ export default {
     }
   },
   methods: {
-
+  //
+    /**
+     *   @desc   : 设置查询参数
+     *   @date   : 2023/02/01
+     *   @author : 于继渤
+     */
+    setSearchParams() {
+      let params = this.searchList
+      if (params === undefined) {
+        params = {}
+      }
+      params.checkId = this.item.checkId
+      return params
+    },
+    /**
+     *   @desc   : 获取数据
+     *   @date   :  2023/02/01
+     *   @author : 于继渤
+     */
+    getData() {
+      // 参数设置
+      let params = this.setSearchParams()
+      // 查询职位接口
+      this.excute(this.$service.mouldCheckItemService, this.$service.mouldCheckItemService.selectByCond, params).then(res => {
+        console.log('获取数据', res)
+        //TODO
+        if (res.code === this.$config.SUCCESS_CODE) {
+          if(res.data.list && res.data.list.length > 0){
+            this.tableRowData = res.data.list
+          }
+
+        }
+      })
+    },
     onClickCheckbox() {
 
     },
@@ -166,8 +201,20 @@ export default {
         this.active = 3
       }
       this.activeTitle = title
+      this.getData()
     },
 
+
+
+  },
+  /**
+   * 页面初始化
+   * @param date
+   */
+  created(e) {
+    if (this.$route.params.item) {
+        this.item = this.$route.params.item
+    }
   }
 }
 </script>

src/view-app/mold-management/mold-inventory/index.vue

@@ -4,8 +4,8 @@
     <dk-app-nav-bar :title="$t('appMoldInventory')"
                     @click-left="onClickLeft" @click-right="onClickRight"></dk-app-nav-bar>
     <!--    搜索-->
-    <dk-app-search :placeholder="$t('appMoldInventorySearchText')"></dk-app-search>
-
+    <dk-app-search :placeholder="$t('appMoldInventorySearchText')" :model="searchText" @search="onSearch"></dk-app-search>
+<dk-app-loading :loading="loading"></dk-app-loading>
     <van-dropdown-menu active-color="#1B365D">
       <!-- 日期 -->
       <van-dropdown-item id="create-time-type" :title="createTimeType.text">
@@ -18,32 +18,35 @@
     </van-dropdown-menu>
 
     <!--    主体-->
-    <div style="margin: 10px 10px 10px;border-radius: 7px;box-shadow:2px 2px 5px #e5e5e6;">
-      <div style="background: #FFFFFF;box-shadow: 0px 5px 10px rgba(225, 229, 238, 0.6);border-radius: 7px;">
-        <!--        盘点情况显示        -->
-        <div style=" padding: 10px 16px 10px 16px;color: #1B365D;font-size: 14px;">{{ $t('appInventoryDisplay') }}</div>
-        <dk-app-field :focus="true" :readonly="true" label="已盘点数" typeInput="number" :value="0"/>
-        <dk-app-field :focus="true" :readonly="true" label="盘盈数量" typeInput="number" :value="0"></dk-app-field>
-        <dk-app-field :focus="true" :readonly="true" label="合计数量" typeInput="number" :value="0"></dk-app-field>
-        <div style="height: 10px;"></div>
-      </div>
-    </div>
-
-    <div style="margin: 20px 10px 10px;border-radius: 7px;box-shadow:2px 2px 5px #e5e5e6;">
-      <div style="background: #FFFFFF;box-shadow: 0px 5px 10px rgba(225, 229, 238, 0.6);border-radius: 7px;">
-        <!--查询结果-->
-        <div style=" padding: 10px 16px 10px 16px;color: #1B365D;font-size: 14px;">{{ $t('appQueryResults') }}</div>
-        <dk-app-table
-          :rows="rows"
-          :boxShadowFlag="false"
-          :tableRowData="tableRowData"
-          @onClickCheckbox="onClickCheckbox"
-          @onOpenDetail="onOpenDetail"
-        >
-        </dk-app-table>
-        <div style="height: 10px;"></div>
-      </div>
-    </div>
+<!--    <div style="margin: 10px 10px 10px;border-radius: 7px;box-shadow:2px 2px 5px #e5e5e6;">-->
+      <!--      <div style="background: #FFFFFF;box-shadow: 0px 5px 10px rgba(225, 229, 238, 0.6);border-radius: 7px;">-->
+      <!--        &lt;!&ndash;        盘点情况显示        &ndash;&gt;-->
+      <!--        <div style=" padding: 10px 16px 10px 16px;color: #1B365D;font-size: 14px;">{{ $t('appInventoryDisplay') }}</div>-->
+      <!--        <dk-app-field :focus="true" :readonly="true" label="已盘点数" typeInput="number" :value="0"/>-->
+      <!--        <dk-app-field :focus="true" :readonly="true" label="盘盈数量" typeInput="number" :value="0"></dk-app-field>-->
+      <!--        <dk-app-field :focus="true" :readonly="true" label="合计数量" typeInput="number" :value="0"></dk-app-field>-->
+      <!--        <div style="height: 10px;"></div>-->
+      <!--      </div>-->
+      <!--    </div>-->
+    <dk-app-table
+      :rows="rows"
+      :boxShadowFlag="false"
+      :tableRowData="tableRowData"
+      @onClickCheckbox="onClickCheckbox"
+      @onOpenDetail="onOpenDetail"
+    >
+    </dk-app-table>
+
+
+<!--    <van-empty v-if="tableRowData.length <=0" :description="$t('appNoData')" />-->
+<!--    <div style="margin: 20px 10px 10px;border-radius: 7px;box-shadow:2px 2px 5px #e5e5e6;">-->
+<!--      <div style="background: #FFFFFF;box-shadow: 0px 5px 10px rgba(225, 229, 238, 0.6);border-radius: 7px;">-->
+<!--        &lt;!&ndash;查询结果&ndash;&gt;-->
+<!--        <div style=" padding: 10px 16px 10px 16px;color: #1B365D;font-size: 14px;">{{ $t('appQueryResults') }}</div>-->
+<!--      -->
+<!--        <div style="height: 10px;"></div>-->
+<!--      </div>-->
+<!--    </div>-->
 
 
   </div>
@@ -58,6 +61,8 @@ export default {
   mixins: [appIndexMixin],
   data() {
     return {
+      loading:false,
+      searchText:'',
       createTimeSearch: [new Date().getTime() + 100, new Date().getTime() + 100],
       switchList: [
         {text: '状态1', value: null, checked: false},
@@ -74,21 +79,11 @@ export default {
       rows: [
         {name: 'checkCode', title: this.$t('appCheckCode')}, //
         {name: 'checkName', title: this.$t('appCheckName')}, //
-        {name: 'opCreateTime', title: this.$t('appOpCreateTime')}, //
+        {name: 'makeTime', title: this.$t('appMakeTime')}, //
         {name: 'opCreateUserName', title: this.$t('appOpCreateUserName')}, //
         {name: 'remarks', title: this.$t('appRemarks'), fieldFlag: false},
       ],
       tableRowData: [
-        {
-          checkCode: 'MIC20230201093504',
-          checkName: '2023年2月盘点',
-          opCreateTime: '2023-02-01 16:29',
-          opCreateUserName: '夏常明',
-          remarks: '产品类别: 洁具\n' +
-            '产品编码: H01182L, H01182M, H0119L\n' +
-            '模具状态: 在库',
-          checked: false
-        },
 
       ]
     }
@@ -105,8 +100,9 @@ export default {
       if (params === undefined) {
         params = {}
       }
-      params.opCreateTimeStart = this.format(this.createTimeSearch[0]) ? this.format(this.createTimeSearch[0]) + ' 00:00:00' : ''// 开始时间
-      params.opCreateTimeEnd = this.format(this.createTimeSearch[1]) ? this.format(this.createTimeSearch[1]) + ' 23:59:59' : '' //结束时间
+      params.makeTimeStart = this.format(this.createTimeSearch[0]) ? this.format(this.createTimeSearch[0]) + ' 00:00:00' : ''// 开始时间
+      params.makeTimeEnd = this.format(this.createTimeSearch[1]) ? this.format(this.createTimeSearch[1]) + ' 23:59:59' : '' //结束时间
+      params.searchText = this.searchText
       params.ftyId = 1
       return params
     },
@@ -118,16 +114,35 @@ export default {
     getData() {
       // 参数设置
       let params = this.setSearchParams()
+      this.loading = true
       // 查询职位接口
-      this.excute(this.$service.moldingService, this.$service.moldingService.selectMoldingByMouldList, params).then(res => {
+      this.excute(this.$service.mouldCheckService, this.$service.mouldCheckService.selectByCond, params).then(res => {
         console.log('获取数据', res)
-        //TODO
+        this.loading = false
         if (res.code === this.$config.SUCCESS_CODE) {
+          if(res.data.list && res.data.list.length > 0){
+            res.data.list.forEach(item=>{
+              item.checked = false
+            })
+            this.tableRowData = res.data.list
+          }
 
         }
       })
     },
 
+
+    /**
+     * @desc : 搜索事件
+     * @author : 于继渤
+     * @date : 2022/5/24 12:16
+     */
+    onSearch(e){
+      this.searchText = e
+      this.tableRowData = []
+      this.getData()
+    },
+
     /**
      * @desc : 日期组件后的回调
      * @author : 于继渤
@@ -191,13 +206,7 @@ export default {
     onClose() {
       this.showPopup = false
     },
-    /**
-     * 查询按钮事件
-     * @param date
-     */
-    onSearch() {
-      this.$router.push({name: 'mold-inventory-search'})
-    },
+
 
   }
 }