物资字典重复添加问题

.env.production

@@ -9,7 +9,7 @@ ENV = 'production'
 
 #林纪裕cd
 # VUE_APP_BASE_API = 'http://www.linjiyu.lol:81/UDI_WMS_MC/'
-VUE_APP_BASE_API = 'http://www.linjiyu.lol:83/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://www.linjiyu.lol:83/UDI_WMS_MC/'
 
 # VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/'
 
@@ -30,7 +30,7 @@ VUE_APP_BASE_API = 'http://www.linjiyu.lol:83/UDI_WMS_MC/'
 # VUE_APP_BASE_API = 'http://192.168.0.242:9150/UDI_WMS_MC/'
 
 # 平潭正式
-# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
 
 # 吴总测试服务器.
 

src/views/basic/product/UdiInfoSelectLocalUdi.vue

@@ -394,6 +394,7 @@ export default {
         erpName: "",
         thirdName: null,
         keys: [],
+        devKeys: [],
       },
       checked: true,
       udidlList: [],
@@ -540,7 +541,7 @@ export default {
     },
 
     checkCombine() {
-       if(isBlank(this.relId)) {
+      if (isBlank(this.relId)) {
         this.checkedUdi();
       } else {
         this.$confirm("是否确定关联DI产品名称:" + this.cpmctymc1 + ":与第三方产品名称" + this.data.cpmctymc, "提示", {
@@ -561,10 +562,11 @@ export default {
         if (this.relId != null) {
           this.combineQuery.relId = this.relId;
           this.combineQuery.keys.push(this.currentRow.uuid);
+          this.combineQuery.devKeys.push(this.currentRow.deviceRecordKey);
           if (this.currentRow.check) {
             selected = this.currentRow;
           }
-        } else{
+        } else {
           this.$message.warning('请选入产品!');
           return;
         }
@@ -576,6 +578,7 @@ export default {
             selected = obj;
           }
           this.combineQuery.keys.push(obj.uuid);
+          this.combineQuery.devKeys.push(obj.deviceRecordKey);
         });
       }
       if (selected != null) {

src/views/basic/product/UdiinfoSelectVersion.vue

@@ -133,6 +133,7 @@ export default {
         erpName: "",
         thirdName: null,
         keys: [],
+        devKeys:[],
       },
 
       checked: true,
@@ -205,6 +206,7 @@ export default {
       if (this.relId != null) {
         this.combineQuery.relId = this.relId;
         this.combineQuery.keys.push(row.uuid);
+        this.combineQuery.devKeys.push(row.deviceRecordKey);
       } else
         return;
       this.combineLoading = true;

src/views/inventory/supInoutSearchOrder.vue

@@ -108,16 +108,18 @@
       <div class="top-right-btn">
         <el-button-group>
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
-          <el-button type="primary" icon="el-icon-refresh" @click="optinPrint">选入打印</el-button>
-          <el-button type="primary" icon="el-icon-refresh" @click="selectPrint">查询结果打印</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
+          <el-button type="primary" icon="el-icon-printer" @click="optinPrint">选中打印</el-button>
+          <el-button type="primary" icon="el-icon-printer" @click="selectPrint">查询结果打印</el-button>
+
         </el-button-group>
       </div>
       <el-divider style="margin: 15px"></el-divider>
-      <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row borderv   @selection-change="handleCheckedChange">
+      <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row borderv
+                @selection-change="handleCheckedChange">
 
-      <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="供应商" prop="fromCorpName" width="160" v-if="showSup"></el-table-column>
         <el-table-column label="往来单位" prop="fromName" width="160"></el-table-column>
@@ -135,6 +137,14 @@
         <el-table-column label="出入库时间" prop="auditTime" width="170" show-overflow-tooltip></el-table-column>
         <el-table-column label="生产企业" prop="manufacturer" width="160" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册/备案号" prop="certCode" width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column label="打印状态" width="100"  prop="inoutPrintStatus" >
+          <template slot-scope="scope">
+            <el-tag :type="statusFilterType(scope.row.inoutPrintStatus)">{{
+                printMap[scope.row.inoutPrintStatus]
+              }}
+            </el-tag>
+          </template>
+        </el-table-column>
       </el-table>
 
       <pagination
@@ -159,7 +169,7 @@ export default {
     return {
       showSearch: true,
       list: {},
-      busTypeOptions:[],
+      busTypeOptions: [],
       filterQuery: {
         id: "",
         orderIdFk: null,
@@ -175,6 +185,13 @@ export default {
         fromCorp: null,
         keyWords: null,
       },
+
+      printMap: {
+        0: "未打印",
+        1: "已打印",
+        null: "未打印",
+      },
+
       fromOptions: [],
       loading: false,
       total: 0,
@@ -183,6 +200,7 @@ export default {
       customerId: this.$store.getters.customerId,
       actDateRange: [],
       actionType: null,
+
       auditDateRange: [],
       pickerOptions: {
         shortcuts: [
@@ -256,6 +274,16 @@ export default {
 
       this.getList();
     },
+
+    statusFilterType(status) {
+      const statusMap = {
+        null: "",
+        1: "success",
+        0: "warning",
+      };
+      return statusMap[status];
+    },
+
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
@@ -277,10 +305,10 @@ export default {
     getList() {
       this.loading = true;
       this.filterQuery.actionType = this.actionType;
-      if(this.filterQuery.actionType=='preInDetail'){
+      if (this.filterQuery.actionType == 'preInDetail') {
-        this.filterQuery.invCode='1000001'
+        this.filterQuery.invCode = '1000001'
-      }else if(this.filterQuery.actionType=='preDetail'){
+      } else if (this.filterQuery.actionType == 'preDetail') {
-        this.filterQuery.invCode='1000002'
+        this.filterQuery.invCode = '1000002'
       }
       getResultOrderList(this.filterQuery)
         .then((response) => {
@@ -317,81 +345,107 @@ export default {
         });
     },
     optinPrint() {
-      if (this.orderSelection == null || this.orderSelection.length <= 0) {
+      this.$confirm("是否确定打印选中出入库明细, 是否继续?", "提示", {
-        return this.$message.error("请选择打印的明细！");
+        confirmButtonText: "确定",
-      }
+        cancelButtonText: "取消",
-      let query = {id: 4};
+        type: "warning",
-      verifyTemplateFile(query).then((res) => {
-          if (res.code === 20000) {
-            let printParams = {
-              templateId: res.data,
-              list: this.orderSelection
-            };
-            printOrder(printParams).then((response) => {
-              //将pdf文件转换为url。
-              const binaryData = [];
-              binaryData.push(response);
-              //获取blob链接。
-              let url = window.URL.createObjectURL(
-                new Blob(binaryData, {type: "application/pdf"})
-              );
-              this.loading = false;
-              window.open(url);//打开新标签页，预览pdf。
-            })
-          }else{
-            return this.$message.error(res.message);
-          }
-      }).catch((error) => {
-        this.loading = false;
-        this.$message.error(error.message);
       })
+        .then(() => {
+          if (this.orderSelection == null || this.orderSelection.length <= 0) {
+            return this.$message.error("请选择打印的明细！");
+          }
+          let query = {id: 4};
+          verifyTemplateFile(query).then((res) => {
+            if (res.code === 20000) {
+              let printParams = {
+                templateId: res.data,
+                list: this.orderSelection
+              };
+              printOrder(printParams).then((response) => {
+                //将pdf文件转换为url。
+                const binaryData = [];
+                binaryData.push(response);
+                //获取blob链接。
+                let url = window.URL.createObjectURL(
+                  new Blob(binaryData, {type: "application/pdf"})
+                );
+                this.loading = false;
+                window.open(url);//打开新标签页，预览pdf。
+              })
+            } else {
+              return this.$message.error(res.message);
+            }
+          }).catch((error) => {
+            this.loading = false;
+            this.$message.error(error.message);
+          })
+        })
+        .catch(() => {
+        });
+
 
     },
-    selectPrint(){
+    selectPrint() {
-      let query = {id: 4};
-      verifyTemplateFile(query).then((res) => {
-        if (res.code === 20000) {
-          let printParams = {
-            templateId: res.data,
-            orderIdFk: this.filterQuery.orderIdFk,
-            nameCode: this.filterQuery.nameCode,
-            coName: this.filterQuery.coName,
-            spec: this.filterQuery.spec,
-            batchNo: this.filterQuery.batchNo,
-            zczbhhzbapzbh: this.filterQuery.zczbhhzbapzbh,
-            manufacturer: this.filterQuery.manufacturer,
-            actionType: this.filterQuery.actionType,
-            keyWords: this.filterQuery.keyWords,
-            mainAction: this.filterQuery.mainAction,
-            action:this.filterQuery.action
 
-          };
+
-          if (this.actDateRange !== null) {
+      this.$confirm("是否确定打印所有查询结果数据", "提示", {
-            printParams.startAduditTime = this.actDateRange[0];
+        confirmButtonText: "确定",
-            printParams.endAduditTime = this.actDateRange[1];
+        cancelButtonText: "取消",
-          } else {
+        type: "warning",
-            printParams.startAduditTime = null;
+      })
-            printParams.endAduditTime = null;
+        .then(() => {
-          }
+
-          printOrder(printParams).then((response) => {
+          let query = {id: 4};
-            //将pdf文件转换为url。
+          verifyTemplateFile(query).then((res) => {
-            const binaryData = [];
+            if (res.code === 20000) {
-            binaryData.push(response);
+              let printParams = {
-            //获取blob链接。
+                templateId: res.data,
-            let url = window.URL.createObjectURL(
+                orderIdFk: this.filterQuery.orderIdFk,
-              new Blob(binaryData, {type: "application/pdf"})
+                nameCode: this.filterQuery.nameCode,
-            );
+                coName: this.filterQuery.coName,
+                spec: this.filterQuery.spec,
+                batchNo: this.filterQuery.batchNo,
+                zczbhhzbapzbh: this.filterQuery.zczbhhzbapzbh,
+                manufacturer: this.filterQuery.manufacturer,
+                actionType: this.filterQuery.actionType,
+                keyWords: this.filterQuery.keyWords,
+                mainAction: this.filterQuery.mainAction,
+                action: this.filterQuery.action
+
+              };
+              if (this.actDateRange !== null) {
+                printParams.startAduditTime = this.actDateRange[0];
+                printParams.endAduditTime = this.actDateRange[1];
+              } else {
+                printParams.startAduditTime = null;
+                printParams.endAduditTime = null;
+              }
+              printOrder(printParams).then((response) => {
+                //将pdf文件转换为url。
+                const binaryData = [];
+                binaryData.push(response);
+                //获取blob链接。
+                let url = window.URL.createObjectURL(
+                  new Blob(binaryData, {type: "application/pdf"})
+                );
+                this.loading = false;
+                window.open(url);//打开新标签页，预览pdf。
+              })
+            } else {
+              this.$message.error(res.message);
+              return
+            }
+          }).catch((error) => {
             this.loading = false;
-            window.open(url);//打开新标签页，预览pdf。
+            this.$message.error(error.message);
           })
-        }else{
+
-          this.$message.error(res.message);
+        })
-          return
+        .catch(() => {
-        }
+        });
-      }).catch((error) => {
+      return;
-        this.loading = false;
+
-        this.$message.error(error.message);
+
-      })
     }
   }
   ,

src/views/system/ration/InvRationSet.vue

@@ -106,10 +106,14 @@
           </el-button>
           <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询
           </el-button>
-          <el-button type="primary" icon="el-icon-plus" @click="onAddProduct">添加产品
+          <el-button type="primary" icon="el-icon-plus" @click="onAddProduct"
+                     v-hasPermi="['system:ration:add']"
+          >添加产品
           </el-button>
 
-          <el-button type="primary" icon="el-icon-plus" @click="buildOrder">生成单据
+          <el-button type="primary" icon="el-icon-plus" @click="buildOrder"
+                     v-hasPermi="['system:ration:gen']"
+          >生成单据
           </el-button>
 
         </el-button-group>
@@ -154,6 +158,7 @@
         <el-table-column label="操作" width="100" fixed="right">
           <template slot-scope="scope">
             <el-button
+              v-hasPermi="['system:ration:edit']"
               type="text"
               size="small"
               @click.native.stop="invRemindSet(scope.row)"
@@ -170,6 +175,7 @@
             <el-button
               type="text"
               size="small"
+              v-hasPermi="['system:ration:del']"
               @click.native.stop="deleteDialog(scope.row)"
             >删除
             </el-button