初始

.env.development

 # 页面标题
-VUE_APP_TITLE = 格物软件
+VUE_APP_TITLE = Loading
 
 # 开发环境配置
 ENV = 'http://demo.ruoyi.vip/'

.env.production

 # 页面标题
-VUE_APP_TITLE = 格物软件
+VUE_APP_TITLE = Loading
 
 # 生产环境配置
 ENV = 'production'

src/router/index.js

@@ -562,6 +562,19 @@ export const powerRoutes = [
             },
             name: 'kccjd',
             path: "kccjd",
+          },
+          {
+            component: 'ccgl/zlgl/kcyhd/index',
+            hidden: false,
+            meta: {
+              "title": "库存验货单",
+              "icon": "",
+              "noCache": false,
+              "link": null,
+              "mkid": 'test',
+            },
+            name: 'kcyhd',
+            path: "kcyhd",
           }
         ]
       }

src/views/ccgl/zlgl/kcyhd/dialog.vue

+<template>
+  <DefaultDialog :app='app'>
+    <div slot="form" style="display: flex;height: 70vh;">
+    <BasePage :power='power' @getRow='getRow' class="min_full" style="height: 100%;" :config="config">
+    </BasePage>
+    </div>
+    <div slot="reFooter" class="refooter" >
+      <span slot="footer" class="dialog-footer" >
+        <el-button  @click="app.showDialog=false">取 消</el-button>
+        <el-button  type="primary" @click="save()">保 存</el-button>
+      </span>
+     </div>
+  </DefaultDialog>
+</template>
+<script>
+
+   
+  export default {
+
+    props: {
+      app: {
+        type: Object,
+        default: ()=>{
+			return {}
+		}
+      }
+    },
+    async mounted() {
+		
+      
+    },
+    data() {
+      return {
+		  
+
+      }
+    },
+    methods: {
+	 
+    }
+  }
+</script>
+
+<style scoped>
+</style>

src/views/ccgl/zlgl/kcyhd/edit.vue

+<template>
+  <RelDialog width="50%" :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'>
+    <el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules">
+      <el-row :gutter="20" :app="this">
+        <EditColItem  :required="item.required||false" :readonly="item.readonly?true:false "  v-for="(item,index) in editColItemList " :value="item.value" :span="item.span" :label="item.label" :prop='item.prop' :key="item.prop" :type="item.type" :typeConfig='item.typeConfig' :rule="item.rule"  />
+      </el-row>
+    </el-form>
+  </RelDialog>
+</template>
+<script>
+
+  import {
+    editMixin
+  } from 'common'
+  export default {
+    mixins: [editMixin],
+    data() {
+      return {
+        editColItemList: [
+
+          {
+            label: '编码',
+            prop: 'code',
+            span: 12,
+            type: 'input',
+            required:true,
+          },
+          {
+            label: '名称',
+            prop: 'name',
+            span: 12,
+            type: 'input',
+            required:true,
+          },
+          {
+            label: '备注',
+            prop: 'bz',
+            span: 24,
+            type: 'input'
+          },
+
+        ]
+      }
+    }
+  }
+</script>

src/views/ccgl/zlgl/kcyhd/index.vue

+<template>
+  <div class="outer">
+    <div class=" higher flex-column">
+      <!-- 分层-->
+      <div class="top">
+        <Top @getRow='topGetRow' ref="top"></Top>
+      </div>
+      <div class="bottom flex">
+        <div class="full"  >
+            <el-tabs class="full" v-model="activeName" >
+              <el-tab-pane  class="full" label="重检单明细" name="first">
+                <Mx    ref="mx" class="full"  />
+              </el-tab-pane>
+         
+            </el-tabs>
+
+        </div>
+      </div>
+
+    </div>
+  </div>
+</template>
+
+<script>
+  import Top from './top/index.vue'
+  import Mx from './mx.vue'
+  export default {
+    components: {
+      Top,
+      Mx,
+     
+    },
+    data(){
+      return{
+        activeName:'first'
+      }
+    },
+    methods: {
+      topGetRow(row) {
+        /* dom赋值*/
+        let mid = row.id
+        this.$refs.mx.$refs.basePage.queryParams.mid = mid
+        this.$refs.mx.$refs.basePage.$refs['TablePager'].pageQuery({
+          setFirstCurrent: true
+        })
+
+      },
+
+    }
+
+  }
+</script>
+
+<style lang="scss" scoped>
+  .outer {
+    overflow: auto;
+    height: calc(100vh - 84px);
+    width: 100%;
+
+    .top {
+      width: 100%;
+      height: 45%;
+    }
+
+    .bottom {
+      width: 100%;
+      height: 55%;
+
+      .left {
+        width: 50%;
+        height: 100%;
+      }
+
+      .right {
+        width: 50%;
+        height: 100%;
+      }
+    }
+  }
+
+  .higher {
+    height: 140vh;
+  }
+
+  .flex-column {
+    display: flex;
+    flex-direction: column;
+  }
+  ::v-deep .el-tabs__content{
+     height: calc(100% - 40px);
+   }
+   ::v-deep .el-tabs__nav-scroll{
+     padding-left: 10px;
+   }
+</style>

