From a7e97317858ae64fad74324adeb273114244b6e8 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Mon, 13 Jun 2022 14:50:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=EF=BC=8C?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=AF=A6=E6=83=85=EF=BC=8C=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/config.json                      |   8 +-
 src/views/basic/BussinessType.vue       |   5 +-
 src/views/basic/BussinessTypeModify.vue |   2 +
 src/views/business/errorCode.vue        |  21 ++
 src/views/inout/IOFinishCode.vue        | 283 +++++++++++++-----------
 src/views/inout/errorCode.vue           |  54 ++++-
 6 files changed, 236 insertions(+), 137 deletions(-)

diff --git a/public/config.json b/public/config.json
index 0812e25..8195b20 100644
--- a/public/config.json
+++ b/public/config.json
@@ -1,7 +1,7 @@
 {
-    "UDI_SYNC_SERVER_IP": "http://192.168.0.115:9995/",
-    "BASE_URL":"http://192.168.0.115:9991",
-    "SERVER_IP": "http://192.168.0.115:9991/",
-    "WEBSOCKET_URL": "ws://192.168.0.115:9991/UDI_WMS_MC/api/websocket/",
+    "UDI_SYNC_SERVER_IP": "http://192.168.0.109:9995/",
+    "BASE_URL":"http://192.168.0.109:9991",
+    "SERVER_IP": "http://192.168.0.109:9991/",
+    "WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/",
     "hosp_name": "诏安县总医院（测试）"
 }
diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue
index 3744d99..9c10c45 100644
--- a/src/views/basic/BussinessType.vue
+++ b/src/views/basic/BussinessType.vue
@@ -218,6 +218,7 @@ export default {
                 scanPreIn: null,
                 vailInv: null,
                 entrutSpms: null,
+                codeFillCheck: null,
             },
             enableMap: {
                 true: "是",
@@ -389,7 +390,9 @@ export default {
                 ullageFill: row.ullageFill,
                 scanPreIn: row.scanPreIn,
                 vailInv: row.vailInv,
-                entrutSpms: row.entrutSpms
+                entrutSpms: row.entrutSpms,
+                codeFillCheck: row.codeFillCheck,
+
 
             };
             this.modifyDialogVisible = true;
diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue
index f28fff7..c43439f 100644
--- a/src/views/basic/BussinessTypeModify.vue
+++ b/src/views/basic/BussinessTypeModify.vue
@@ -213,6 +213,8 @@
                     </el-checkbox>
                     <el-checkbox v-model="inputQuery.vailInv">是否访问库存
                     </el-checkbox>
+                    <el-checkbox v-model="inputQuery.codeFillCheck">是否三期校验
+                    </el-checkbox>
                 </div>
             </el-col>
         </el-row>
diff --git a/src/views/business/errorCode.vue b/src/views/business/errorCode.vue
index 7015a8d..c9c66eb 100644
--- a/src/views/business/errorCode.vue
+++ b/src/views/business/errorCode.vue
@@ -30,12 +30,33 @@
             <el-table-column label="序号" type="index" fixed></el-table-column>
             <!-- <el-table-column label="ID" prop="id" fixed></el-table-column> -->
             <el-table-column label="条码" prop="code" fixed></el-table-column>
+            <el-table-column
+                label="生产日期"
+                prop="produceDate"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+                label="失效日期"
+                prop="expireDate"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+                label="批次号"
+                prop="batchNo"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+                label="序列号"
+                prop="serialNo"
+                show-overflow-tooltip
+            ></el-table-column>
             <el-table-column
                 label="扫码数量"
                 prop="count"
                 width="220"
                 show-overflow-tooltip
             ></el-table-column>
+
             <el-table-column label="创建时间" prop="actDate">
                 <template slot-scope="scope">
                     <i class="el-icon-time"></i>
diff --git a/src/views/inout/IOFinishCode.vue b/src/views/inout/IOFinishCode.vue
index 0e78ed3..8c927b0 100644
--- a/src/views/inout/IOFinishCode.vue
+++ b/src/views/inout/IOFinishCode.vue
@@ -1,151 +1,172 @@
 <template>
-  <div>
-    <el-form :inline="true" :model="query" class="query-form" size="mini">
-      <el-form-item class="query-form-item">
-        <el-input v-model="query.code" placeholder="条码查询"></el-input>
-      </el-form-item>
+    <div>
+        <el-form :inline="true" :model="query" class="query-form" size="mini">
+            <el-form-item class="query-form-item">
+                <el-input v-model="query.code" placeholder="条码查询"></el-input>
+            </el-form-item>
 
-      <el-form-item>
-        <el-button-group>
-          <el-button type="primary" icon="search" @click="getCodeList"
-            >查询</el-button
-          >
-        </el-button-group>
-      </el-form-item>
-    </el-form>
-    <el-table v-loading="loading" :data="codeArry" style="width: 100%">
-      <el-table-column label="序号" type="index"></el-table-column>
-      <el-table-column
-        label="条码"
-        prop="code"
-        show-overflow-tooltip
-      ></el-table-column>
-      <el-table-column
-        label="扫码数量"
-        prop="count"
-        width="180"
-        show-overflow-tooltip
-      ></el-table-column>
-      <el-table-column label="创建时间" prop="actDate"    width="220" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <i class="el-icon-time"></i>
-          <span>{{ scope.row.actDate }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作员" prop="actor"    width="180"></el-table-column>
-    </el-table>
+            <el-form-item>
+                <el-button-group>
+                    <el-button type="primary" icon="search" @click="getCodeList"
+                    >查询
+                    </el-button
+                    >
+                </el-button-group>
+            </el-form-item>
+        </el-form>
+        <el-table v-loading="loading" :data="codeArry" style="width: 100%">
+            <el-table-column label="序号" type="index"></el-table-column>
+            <el-table-column
+                label="条码"
+                prop="code"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+                label="生产日期"
+                prop="produceDate"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+                label="失效日期"
+                prop="expireDate"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+                label="批次号"
+                prop="batchNo"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+                label="序列号"
+                prop="serialNo"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+                label="扫码数量"
+                prop="count"
+                width="180"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column label="创建时间" prop="actDate" width="220" show-overflow-tooltip>
+                <template slot-scope="scope">
+                    <i class="el-icon-time"></i>
+                    <span>{{ scope.row.actDate }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作员" prop="actor" width="180"></el-table-column>
+        </el-table>
 
-    <el-pagination
-      :page-size="query.limit"
-      @current-change="handleCurrentChange"
-      layout="prev, pager, next,total"
-      :total="total"
-    >
-    </el-pagination>
-  </div>
+        <el-pagination
+            :page-size="query.limit"
+            @current-change="handleCurrentChange"
+            layout="prev, pager, next,total"
+            :total="total"
+        >
+        </el-pagination>
+    </div>
 </template>
 
 <script>
-import {  codeList } from "../../api/inout/order";
+import {codeList} from "../../api/inout/order";
 import draggable from "vuedraggable";
 
 export default {
-  name: "idQuery",
-  props: {
-    idQuery: {
-      type: Object,
-      required: true,
+    name: "idQuery",
+    props: {
+        idQuery: {
+            type: Object,
+            required: true,
+        },
     },
-  },
-  data() {
-    return {
-      query: {
-        code: "",
-        corpOrderId: "",
-        page: 1,
-        limit: 20,
-      },
-      codeArry: [],
-      total: 0,
-      loading: true,
-      index: null,
-      formLoading: false,
-      formVisible: false,
-      deleteLoading: false,
-      orderNo: null,
-    };
-  },
-  components: {
-    draggable,
-  },
-  methods: {
-    onReset() {
-      this.$router.push({
-        path: "",
-      });
-      this.query = {
-        code: "",
-        corpOrderId: "",
-        page: 1,
-        limit: 20,
-      };
-      this.getCodeList();
+    data() {
+        return {
+            query: {
+                code: "",
+                corpOrderId: "",
+                page: 1,
+                limit: 20,
+            },
+            codeArry: [],
+            total: 0,
+            loading: true,
+            index: null,
+            formLoading: false,
+            formVisible: false,
+            deleteLoading: false,
+            orderNo: null,
+        };
     },
-    onSubmit() {
-      this.$router.push({
-        path: "",
-        query: this.query,
-      });
-      this.getCodeList();
-    },
-    handleSizeChange(val) {
-      this.query.limit = val;
-      this.getCodeList();
-    },
-    handleCurrentChange(val) {
-      this.query.page = val;
-      this.getCodeList();
+    components: {
+        draggable,
     },
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.query = {
+                code: "",
+                corpOrderId: "",
+                page: 1,
+                limit: 20,
+            };
+            this.getCodeList();
+        },
+        onSubmit() {
+            this.$router.push({
+                path: "",
+                query: this.query,
+            });
+            this.getCodeList();
+        },
+        handleSizeChange(val) {
+            this.query.limit = val;
+            this.getCodeList();
+        },
+        handleCurrentChange(val) {
+            this.query.page = val;
+            this.getCodeList();
+        },
 
-    getCodeList() {
-      this.loading = true;
-      this.query.corpOrderId = this.idQuery.id;
-      codeList(this.query) //查找该单号下的所有条码
-        .then((response) => {
-          this.loading = false;
-          this.codeArry = response.data.list || [];
-          this.total = response.data.total || 0;
-        })
-        .catch(() => {
-          this.loading = false;
-          this.list = [];
-          this.total = 0;
-        });
+        getCodeList() {
+            this.loading = true;
+            this.query.corpOrderId = this.idQuery.id;
+            codeList(this.query) //查找该单号下的所有条码
+                .then((response) => {
+                    this.loading = false;
+                    this.codeArry = response.data.list || [];
+                    this.total = response.data.total || 0;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
+        intentBack() {
+            //  this.$router.push({path:'../readme/detail',query:{id:row.corpOrderId}});
+            this.$router.go(-1);
+        },
     },
-    intentBack() {
-      //  this.$router.push({path:'../readme/detail',query:{id:row.corpOrderId}});
-      this.$router.go(-1);
+    filters: {},
+    mounted() {
+        document.body.ondrop = function (event) {
+            event.preventDefault();
+            event.stopPropagation();
+        };
     },
-  },
-  filters: {},
-  mounted() {
-    document.body.ondrop = function (event) {
-      event.preventDefault();
-      event.stopPropagation();
-    };
-  },
-  created() {
-    // 将参数拷贝进查询对象
-    let query = this.$route.query;
-    this.orderNo = query.id;
+    created() {
+        // 将参数拷贝进查询对象
+        let query = this.$route.query;
+        this.orderNo = query.id;
 
-    this.query = Object.assign(this.query, query);
-    this.query.limit = parseInt(this.query.limit);
-    this.query.corpOrderId = query.id;
+        this.query = Object.assign(this.query, query);
+        this.query.limit = parseInt(this.query.limit);
+        this.query.corpOrderId = query.id;
 
-    // 加载表格数据
-    this.getCodeList();
-  },
+        // 加载表格数据
+        this.getCodeList();
+    },
 };
 </script>
 
diff --git a/src/views/inout/errorCode.vue b/src/views/inout/errorCode.vue
index 8452b5a..7c39626 100644
--- a/src/views/inout/errorCode.vue
+++ b/src/views/inout/errorCode.vue
@@ -31,6 +31,26 @@
             <el-table-column label="序号" type="index" fixed></el-table-column>
             <!-- <el-table-column label="ID" prop="id" fixed></el-table-column> -->
             <el-table-column label="条码" prop="code" fixed></el-table-column>
+            <el-table-column
+                label="生产日期"
+                prop="produceDate"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+                label="失效日期"
+                prop="expireDate"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+                label="批次号"
+                prop="batchNo"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+                label="序列号"
+                prop="serialNo"
+                show-overflow-tooltip
+            ></el-table-column>
             <el-table-column
                 label="供应商"
                 prop="supId"
@@ -59,6 +79,13 @@
                     <!--                    >删除-->
                     <!--                    </el-button-->
                     <!--                    >-->
+                    <el-button
+                        type="text"
+                        size="small"
+                        @click.native.stop="editCode(scope.row)"
+                    >编辑
+                    </el-button
+                    >
                     <el-button
                         type="text"
                         size="small"
@@ -113,6 +140,20 @@
                 v-on:closeBindDialog="closeBindDialog"
             ></selectRlDialog>
         </el-dialog>
+
+
+        <el-dialog
+            :title="editTitle"
+            :visible.sync="editCodeVisible"
+            append-to-body width="70%"
+            v-if="editCodeVisible"
+        >
+            <editCodeDialog
+                editTye="2"
+                :closeCodeDialog="closeCodeDialog"
+                :codeDetail="codeDetail">
+            </editCodeDialog>
+        </el-dialog>
     </div>
 </template>
 
@@ -125,6 +166,7 @@ import {
 import draggable from "vuedraggable";
 import DialogSelectUnit from "./DialogSelectUnit";
 import selectRlDialog from "./DialogSelectRl";
+import editCodeDialog from "@/views/inout/editCode";
 
 export default {
     name: "idQuery",
@@ -154,10 +196,13 @@ export default {
             multipleSelection: [],
             selectRlVisible: false,
             dialogTableVisible: false,
+            codeDetail: null,
+            editTitle: "补齐三期",
+            editCodeVisible: false,
         };
     },
     components: {
-        draggable, DialogSelectUnit, selectRlDialog
+        draggable, DialogSelectUnit, selectRlDialog,editCodeDialog
     },
     methods: {
         handleSelectionChange(val) {
@@ -307,6 +352,13 @@ export default {
             }
             return rowBackground;
         },
+        closeCodeDialog() {
+            this.editCodeVisible = false;
+        },
+        editCode(row) {
+            this.codeDetail = row;
+            this.editCodeVisible = true;
+        },
     },
     filters: {},
     mounted() {