From 473edd3d0fc664083a7a5ba6b9a5af7939a838b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 15 May 2022 23:16:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=95=E6=8D=AE=E5=BD=95?=
 =?UTF-8?q?=E5=85=A5=E7=95=8C=E9=9D=A2=E7=9A=84=E5=AE=BD=E5=BA=A6=E8=87=AA?=
 =?UTF-8?q?=E9=80=82=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/jeecgbiz/JSelectList.vue   |  11 +-
 .../components/jeecgbiz/JSelectMaterial.vue   |  87 ------
 .../jeecgbiz/JSelectSerialMaterial.vue        |  87 ------
 .../jeecgbiz/modal/JSelectBatchModal.vue      |   3 +-
 .../jeecgbiz/modal/JSelectMaterialModal.vue   |   5 +-
 .../modal/JSelectSerialMaterialModal.vue      | 262 ------------------
 .../jeecgbiz/modal/JSelectSnModal.vue         |   3 +-
 .../src/views/bill/modules/SaleOutModal.vue   |   2 +-
 8 files changed, 12 insertions(+), 448 deletions(-)
 delete mode 100644 jshERP-web/src/components/jeecgbiz/JSelectMaterial.vue
 delete mode 100644 jshERP-web/src/components/jeecgbiz/JSelectSerialMaterial.vue
 delete mode 100644 jshERP-web/src/components/jeecgbiz/modal/JSelectSerialMaterialModal.vue

diff --git a/jshERP-web/src/components/jeecgbiz/JSelectList.vue b/jshERP-web/src/components/jeecgbiz/JSelectList.vue
index b825baa9..d5ea04e9 100644
--- a/jshERP-web/src/components/jeecgbiz/JSelectList.vue
+++ b/jshERP-web/src/components/jeecgbiz/JSelectList.vue
@@ -2,9 +2,9 @@
   <div>
     <a-input-search v-if="kind === 'material'" v-model="names" placeholder="请选择" @pressEnter="onPressEnter" @search="onSearch"></a-input-search>
     <a-input-search v-if="kind === 'batch'||kind === 'sn'" v-model="names" placeholder="请选择" readOnly @search="onSearch"></a-input-search>
-    <j-select-material-modal v-if="kind === 'material'" ref="selectModal" :modal-width="modalWidth" :rows="rows" :multi="multi" :bar-code="value" @ok="selectOK" @initComp="initComp"/>
-    <j-select-batch-modal v-if="kind === 'batch'" ref="selectModal" :modal-width="modalWidth" :rows="rows" :multi="multi" :bar-code="value" @ok="selectOK" @initComp="initComp"/>
-    <j-select-sn-modal v-if="kind === 'sn'" ref="selectModal" :modal-width="modalWidth" :rows="rows" :multi="multi" :bar-code="value" @ok="selectOK" @initComp="initComp"/>
+    <j-select-material-modal v-if="kind === 'material'" ref="selectModal" :rows="rows" :multi="multi" :bar-code="value" @ok="selectOK" @initComp="initComp"/>
+    <j-select-batch-modal v-if="kind === 'batch'" ref="selectModal" :rows="rows" :multi="multi" :bar-code="value" @ok="selectOK" @initComp="initComp"/>
+    <j-select-sn-modal v-if="kind === 'sn'" ref="selectModal" :rows="rows" :multi="multi" :bar-code="value" @ok="selectOK" @initComp="initComp"/>
   </div>
 </template>
 