src/views/ccgl/zlgl/kcyhd/mx.vue

+<template>
+  <BasePage @getRow='getRow' ref="basePage" :power='power' :toolButton='false' class="min_full"
+    style="height: 100%;border-top: 0px;" :autoQuery='false' :config="config">
+    <template #dialog="ctx">
+      <!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 -->
+    </template>
+    <template #toolbar="ctx">
+
+    </template>
+
+  </BasePage>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        power: {
+          add: false,
+          copy: false,
+          /* 手动控制删除 */
+          delButton: false,
+          /* 手动控制编辑按钮权限 */
+          editButton: false,
+          /* 是否渲染右侧操作按钮 */
+          operateButtons: false,
+          /* 是否开启工作流按钮 */
+          workFlow: false,
+          /* 表格开启选择，以及记住选择 */
+          showSelection: false,
+          saveSelected: false
+        },
+        config: {
+          /* 基本配置*/
+          url: 'lxyl/zlgl/kccj',
+          queryUrl: 'lxyl/zlgl/kccj/query/detail',
+          tableTitle: [{
+              title: "物料编码",
+              field: "wlxxCode",
+              width: 140
+            },
+            {
+              title: "物料名称",
+              field: "wlxxName",
+              width: 140
+            },
+            {
+              title: "物料规格",
+              field: "wlxxGg",
+              width: 140
+            },
+            {
+              title: "制令号",
+              field: "zlh",
+              width: 140
+            },
+            {
+              title: "物料批号",
+              field: "wlph",
+              width: 140
+            },
+            {
+              title: "货主",
+              field: "hzName",
+              width: 140
+            },
+            {
+              title: "唯一码",
+              field: "packCode",
+              width: 140
+            },
+            {
+              title: "数量",
+              field: "sl",
+              width: 140
+            },
+            {
+              title: "容器",
+              field: "rqCode",
+              width: 140
+            },
+            {
+              title: "重检日期",
+              field: "cjrq",
+              width: 140,
+              fieldType: 'ftDateTime'
+            },
+            {
+              title: "生产日期",
+              field: "scrq",
+              width: 140,
+              fieldType: 'ftDateTime'
+            },
+            {
+              title: "失效日期",
+              field: "sxrq",
+              width: 140,
+              fieldType: 'ftDateTime'
+            },
+            {
+              title: "合格标志",
+              field: "hgbz",
+              formatter(a, b, v) {
+                let map = {
+                  N: '不合格',
+                  Y: '合格'
+                }
+                return map[v]
+              },
+              width: 140
+            },
+
+          ],
+          queryParams: [],
+
+        }
+      }
+
+    },
+    methods: {
+      getRow(val) {
+        this.$emit('getRow', val)
+      },
+
+
+    },
+    components: {
+
+    }
+
+  }
+</script>
+
+<style>
+</style>

src/views/ccgl/zlgl/kcyhd/top/add.vue

