Merge remote-tracking branch 'origin/dev2.0' into dev2.0

# Conflicts:
#	src/views/inventory/DeptDeviceDetail.vue

src/api/inventory/deviceCert.js

@@ -14,17 +14,17 @@ export function filterDeviceCert(query) {
 export function insertCompanyCert(query) {
     return axios(
         {
-            url: "/sup/info/insertCompanyCert",
+            url: "/inv/info/insertDeviceCert",
             method: "post",
             data: query
         }
     );
 }
 
-export function updateCompanyCert(query) {
+export function updateDeviceCert(query) {
     return axios(
         {
-            url: "/sup/info/updateCompanyCert",
+            url: "/inv/info/updateDeviceCert",
             method: "post",
             data: query
         }
@@ -42,10 +42,10 @@ export function auditSupCert(query) {
 }
 
 
-export function deleteCompanyCert(query) {
+export function deleteDeviceCert(query) {
     return axios(
         {
-            url: "/sup/info/deleteCompanyCert",
+            url: "/inv/info/deleteDeviceCert",
             method: "post",
             data: query
         }

src/views/inventory/DeptDeviceDetail.vue

@@ -128,7 +128,7 @@
       </div>
       <el-divider style="margin: 15px"></el-divider>
       <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
-                @row-click="listClick" @current-change="handInvChange"
+                @row-click="listClick"
                 border>
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="产品通用名称" prop="deviceName" width="200"></el-table-column>
@@ -311,28 +311,14 @@ export default {
     };
   },
   methods: {
-    handInvChange(row) {  //列表选中
-      this.invManage(row);
-
-    },
-    invManage(row) {
-      this.selectedRowData = {
-        deptCode: this.$store.getters.locDeptCode,
-        invCode: this.$store.getters.locInvCode,
-        deviceName: null,
-        code: null,
-        ggxh: null,
-        batchNo: null,
-        status: 1,
-        addType: 1,
-        page: 1
-      };
-    },
     listClick(row) {
       // this.selectedRowData = null
       // // 处理行点击事件  异步操作，nexgtTick是先让selectedRow更新完在做的执行操作
       // this.$nextTick(res=>{
       this.selectedRowData = row // 将选中的行数据保存到 selectedRow 变量中
+      // this.selectedRowData.editType=1;
+      console.log("1111")
+      console.log(this.selectedRowData)
       //
       // })
     },
@@ -360,6 +346,7 @@ export default {
         page: 1,
         limit: 10,
       };
+      this.selectedRowData=null;
       this.getDeptList();
     },
     onSubmit() {
@@ -505,7 +492,7 @@ export default {
             binaryData.push(response);
             //获取blob链接。
             let url = window.URL.createObjectURL(
-                new Blob(binaryData, {type: "application/pdf"})
+              new Blob(binaryData, {type: "application/pdf"})
             );
             this.loading = false;
             window.open(url);//打开新标签页，预览pdf。

src/views/inventory/cert/depCertAddDialog.vue

@@ -0,0 +1,403 @@
+<template>
+  <div>
+    <el-form :model="formData" :rules="formRules" ref="dataForm">
+      <el-card style="margin-top: -30px">
+        <el-button-group style="display: flex">
+          <el-button type="primary" @click.native="submitUpload()" style="margin: 0 60px 10px auto; height: 35px"
+                     :loading="loading">提交
+          </el-button>
+        </el-button-group>
+        <el-row>
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>证书名称：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="name">
+              <el-input v-model="formData.name" auto-complete="off" :disabled="formData.auditStatus == 1"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>证书编号：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="code">
+              <el-input v-model="formData.code" auto-complete="off" :disabled="formData.auditStatus == 1"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>生效期：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="vailDate">
+
+              <el-date-picker
+                v-model="formData.vailDate"
+                type="date"
+                :disabled="formData.auditStatus == 1"
+                value-format="yyyy-MM-dd"
+                style="width: 100%"
+                placeholder="请选择生效期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>失效期：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="expireDate">
+
+              <el-date-picker
+                v-model="formData.expireDate"
+                type="date"
+                :disabled="formData.auditStatus == 1"
+                value-format="yyyy-MM-dd"
+                style="width: 100%"
+                placeholder="请选择失效期">
+              </el-date-picker>
+
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+
+
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>备注：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="remark">
+              <el-input v-model="formData.remark" auto-complete="off" type="textarea" autosize></el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <!--                <el-row :gutter="20">-->
+        <!--                    <el-col :span="4">-->
+        <!--                    </el-col>-->
+        <!--                    <el-col :span="16">-->
+        <!--                        <div style="color: red">-->
+        <!--                            需要上传档案为：营业执照电子档案，经营许可证电子档案，经营备案证电子档案，开户行电子档案。-->
+        <!--                        </div>-->
+        <!--                    </el-col>-->
+        <!--                </el-row>-->
+
+        <el-row>
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>文件：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <el-upload
+                :disabled="formData.auditStatus == 1"
+                class="upload-demo"
+                ref="upload"
+                :action="this.uploadUrl"
+                :on-preview="uploadHandlePreview"
+                :on-remove="uploadHandleRemove"
+                :headers="headers"
+                :on-exceed="uploadHandleExceed"
+                accept=".jpg,.png"
+                :on-change="uploadOnchange"
+                :on-success="uploadHandleSuccess"
+                :on-error="uploadHandleError"
+                :file-list="fileList"
+                :data="{type:'image2'}"
+                :auto-upload="true">
+                <el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1">
+                  {{ choiceFile }}
+                </el-button>
+                <div>只能上传 jpg,png 文件，且不超过 3 MB</div>
+              </el-upload>
+              <!--                            <el-button type="primary" size="mini" icon="search" @click="toViewCompanyCert"-->
+              <!--                                       style="text-align:right"-->
+              <!--                            >文件预览-->
+              <!--                            </el-button-->
+              <!--                            >-->
+
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-card>
+    </el-form>
+
+  </div>
+</template>
+
+<script>
+import draggable from "vuedraggable";
+import store from "../../../store";
+import {insertCompanyCert, updateCompanyCert, updateDeviceCert} from "../../../api/inventory/deviceCert";
+import ElImageViewer from "element-ui/packages/image/src/image-viewer"
+
+export default {
+  name: "devCompanyCertAdd",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    inputQuery: {
+      type: Object,
+      required: true,
+    },
+    editTye: {
+      type: Object,//1:新增，2：编辑
+      required: true,
+    },
+    addType: {
+      type: Object,
+      required: true,
+    },
+
+  },
+  data() {
+    return {
+      BASE_URL: process.env.VUE_APP_BASE_API,
+      code: "",
+      isCleck:false,
+      formData: {
+        type: 0,
+        vailDate: null,
+        expireDate: null,
+        remark: null,
+        code: null,
+        name: null,
+        manufacturerIdFk: null,
+        auditStatus: 6
+      },
+      formRules: {
+        name: [
+          {required: true, message: "请输入证书名称", trigger: "blur"}
+        ],
+        code: [
+          {required: true, message: "请输入证书编号", trigger: "blur"}
+        ],
+      },
+      loading: false,
+      uploadUrl: "",
+      fileList: [],
+      headers: {},
+      choiceFile: "选取文件",
+
+    };
+  },
+  components: {
+    draggable,
+    ElImageViewer
+  },
+  methods: {
+    submitUpload() {
+
+      this.$refs["dataForm"].validate(valid => {
+        if (valid) {
+          if (this.formData.auditStatus == 1) {
+            this.$confirm("该证书已审核通过，是否重新提交审核？", "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning",
+            })
+              .then(() => {
+                this.onConfirmSubmit(1);
+              })
+              .catch(() => {
+              });
+          } else {
+            this.onConfirmSubmit();
+          }
+
+        }
+      });
+    },
+
+    onConfirmSubmit(val) {
+      this.formData.repeatUpload = val;
+      console.log(this.formData)
+      if (this.$isNotBlank(this.formData.filePath)) {
+        if (this.$refs.upload.uploadFiles.length > 0) {
+          this.$refs.upload.submit();
+          this.onSubmit();
+        } else {
+          this.onSubmit();
+        }
+
+      } else {
+        console.log(this.$refs.upload.uploadFiles.length);
+        if (this.$refs.upload.uploadFiles.length > 0) {
+          this.$refs.upload.submit();
+        } else {
+          this.$message.warning(`请选择文件`);
+        }
+      }
+
+    },
+
+    onSubmit() {
+      this.formData.devCodeFk = this.inputQuery.code;
+      if (this.formData.devCodeFk == null) {
+        this.formData.devCodeFk = store.getters.code;
+      }
+      this.formData.type = this.addType;
+      //证书类型（1：资质证书；2：技术材料）
+      if (this.addType == 1) {
+        this.formData.devCodeFk = this.inputQuery.code;
+        this.formData.type = 1;
+      } else if (this.addType == 2) {
+        this.formData.devCodeFk = this.inputQuery.code;
+        this.formData.type = 2;
+      }
+      // if (this.formData.auditStatus != 1)
+      //   this.formData.auditStatus = "6";
+      console.log("添加修改前：")
+      console.log(this.formData)
+      console.log(this.editTye)
+      if (this.editTye == 1) {
+        insertCompanyCert(this.formData).then(response => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.$message.success("添加成功");
+            this.closeDialog(true);
+          } else {
+            this.$message.error(response.message);
+          }
+        });
+      } else {
+        updateDeviceCert(this.formData).then(response => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.$message.success("添加成功");
+            this.closeDialog(true);
+          } else {
+            this.$message.error(response.message);
+          }
+        });
+      }
+
+
+    },
+    uploadHandleRemove(file, fileList) {
+      this.formData.filePath="";
+      for (var i=0;i<fileList.length;i++){
+        this.formData.filePath+=fileList[i].response.data.name+",";
+      }
+    },
+    uploadHandlePreview(file) {
+      console.log(file);
+      console.log(this.fileList);
+    },
+    uploadHandleExceed(files, fileList) {
+
+    },
+    uploadOnchange(file, fileList) {
+      let fileName = file.name;
+      let uid = file.uid
+      let pos = fileName.lastIndexOf(".");
+      let lastName = fileName.substring(pos, fileName.length);
+      if (lastName.toLowerCase() !== ".jpg" && lastName.toLowerCase() !== ".png" && lastName.toLowerCase() !== ".doc") {
+        this.$message.error("上传文件只能是 jpg,png格式");
+        for (let i = 0; i < fileList.length; i++) {//从list删除
+          if (fileList[i].uid === uid) {
+            fileList.splice(i, 1)
+          }
+        }
+        return;
+      }
+      // 限制上传文件的大小
+      const isLt = file.size / 1024 / 1024 / 3 <= 1;
+      if (!isLt) {
+        this.$message.error("上传文件大小不能超过 3MB");
+        for (let i = 0; i < fileList.length; i++) {
+          if (fileList[i].uid === uid) {
+            fileList.splice(i, 1)
+          }
+        }
+      }
+      return isLt;
+    },
+    uploadHandleSuccess(response, file, fileList) {
+      if (response.code === 20000) {
+        if(this.formData.filePath==null || this.isCleck==true){
+          this.formData.filePath=response.data.name+",";
+          this.isCleck=false;
+        }else{
+          this.formData.filePath+=response.data.name+",";
+        }
+      } else {
+        this.$message.error("文件上传失败：" + response.message);
+      }
+    },
+    uploadHandleError() {
+
+    },
+
+    toViewCompanyCert() {
+      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+      window.open(this.certFileUrl + this.formData.filePath);
+    },
+  },
+  filters: {},
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file";
+    this.headers = {
+      ADMIN_ID: store.getters.adminId,
+      ADMIN_TOKEN: store.getters.token,
+    };
+    if (this.inputQuery.formData == null) {
+      this.formData = {}
+    } else if (this.inputQuery.formData != null && this.inputQuery.formData.addType == 1) {
+      this.formData = {}
+    } else {
+      this.formData = this.inputQuery.formData;
+      console.log(this.inputQuery.formData);
+    }
+    console.log("证书")
+    console.log(this.inputQuery)
+    console.log("证书1")
+    console.log(this.formData)
+    if (this.formData.filePath != null) {
+      this.choiceFile = "更换文件";
+      this.isCleck=true;
+    } else {
+      this.choiceFile = "选取文件";
+    }
+  },
+};
+</script>
+<style scoped>
+
+.ao-text {
+  width: 100%;
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
+  float: right;
+  text-align: right;
+  margin-top: 10px;
+}
+
+</style>
+
+
+

src/views/inventory/invDeviceEditDialog.vue

@@ -21,13 +21,13 @@
             <span>{{ expire[scope.row.status] }}</span>
           </template>
         </el-table-column>
-<!--        <el-table-column label="审核状态" prop="auditStatus" width="120">-->
+        <!--        <el-table-column label="审核状态" prop="auditStatus" width="120">-->
-<!--          <template slot-scope="scope">-->
+        <!--          <template slot-scope="scope">-->
-<!--            <el-tag :type="(scope.row.auditStatus) | statusFilterType">-->
+        <!--            <el-tag :type="(scope.row.auditStatus) | statusFilterType">-->
-<!--              {{ checkFlag[scope.row.auditStatus] }}-->
+        <!--              {{ checkFlag[scope.row.auditStatus] }}-->
-<!--            </el-tag>-->
+        <!--            </el-tag>-->
-<!--          </template>-->
+        <!--          </template>-->
-<!--        </el-table-column>-->
+        <!--        </el-table-column>-->
         <el-table-column label="备注" prop="remark"></el-table-column>
 
         <el-table-column label="操作" width="180">
@@ -36,17 +36,16 @@
               type="text"
               size="small"
               @click.native="addCert(scope.row)"
-              v-if="scope.row.auditStatus == 0 || scope.row.auditStatus == 2|| scope.row.auditStatus == 6"
             >编辑
             </el-button
             >
             <el-button type="text" size="mini" @click.native="showImgViewer(scope.row)">
-              预览</el-button>
+              预览
+            </el-button>
             <el-button
               type="text"
               size="small"
-              v-if="scope.row.auditStatus == 0 || scope.row.auditStatus == 2|| scope.row.auditStatus == 6"
+              @click.native="deleteDeviceCert(scope.row)"
-              @click.native="deleteCompanyCert(scope.row)"
             >删除
             </el-button>
           </template>
@@ -73,12 +72,12 @@
         append-to-body
         @close='closeLocalDialog'
       >
-        <companyAddCert
+        <deviceAddCert
           :closeDialog="closeLocalDialog"
           :inputQuery="inputQuery"
           :addType="addType"
           :editTye="editTye"
-        ></companyAddCert>
+        ></deviceAddCert>
       </el-dialog>
 
 
@@ -90,10 +89,10 @@
 import {modifyCompany, addCompany, bindCorp, previewImage} from "@/api/purchase/supCompany";
 import store from "@/store/index";
 import {regionDataPlus, CodeToText} from "element-china-area-data";
-import { deleteCompanyCert, updateCompanyCert} from "@/api/purchase/companyCert";
+import {deleteDeviceCert, updateDeviceCert} from "@/api/inventory/deviceCert";
 import {filterDeviceCert} from "@/api/inventory/deviceCert";
 import corpMaintainSelect from "@/views/basic/corpMaintain/corpMaintainSelect"
-import companyAddCert from "@/views/purchase/cert/supCertAddDialog";
+import deviceAddCert from "@/views/inventory/cert/depCertAddDialog.vue";
 import draggable from "vuedraggable";
 import {getUUID, isBlank} from "@/utils/strUtil";
 import supCertSetSelectDialog from "@/views/purchase/cert/supCertSetSelectDialog";
@@ -116,17 +115,23 @@ export default {
     //   type: Number,
     //   required: true,
     // }
-    rowData: {
+    idQuery: {
       type: Object,
       required: true,
     },
-    idQuery: {
+    rowData: {
       type: Object,
       required: true,
     },
-  },
 
+  },
+  watch: {
+    rowData: function (newVal, oldVal) {
 
+      this.searchData(newVal);
+    }
+  }
+  ,
   data() {
     return {
       BASE_URL: process.env.VUE_APP_BASE_API,
@@ -138,7 +143,7 @@ export default {
       options: regionDataPlus,
       inputQuery: {
         // customerId: null,
-        devCodeFk:null,
+        devCodeFk: null,
         companyName: null,
         contacts: null,
         mobile: null,
@@ -256,7 +261,7 @@ export default {
       companyApplyUpdateVisible: false,
       companyEditDisabled: true,
       companyEditButtonStr: "编辑",
-      addType: "1", //证书类型：1:供应商；2.生产企业；3.产品品种
+      addType: "1", //证书类型（1：资质证书；2：技术材料）
       checkFlag: {
         0: "草稿",
         1: "已通过",
@@ -272,31 +277,32 @@ export default {
       customerId: null,
 
     };
-  }
+  },
-  ,
   created() {
     console.log("第一次this.rowData:")
     console.log(this.rowData)
-    // if (this.editType == 1) {
+    // if (this.rowData.editType == 1) {
-      this.getDeviceCertList();
+    //   this.getDeviceCertList();
     // }
-
     this.getBasicUnitMaintainsList();
     this.headers = {
       ADMIN_ID: store.getters.adminId,
       ADMIN_TOKEN: store.getters.token,
     };
-    // this.inputQuery = this.inputEdit
+  },
-    // this.inputQuery = this.idQuery
-    // if (this.inputQuery.areaCode != null)
-    //   this.selectedOptions = this.inputQuery.areaCode.split(",");
-  }
-  ,
   components: {
-    draggable, companyAddCert, corpMaintainSelect, supCertSetSelectDialog, ElImageViewer
+    draggable, deviceAddCert, corpMaintainSelect, supCertSetSelectDialog, ElImageViewer
   }
   ,
   methods: {
+    searchData(query) {
+      console.log("完成！")
+      console.log(query)
+      this.idQuery = {...query}
+
+      this.getDeviceCertList();
+
+    },
     //预览照片
     showImgViewer(row) {
       this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
@@ -337,10 +343,10 @@ export default {
     ,
     //添加资质证书
     addCert(row) {
-      if (isBlank(this.inputQuery.customerId)) {
+      if (isBlank(this.inputQuery.devCodeFk)) {
-        return this.$message.error("请先选择供应商");
+        return this.$message.error("请先选择设备");
       }
-
+      console.log(this.inputQuery.devCodeFk)
       if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
         this.formName = 2
         this.inputQuery.formData = row;
@@ -379,8 +385,11 @@ export default {
       console.log("获取idQuery：")
       console.log(this.idQuery)
       this.certQuery.devCodeFk = this.idQuery.code;
-      console.log( "获取this.certQuery:")
+      this.inputQuery={...this.idQuery};
-      console.log( this.certQuery)
+      this.inputQuery.devCodeFk=this.idQuery.code;
+      console.log(this.inputQuery);
+      console.log("获取this.certQuery:")
+      console.log(this.certQuery)
       filterDeviceCert(this.certQuery)
         .then((response) => {
           this.certLoading = false;
@@ -393,7 +402,7 @@ export default {
         });
     },
 
-    deleteCompanyCert(row) {
+    deleteDeviceCert(row) {
       this.$confirm("是否删除?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -404,11 +413,11 @@ export default {
           id: row.id,
           filePath: row.filePath,
         };
-        deleteCompanyCert(tquery)
+        deleteDeviceCert(tquery)
           .then((response) => {
             this.certLoading = false;
             if (response.code === 20000) {
-              this.getCompanyCertList();
+              this.getDeviceCertList();
               this.$message({
                 type: "success",
                 message: "删除成功！",