@@ -20,11 +20,6 @@
     name: 'JSelectList',
     components: {JSelectMaterialModal, JSelectBatchModal, JSelectSnModal},
     props: {
-      modalWidth: {
-        type: Number,
-        default: 1450,
-        required: false
-      },
       value: {
         type: String,
         required: false
diff --git a/jshERP-web/src/components/jeecgbiz/JSelectMaterial.vue b/jshERP-web/src/components/jeecgbiz/JSelectMaterial.vue
deleted file mode 100644
index f618d33f..00000000
--- a/jshERP-web/src/components/jeecgbiz/JSelectMaterial.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <div>
-    <a-input-search
-      v-model="materialNames"
-      placeholder="请选择商品"
-      readOnly
-      @search="onSearchMaterial">
-    </a-input-search>
-    <j-select-material-modal ref="selectModal" :modal-width="modalWidth" :multi="multi" :bar-code="value" @ok="selectOK" @initComp="initComp"/>
-  </div>
-</template>
-
-<script>
-  import JSelectMaterialModal from './modal/JSelectMaterialModal'
-
-  export default {
-    name: 'JSelectMaterial',
-    components: {JSelectMaterialModal},
-    props: {
-      modalWidth: {
-        type: Number,
-        default: 1300,
-        required: false
-      },
-      value: {
-        type: String,
-        required: false
-      },
-      disabled: {
-        type: Boolean,
-        required: false,
-        default: false
-      },
-      multi: {
-        type: Boolean,
-        default: true,
-        required: false
-      }
-    },
-    data() {
-      return {
-        materialIds: "",
-        materialNames: "",
-      }
-    },
-    mounted() {
-      this.materialIds = this.value
-    },
-    watch: {
-      value(val) {
-        this.materialIds = val
-      }
-    },
-    model: {
-      prop: 'value',
-      event: 'change'
-    },
-    methods: {
-      initComp(barCode) {
-        this.materialNames = barCode
-      },
-      onSearchMaterial() {
-        this.$refs.selectModal.showModal()
-      },
-      selectOK(rows, idstr) {
-        console.log("选中商品", rows)
-        console.log("选中商品id", idstr)
-        if (!rows) {
-          this.materialNames = ''
-          this.materialIds = ''
-        } else {
-          let temp = ''
-          for (let item of rows) {
-            temp += ',' + item.mBarCode
-          }
-          this.materialNames = temp.substring(1)
-          this.materialIds = idstr
-        }
-        this.$emit("change", this.materialIds)
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/components/jeecgbiz/JSelectSerialMaterial.vue b/jshERP-web/src/components/jeecgbiz/JSelectSerialMaterial.vue
deleted file mode 100644
index 396124f1..00000000
--- a/jshERP-web/src/components/jeecgbiz/JSelectSerialMaterial.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <div>
-    <a-input-search
-      v-model="materialNames"
-      placeholder="请选择序列号商品"
-      readOnly
-      @search="onSearchMaterial">
-    </a-input-search>
-    <j-select-serial-material-modal ref="selectModal" :modal-width="modalWidth" :multi="multi" :bar-code="value" @ok="selectOK" @initComp="initComp"/>
-  </div>
-</template>
-
-<script>
-  import JSelectSerialMaterialModal from './modal/JSelectSerialMaterialModal'
-
-  export default {
-    name: 'JSelectSerialMaterial',
-    components: {JSelectSerialMaterialModal},
-    props: {
-      modalWidth: {
-        type: Number,
-        default: 1100,
-        required: false
-      },
-      value: {
-        type: String,
-        required: false
-      },
-      disabled: {
-        type: Boolean,
-        required: false,
-        default: false
-      },
-      multi: {
-        type: Boolean,
-        default: true,
-        required: false
-      }
-    },
-    data() {
-      return {
-        materialIds: "",
-        materialNames: "",
-      }
-    },
-    mounted() {
-      this.materialIds = this.value
-    },
-    watch: {
-      value(val) {
-        this.materialIds = val
-      }
-    },
-    model: {
-      prop: 'value',
-      event: 'change'
-    },
-    methods: {
-      initComp(barCode) {
-        this.materialNames = barCode
-      },
-      onSearchMaterial() {
-        this.$refs.selectModal.showModal()
-      },
-      selectOK(rows, idstr) {
-        console.log("选中序列号商品", rows)
-        console.log("选中序列号商品id", idstr)
-        if (!rows) {
-          this.materialNames = ''
-          this.materialIds = ''
-        } else {
-          let temp = ''
-          for (let item of rows) {
-            temp += ',' + item.mBarCode
-          }
-          this.materialNames = temp.substring(1)
-          this.materialIds = idstr
-        }
-        this.$emit("change", this.materialIds)
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/components/jeecgbiz/modal/JSelectBatchModal.vue b/jshERP-web/src/components/jeecgbiz/modal/JSelectBatchModal.vue
index 1432ae66..de15ee80 100644
--- a/jshERP-web/src/components/jeecgbiz/modal/JSelectBatchModal.vue
+++ b/jshERP-web/src/components/jeecgbiz/modal/JSelectBatchModal.vue
@@ -55,9 +55,10 @@
     name: 'JSelectBatchModal',
     mixins:[JeecgListMixin],
     components: {},
-    props: ['modalWidth', 'rows', 'multi', 'barCode'],
+    props: ['rows', 'multi', 'barCode'],
     data() {
       return {
+        modalWidth: 1000,
         queryParam: {
           name: "",
           depotId: '',
diff --git a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
index f898098b..fbd26457 100644
--- a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
+++ b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
@@ -84,9 +84,10 @@
     name: 'JSelectMaterialModal',
     mixins:[JeecgListMixin],
     components: {},
-    props: ['modalWidth', 'rows', 'multi', 'barCode'],
+    props: ['rows', 'multi', 'barCode'],
     data() {
       return {
+        modalWidth: 1450,
         queryParam: {
           q: '',
           depotId: ''
@@ -212,6 +213,8 @@
       },
       // 触发屏幕自适应
       resetScreenSize() {
+        let realScreenWidth = window.screen.width * window.devicePixelRatio
+        this.modalWidth = realScreenWidth<1600?'1200px':'1450px'
         let screenWidth = document.body.clientWidth;
         if (screenWidth < 500) {
           this.scrollTrigger = {x: 800};
diff --git a/jshERP-web/src/components/jeecgbiz/modal/JSelectSerialMaterialModal.vue b/jshERP-web/src/components/jeecgbiz/modal/JSelectSerialMaterialModal.vue
deleted file mode 100644
index 6583bc15..00000000
--- a/jshERP-web/src/components/jeecgbiz/modal/JSelectSerialMaterialModal.vue
+++ /dev/null
@@ -1,262 +0,0 @@
-<template>
-  <a-modal
-    :width="modalWidth"
-    :visible="visible"
-    :title="title"
-    @ok="handleSubmit"
-    @cancel="close"
-    cancelText="关闭"
-    style="margin-top: -70px"
-    wrapClassName="ant-modal-cust-warp"
-  >
-    <a-row :gutter="10" style="padding: 10px; margin: -10px">
-      <a-col :md="24" :sm="24">
-        <!-- 查询区域 -->
-        <div class="table-page-search-wrapper">
-          <!-- 搜索区域 -->
-          <a-form layout="inline" @keyup.enter.native="onSearch">
-            <a-row :gutter="24">
-              <a-col :md="12" :sm="12">
-                <a-form-item label="商品信息" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
-                  <a-input placeholder="请输入条码、名称、规格、型号" v-model="queryParam.q"></a-input>
-                </a-form-item>
-              </a-col>
-              <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-                <a-col :md="12" :sm="12">
-                  <a-button type="primary" @click="onSearch">查询</a-button>
-                  <a-button style="margin-left: 8px" @click="searchReset(1)">重置</a-button>
-                </a-col>
-              </span>
-            </a-row>
-          </a-form>
-          <a-table
-            ref="table"
-            :scroll="scrollTrigger"
-            size="middle"
-            rowKey="id"
-            :columns="columns"
-            :dataSource="dataSource"
-            :pagination="ipagination"
-            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type: getType}"
-            :loading="loading"
-            :customRow="rowAction"
-            @change="handleTableChange">
-          </a-table>
-        </div>
-      </a-col>
-    </a-row>
-  </a-modal>
-</template>
-
-<script>
-  import {filterObj} from '@/utils/util'
-  import {getSerialMaterialBySelect} from '@/api/api'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-
-  export default {
-    name: 'JSelectSerialMaterialModal',
-    mixins:[JeecgListMixin],
-    components: {},
-    props: ['modalWidth', 'multi', 'barCode'],
-    data() {
-      return {
-        queryParam: {
-          q: ''
-        },
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        columns: [
-          {dataIndex: 'mBarCode', title: '条码', width: 100, align: 'left'},
-          {dataIndex: 'name', title: '名称', width: 100},
-          {dataIndex: 'standard', title: '规格', width: 80},
-          {dataIndex: 'model', title: '型号', width: 80}
-        ],
-        scrollTrigger: {},
-        dataSource: [],
-        selectedRowKeys: [],
-        selectMaterialRows: [],
-        selectMaterialIds: [],
-        title: '选择序列号商品',
-        ipagination: {
-          current: 1,
-          pageSize: 5,
-          pageSizeOptions: ['5', '10', '20', '30'],
-          showTotal: (total, range) => {
-            return range[0] + '-' + range[1] + ' 共' + total + '条'
-          },
-          showQuickJumper: true,
-          showSizeChanger: true,
-          total: 0
-        },
-        isorter: {
-          column: 'createTime',
-          order: 'desc'
-        },
-        visible: false,
-        form: this.$form.createForm(this),
-        loading: false,
-        expandedKeys: [],
-      }
-    },
-    computed: {
-      // 计算属性的 getter
-      getType: function () {
-        return this.multi == true ? 'checkbox' : 'radio';
-      }
-    },
-    watch: {
-      barCode: {
-        immediate: true,
-        handler() {
-          this.initBarCode()
-        }
-      },
-    },
-    created() {
-      // 该方法触发屏幕自适应
-      this.resetScreenSize()
-      this.loadData()
-    },
-    methods: {
-      initBarCode() {
-        if (this.barCode) {
-          this.$emit('initComp', this.barCode)
-        } else {
-          // JSelectUserByDep组件bug issues/I16634
-          this.$emit('initComp', '')
-        }
-      },
-      async loadData(arg) {
-        if (arg === 1) {
-          this.ipagination.current = 1;
-        }
-        this.loading = true
-        let params = this.getQueryParams()//查询条件
-        await getSerialMaterialBySelect(params).then((res) => {
-          if (res) {
-            this.dataSource = res.rows
-            this.ipagination.total = res.total
-          }
-        }).finally(() => {
-          this.loading = false
-        })
-      },
-      // 触发屏幕自适应
-      resetScreenSize() {
-        let screenWidth = document.body.clientWidth;
-        if (screenWidth < 500) {
-          this.scrollTrigger = {x: 800};
-        } else {
-          this.scrollTrigger = {};
-        }
-      },
-      showModal() {
-        this.visible = true;
-        this.loadData();
-        this.form.resetFields();
-      },
-      getQueryParams() {
-        let param = Object.assign({}, this.queryParam, this.isorter);
-        param.page = this.ipagination.current;
-        param.rows = this.ipagination.pageSize;
-        return filterObj(param);
-      },
-      getQueryField() {
-        let str = 'id,';
-        for (let a = 0; a < this.columns.length; a++) {
-          str += ',' + this.columns[a].dataIndex;
-        }
-        return str;
-      },
-      searchReset(num) {
-        let that = this;
-        if (num !== 0) {
-          that.queryParam = {};
-          that.loadData(1);
-        }
-        that.selectedRowKeys = [];
-        that.selectMaterialIds = [];
-      },
-      close() {
-        this.searchReset(0);
-        this.visible = false;
-      },
-      handleTableChange(pagination, filters, sorter) {
-        if (Object.keys(sorter).length > 0) {
-          this.isorter.column = sorter.field;
-          this.isorter.order = 'ascend' === sorter.order ? 'asc' : 'desc';
-        }
-        this.ipagination = pagination;
-        this.loadData();
-      },
-      handleSubmit() {
-        let that = this;
-        this.getSelectMaterialRows();
-        that.$emit('ok', that.selectMaterialRows, that.selectMaterialIds);
-        that.searchReset(0)
-        that.close();
-      },
-      //获取选择信息
-      getSelectMaterialRows(rowId) {
-        let dataSource = this.dataSource;
-        let materialIds = "";
-        this.selectMaterialRows = [];
-        for (let i = 0, len = dataSource.length; i < len; i++) {
-          if (this.selectedRowKeys.includes(dataSource[i].id)) {
-            this.selectMaterialRows.push(dataSource[i]);
-            materialIds = materialIds + "," + dataSource[i].mBarCode
-          }
-        }
-        this.selectMaterialIds = materialIds.substring(1);
-      },
-      onSelectChange(selectedRowKeys, selectionRows) {
-        this.selectedRowKeys = selectedRowKeys;
-        this.selectionRows = selectionRows;
-      },
-      onSearch() {
-        this.loadData(1);
-      },
-      modalFormOk() {
-        this.loadData();
-      },
-      rowAction(record, index) {
-        return {
-          on: {
-            click: () => {
-              let arr = []
-              arr.push(record.id)
-              this.selectedRowKeys = arr
-            },
-            dblclick: () => {
-              let arr = []
-              arr.push(record.id)
-              this.selectedRowKeys = arr
-              this.handleSubmit()
-            }
-          }
-        }
-      }
-    }
-  }
-</script>
-
-<style scoped>
-  .ant-table-tbody .ant-table-row td {
-    padding-top: 10px;
-    padding-bottom: 10px;
-  }
-
-  #components-layout-demo-custom-trigger .trigger {
-    font-size: 18px;
-    line-height: 64px;
-    padding: 0 24px;
-    cursor: pointer;
-    transition: color .3s;
-  }
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/components/jeecgbiz/modal/JSelectSnModal.vue b/jshERP-web/src/components/jeecgbiz/modal/JSelectSnModal.vue
index 2a4d3c1b..f3a3fe46 100644
--- a/jshERP-web/src/components/jeecgbiz/modal/JSelectSnModal.vue
+++ b/jshERP-web/src/components/jeecgbiz/modal/JSelectSnModal.vue
@@ -57,9 +57,10 @@
     name: 'JSelectSnModal',
     mixins:[JeecgListMixin],
     components: {},
-    props: ['modalWidth', 'rows', 'multi', 'barCode'],
+    props: ['rows', 'multi', 'barCode'],
     data() {
       return {
+        modalWidth: 800,
         queryParam: {
           name: "",
           depotId: '',
diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
index 73dfd379..8b1879cf 100644
--- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
@@ -259,7 +259,7 @@
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
             { title: '序列号', key: 'snList', width: '12%', type: FormTypes.popupJsh, kind: 'sn', multi: true },
             { title: '批号', key: 'batchNumber', width: '7%', type: FormTypes.popupJsh, kind: 'batch', multi: false },
-            { title: '有效期', key: 'expirationDate',width: '5%', type: FormTypes.normal },
+            { title: '有效期', key: 'expirationDate',width: '6%', type: FormTypes.normal },
             { title: '多属性', key: 'sku', width: '4%', type: FormTypes.normal },
             { title: '原数量', key: 'preNumber', width: '4%', type: FormTypes.normal },
             { title: '已入库', key: 'finishNumber', width: '4%', type: FormTypes.normal },