+<template>
+  <DefaultDialog :app='app'>
+    <div slot="form" style="display: flex;height: 70vh;">
+    <BasePage ref="basePage" :toolButton='false' :power='power' class="min_full" style="height: 100%;" :config="config" />
+    </div>
+    <div slot="reFooter" class="refooter">
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="app.showDialog=false">取 消</el-button>
+        <el-button type="primary" @click="save()">保 存</el-button>
+      </span>
+    </div>
+  </DefaultDialog>
+</template>
+<script>
+  export default {
+
+    props: {
+      app: {
+        type: Object,
+        default: () => {
+          return {}
+        }
+      }
+    },
+    async mounted() {
+
+
+    },
+    data() {
+      return {
+        power: {
+          add: false,
+          copy: false,
+          /* 手动控制删除 */
+          delButton: true,
+          /* 手动控制编辑按钮权限 */
+          editButton: false,
+          /* 是否渲染右侧操作按钮 */
+          operateButtons: false,
+          /* 是否开启工作流按钮 */
+          workFlow: false,
+          /* 表格开启选择，以及记住选择 */
+          showSelection: true,
+          saveSelected: true
+
+        },
+        config: {
+          /* Dialog*/
+          // queryDetail: true,
+          /* 基本配置*/
+          url: 'lxyl/zlgl/ukcjyd',
+          queryUrl:'wms/common/queryZkPackOrRq',
+          tableTitle: [{
+              title: "物料编码",
+              field: "wlxxCode",
+              width: 140
+            },
+            {
+              title: "物料名称",
+              field: "wlxxName",
+              width: 140
+            },
+            {
+              title: "物料规格",
+              field: "wlxxGg",
+              width: 140
+            },
+            {
+              title: "制令号",
+              field: "zlh",
+              width: 140
+            },
+            {
+              title: "物料批号",
+              field: "wlph",
+              width: 140
+            },
+            {
+              title: "货主",
+              field: "hzName",
+              width: 140
+            },
+            {
+              title: "唯一码",
+              field: "packCode",
+              width: 140
+            },
+            {
+              title: "数量",
+              field: "sl",
+              width: 140
+            },
+            {
+              title: "维护人",
+              field: "whr"
+            },
+            {
+              title: "维护时间",
+              field: "whsj",
+              fieldType: 'ftDateTime'
+            }
+          ],
+          queryParams: [
+            [{
+                label: '物料信息',
+                prop: 'wlxxInfo',
+                span: 6,
+                type: 'input',
+                value: ''
+              },
+              {
+                label: '物料批号',
+                prop: 'wlphInfo',
+                span: 6,
+                type: 'input',
+                value: ''
+              }
+            ]
+
+          ],
+          /* 默认启停用  */
+
+        }
+
+      }
+    },
+    methods: {
+    save(){
+      let list =this.$refs.basePage.$refs.TablePager.selectedList||[]
+      if(list.length!=0){
+        this.$post('lxyl/zlgl/kccj/doGenerate',list).then(res=>{
+          if(res.success){
+            this.app.showDialog=false
+            this.app.refresh()
+          }
+        })
+
+      }else{
+        this.$warning('请至少勾选一条数据')
+      }
+    }
+    }
+  }
+</script>
+
+<style scoped>
+</style>

src/views/ccgl/zlgl/kcyhd/top/edit.vue

+<template>
+  <RelDialog bigTitle detailTable='LLCKMX' @getFormDetail='getFormDetail' width="70%" :type='type' :editApp='editApp'
+    :app='app' :buttonApp='buttonApp'>
+    <el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules">
+      <el-row :gutter="20" :app="this" class="editRow">
+        <EditColItem :required="item.required||false" :readonly="item.readonly?true:false "
+          v-for="(item,index) in editColItemList " :value="item.value" :span="item.span" :label="item.label"
+          :prop='item.prop' :key="item.prop" :type="item.type" :typeConfig='item.typeConfig' :rule="item.rule" />
+        <!-- 额外数据 -->
+      </el-row>
+
+      <div class="editTab">
+        <editTableForEdit :indexApp='app' :type='type' rename='选择库位明细' @save='save' ref="editTableForEdit"
+          :editTableTitle='editTableTitle' v-if="editTableForEdit" :computedRow='computedRow'
+          :editTableData="formDetail">
+          <!-- 	<template v-if="type!='view'" #toolbar="ctx">
+						<AuxButton  :queryParams="{
+							ckid:form.ckid
+						}"   rename='选择库存' code='WLKC'  @save="savekc"  />
+					</template> -->
+        </editTableForEdit>
+      </div>
+      <el-row class="bottomInfo" :gutter="20">
+        <el-col class="center" :span="12">
+          创建人:{{
+						form.cjr||localUser
+					}}
+        </el-col>
+        <el-col class="center" :span="12">
+          创建时间:{{
+						$moment(form.cjsj).format('YYYY-MM-DD HH:mm:ss')||$moment().format('YYYY-MM-DD HH:mm:ss')
+					  }}
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <!-- editTab数据 -->
+  </RelDialog>
+</template>
+<script>
+  import {
+    toFixed,
+    digit,
+    doRkdChange
+  } from 'common/src/utils/blur.js'
+  import {
+    editMixin,
+    editMixin_expand
+  } from 'common'
+
+  export default {
+    mixins: [editMixin, editMixin_expand],
+    methods: {
+      /* 需要整体row时的回调 */
+      computedRow(row) {
+        // this.$refs.editTableForEdit.$forceUpdate()
+      },
+      /* 选择list时的回调 */
+      save(list) {
+        list.forEach(async item => {
+          let res = await this.$post('kc/common/query/kcsl', {
+            ckid: this.form.ckid,
+            wlid: item.id
+          })
+          item.kcsl = res.data.records.kcsl || 0
+          // 转换并且push
+          item.wlid = item.id
+          item.wlxxName = item.name
+          item.wlxxCode = item.code
+          item.wlxxGg = item.gg
+          delete item.id
+          this.formDetail.push(_.cloneDeep(item))
+
+        })
+      },
+      /* 选择库存回调 */
+      savekc(list) {
+        list.forEach(item => {
+          // 转换并且push
+          delete item.id
+          this.formDetail.push(_.cloneDeep(item))
+
+        })
+      }
+    },
+    mounted() {
+      this.form.llrName = this.username
+      this.form.llrid = this.userid
+    },
+    data() {
+      return {
+        /* 常规edit数据 */
+        editColItemList: [{
+            label: '出库单号',
+            prop: 'djid',
+            span: 8,
+            type: 'input',
+            // "required": true,
+          },
+          {
+            label: '出库日期',
+            prop: 'llrq',
+            span: 8,
+            type: 'date',
+            value: new Date().getTime(),
+            "required": true,
+          },
+          {
+            "label": "仓库",
+            "prop": "ckid",
+            "span": 8,
+            "type": "RelSelect",
+            "value": "",
+            "required": true,
+            "typeConfig": {
+              "src": "jcsj/common/ck/queryCkid",
+              "match": {
+                "value": "id",
+                "label": "name"
+              },
+              change: (row) => {
+                this.form.bgy = row.bgy
+              }
+            }
+          },
+          {
+            label: '需求日期',
+            prop: 'xqrq',
+            span: 8,
+            type: 'date',
+            value: new Date().getTime(),
+            "required": true,
+          },
+          {
+            "label": "事务类型",
+            "prop": "swlxid",
+            "span": 8,
+            "type": "RelSelect",
+            "value": "",
+            "required": true,
+            "typeConfig": {
+              "src": "wms/ckgl/llck/init/swlx",
+              "match": {
+                "value": "id",
+                "label": "name"
+              }
+            }
+          },
+          {
+            "label": "领料部门",
+            "prop": "bmid",
+            "span": 8,
+            "type": "RelSelect",
+            "value": "",
+            "required": true,
+            "typeConfig": {
+              "src": "jcsj/common/bm/query",
+              "match": {
+                "value": "id",
+                "label": "bmmc"
+              }
+            }
+          },
+          {
+            label: '货主',
+            prop: 'hzid',
+            span: 8,
+            required: true,
+            type: 'AuxInput',
+            typeConfig: {
+              isRequest: true,
+              code: 'HZID',
+              label: 'hzName',
+              transform: {
+                value: 'id',
+                label: 'name'
+              }
+            }
+          },
+          {
+            label: '备注',
+            prop: 'bz',
+            span: 16,
+            type: 'input',
+          },
+        ],
+        /* 从表编辑数据 */
+        editTableTitle: [{
+            title: "序号",
+            field: "xh",
+            width: 50,
+            align: "center"
+          },
+          {
+            title: "物料编号",
+            field: "wlxxCode",
+            width: 240,
+          },
+          {
+            title: "物料名称",
+            field: "wlxxName",
+            width: 160
+          },
+          {
+            title: "规格",
+            field: "wlxxGg",
+            width: 140
+          },
+          {
+            title: "应出数量",
+            field: "yfsl",
+            allowEdit: true,
+            type: 'inputNumber',
+            width: 200,
+            blur: toFixed(null),
+          },
+          {
+            title: "库存数量",
+            field: "kcsl",
+            width: 200,
+            blur: toFixed(null),
+          },
+          {
+            title: "计量单位",
+            field: "jldwname",
+            width: 100,
+            allowEdit: false
+          },
+          {
+            title: "物料批号",
+            field: "wlph",
+            type: 'inputText',
+            width: 200,
+            // show: JSON.parse(localStorage.getItem('isPhgl'))
+          },
+          {
+            title: "制令号",
+            field: "zlh",
+            type: 'inputText',
+            width: 200,
+            // show: JSON.parse(localStorage.getItem('isPhgl'))
+          },
+          {
+            show: JSON.parse(localStorage.getItem('isKwgl')),
+            title: "库位",
+            field: "kwid",
+            width: 240,
+            type: 'AuxInput',
+            typeConfig: {
+              isRequest: false,
+              "code": "KWWH",
+              "label": "kwName",
+              queryParams: (row) => {
+                return {
+                  ckid: this.form.ckid
+                }
+              },
+              "transform": {
+                "value": "id",
+                "label": "name"
+              }
+
+            }
+          },
+          {
+            title: "备注",
+            field: "bz",
+            width: 200,
+            type: 'inputText',
+            allowEdit: true,
+          }
+        ]
+      }
+    }
+  }
+</script>
+<style lang="scss" scoped>
+  @import url("~common/src/assets/styles/editDetail.scss");
+</style>
\ No newline at end of file

src/views/ccgl/zlgl/kcyhd/top/index.vue

+<template>
+  <BasePage :power='power' @getRow='getRow' class="min_full" style="height: 100%;" :config="config">
+    <template #dialog="ctx">
+      <!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 -->
+      <Add :app='ctx.basePage' v-if="ctx.basePage.showDialog" />
+    </template>
+    <template #toolbar="ctx">
+      <el-button @click="showAdd(ctx.basePage)" size='mini' type="primary">新增</el-button>
+      <el-button @click="cxjyrw(ctx.basePage)" size='mini' type="primary">创建检验任务</el-button>
+
+    </template>
+
+  </BasePage>
+</template>
+
+<script>
+  // import Edit from './edit.vue'
+  import Add from './add.vue'
+  export default {
+    data() {
+      return {
+        power: {
+          add: false,
+          copy: false,
+          /* 手动控制删除 */
+          delButton: true,
+          /* 手动控制编辑按钮权限 */
+          editButton: false,
+          /* 是否渲染右侧操作按钮 */
+          operateButtons: true,
+          /* 是否开启工作流按钮 */
+          workFlow: false,
+          /* 表格开启选择，以及记住选择 */
+          showSelection: false,
+          saveSelected: false
+
+        },
+        config: {
+          /* Dialog*/
+          // queryDetail: true,
+          /* 基本配置*/
+          url: 'lxyl/u_kcyhd',
+          tableTitle: [{
+              title: "重检单号",
+              field: "code",
+              width: 140
+            },
+            {
+              title: "业务日期",
+              field: "ywrq",
+              width: 140,
+              fieldType: 'ftDateTime'
+            },
+            {
+              title: "维护人",
+              field: "whr",
+              width: 140,
+            },
+            {
+              title: "维护时间",
+              field: "whsj",
+              fieldType: 'ftDateTime'
+            }
+          ],
+          queryParams: [
+            [{
+                label: '重检单号',
+                prop: 'code',
+                span: 5,
+                type: 'input',
+                value: ''
+              },
+              {
+                label: '业务日期',
+                startProp: "ywrqb",
+                endProp: "ywrqe",
+                span: 9,
+                type: 'RelDaterangeV2',
+                startValue: new Date().getTime() - 1000 * 60 * 60 * 24 * 30,
+                endValue: new Date().getTime(),
+              },
+            ]
+
+          ],
+          /* 默认启停用  */
+
+        }
+      }
+
+    },
+    methods: {
+      showAdd(ctx) {
+        ctx.DialogTitle = '新增'
+        ctx.DialogWidth = '70vw'
+        ctx.showDialog = true
+      },
+      getRow(val) {
+        this.$emit('getRow', val)
+      },
+      cxjyrw(ctx) {
+        if (ctx.singleItem && ctx.singleItem.id) {
+          this.$confirm('是否继续操作, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(res => {
+            this.$post('lxyl/zlgl/kccj/genJyd', {
+              id: ctx.singleItem.id
+            }).then(res => {
+              if (res.success) {
+                this.$success('操作成功')
+                ctx.refresh()
+              }
+            })
+          })
+        } else {
+          this.$warning('请选中一条数据')
+        }
+
+      }
+    },
+    components: {
+      Add
+      // Edit
+    }
+
+  }
+</script>
+
+<style>
+</style>
\ No newline at end of file