修改bug

src/views/basic/corpMaintain/certList.vue

@@ -202,7 +202,7 @@
 </template>
 
 <script>
-import {filterMyAuth,batchAddAuth} from "@/api/sup/userCert";
+import {filterMyAuth,batchAddAuth,listYlqxzczh} from "@/api/sup/userCert";
 import {executeFuc, getHead} from "@/utils/customConfig";
 import ylqxzczhManuDialog from "./certDetail";
 
@@ -285,7 +285,7 @@ export default {
     getList() {
       this.filterQuery.corpId = this.inputQuery.corpId;
       this.loading = true;
-      filterMyAuth(this.filterQuery)
+      listYlqxzczh(this.filterQuery)
         .then((response) => {
           this.loading = false;
           if (response.code == 20000) {

src/views/improveInfo.vue

@@ -823,7 +823,7 @@ export default {
             }
             saveAllInfo(this.inputQuery)
               .then((res) => {
-                if (res.code = 20000) {
+                if (res.code == 20000) {
                   this.$message.success("提交成功");
                   this.getInfo();
                 } else {

src/views/stat/setAddDialog.vue

@@ -234,6 +234,7 @@ export default {
       query: {
        page: 1,
        limit: 10,
+        setFk: this.inputQuery.id,
       },
       selectedIndex: null,
       queryList:[],
@@ -250,29 +251,25 @@ export default {
       pickerOptions: {
         shortcuts: [
           {
-            text: "最近一周",
+            text: "本月",
             onClick(picker) {
               const end = new Date();
               const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              start.setDate(1);
+              end.setMonth(end.getMonth() + 1);
+              end.setDate(0);
               picker.$emit("pick", [start, end]);
             },
           },
           {
-            text: "最近一个月",
+            text: "下一个月",
             onClick(picker) {
               const end = new Date();
               const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              start.setMonth(start.getMonth() + 1);
-              picker.$emit("pick", [start, end]);
+              start.setDate(1);
-            },
+              end.setMonth(end.getMonth() + 2);
-          },
+              end.setDate(0);
-          {
-            text: "最近三个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
               picker.$emit("pick", [start, end]);
             },
           },
@@ -300,6 +297,9 @@ export default {
       return rowBackground;
     },
     getOrderDetails() {
+      if(!this.inputQuery.id){
+        return
+      }
       this.loading = true;
       listSetDetail(this.query) //查找该单号下的所有条码
         .then((response) => {
@@ -371,6 +371,7 @@ export default {
           this.$message.error("请先添加规则");
           return;
         }
+      this.relationId = this.inputQuery.id;
          this.productVisible = true;
     },
     findMethod(query) {

src/views/system/user/authUser.vue

@@ -3,17 +3,15 @@
     <el-card>
       <el-form :inline="true" :model="query" size="mini"  v-show="showSearch">
         <el-row>
-          <el-col :span="8">
             <el-form-item label="用户账号:">
               <el-input v-model="query.userName" placeholder="用户账号" clearable></el-input>
             </el-form-item>
-          </el-col>
+            <el-form-item label="用户名称:">
-          <el-col :span="8">
+              <el-input v-model="query.employeeName" placeholder="用户名称" clearable></el-input>
+            </el-form-item>
             <el-form-item label="所属部门:">
               <el-input v-model="query.deptName" placeholder="所属部门" clearable></el-input>
             </el-form-item>
-          </el-col>
-          <el-col :span="8">
             <el-form-item class="query-form-item" label="账号状态:">
               <el-select v-model="query.userFlag" placeholder="请选择账号状态:">
                 <el-option label="正常" value="1"></el-option>
@@ -21,7 +19,6 @@
                 <el-option label="全部" value=""></el-option>
               </el-select>
             </el-form-item>
-          </el-col>
         </el-row>
 
 <!--        <el-form-item label="用户名称:">-->

src/views/userManage/certDetail.vue

@@ -0,0 +1,337 @@
+<template>
+  <div>
+    <el-card>
+      <el-form  :model="inputQuery"  label-width="150px" >
+        <template v-for="(itemRow, indexRow) in fromList">
+          <el-row :gutter="20" class="el-row" type="flex">
+            <template v-for="(item, index) in itemRow.list">
+              <el-col :span="item.width" class="el-col" type="flex">
+                <div class="text item">
+                  <el-form-item v-if="item.columnType =='input'"  :rules="item.checkRulesObj" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-input
+                      v-model="inputQuery[item.columnName]"
+                      :style="item.style"
+                      :size="item.size"
+                      :type="item.inputType"
+                      :placeholder="item.columnDesc"
+                      :disabled="item.disabled"
+                      @input="executeFuc($event,'5',item.clickFuc)"
+                    ></el-input>
+                  </el-form-item>
+
+                  <el-form-item v-if="item.columnType =='radio'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-radio-group :style="item.style" v-model="inputQuery[item.columnName]">
+                      <el-radio
+                        v-for="dict in item.lableRuleObj"
+                        :key="parseInt(dict.value)"
+                        :label="parseInt(dict.value)"
+                        :disabled="item.disabled"
+                      >{{dict.label}}</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+
+                  <el-form-item v-if="item.columnType =='select'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-select      :disabled="item.disabled" v-model="inputQuery[item.columnName]" :style="item.style">
+                      <el-option
+                        v-for="dict in item.lableRuleObj"
+                        :key="dict.value"
+                        :label="dict.label"
+                        :value="dict.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType =='selectServer'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-select
+                     :style="item.style"
+                      v-model="inputQuery[item.columnName]"
+                      :placeholder="item.columnDesc"
+                      @change="executeFuc($event,'5',item.clickFuc)"
+                      :disabled="executeEval(null,item.disabledFuc,false) || item.disabled"
+                      filterable
+                      remote
+                      :remote-method="(query) => executeFuc(query,'5',item.dataFuc)"
+                      clearable>
+                      <el-option
+                        v-for="item in options[item.dataFuc]"
+                        :key="item.code"
+                        :label="item.label"
+                        :value="item.code"
+                      >
+                        <span style="float: left">{{ item.label }}</span>
+                        <span style="float: right; color: #8492a6; font-size: 13px">{{
+                            item.code
+                          }}</span>
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType =='date'"  :rules="item.checkRulesObj" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-date-picker
+                      v-model="inputQuery[item.columnName]"
+                      :style="item.style"
+                      value-format="yyyy-MM-dd"
+                      :disabled="item.disabled"
+                      type="date"
+                      :placeholder="item.columnDesc"
+                    ></el-date-picker>
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType =='treeCustom'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <treeselect
+                      v-model="inputQuery[item.columnName]"
+                      :options="menuOptions"
+                      :normalizer="normalizer"
+                      :show-count="true"
+                      :placeholder="item.columnName"
+                    />
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType =='custom'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <updateZz :inputQuery="inputQuery"
+                              :formName="formName"
+                    />
+                  </el-form-item>
+                </div>
+              </el-col>
+            </template>
+          </el-row>
+        </template>
+        <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
+        <el-button  @click="closeDialog">取消</el-button>
+         <el-button
+           type="primary"
+           @click.native="determine"
+         >通过</el-button
+         >
+       <el-button
+         type="primary"
+         @click.native="addCert"
+       >不通过</el-button
+       >
+      </div>
+      </el-form>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {saveYlqxzczh} from "@/api/purchase/supCert";
+import {getCertType} from "@/api/purchase/supCertType";
+import updateZz from "@/views/basic/manu/updateZz";
+import {filterCompanyCert,deleteCert,updateCert} from "@/api/sup/userCert";
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
+
+export default {
+  name: "companyPilotDialog",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    formName: {
+      type: Object,
+      required: true,
+    },
+    inputQuery: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      BASE_URL: process.env.VUE_APP_BASE_API,
+      tableHeader:[],
+      queryList:[],
+      fromList:[],
+      tableObj:[],
+      invList:[],
+      options: {
+        getCertTypeMethod:[],
+      },
+      uploadUrl: "",
+      fileList: [],
+      headers: {},
+      choiceFile: "选取文件",
+      option: {
+        img: this.inputQuery.filePath, // 裁剪图片的地址
+        info: false, // 裁剪框的大小信息(即是否显示裁剪框的宽高信息)
+        outputSize: 0.9, // 裁剪生成图片的质量(0.1~1之间)
+        outputType: 'jpeg', // 裁剪生成图片的格式(jpg(jpg 需要传入jpeg))
+        canScale: false, // 图片是否允许滚轮缩放(这个属性貌似没得用，不管设置true，false都可以滚轮缩放)
+        autoCrop: true, // 是否默认生成截图框
+        // 注：这里需要注意，如果是裁剪成圆形图片，那么截图框的宽高就是必须设置的，且最好宽高一样
+        autoCropWidth: 0, // 默认生成截图框宽度
+        autoCropHeight: 0, // 默认生成截图框高度
+        fixedBox: true, // 固定截图框大小 不允许改变
+        fixed: true, // 是否开启截图框宽高固定比例
+        fixedNumber: [1, 1], // 截图框的宽高比例(这是比例，按两个值的比值大小进行截图框的宽高的设置，[1,1]和[100,100]是一样的)
+        full: true, // 是否输出原图比例的截图
+        canMove: true, // 上传图片是否可以移动
+        canMoveBox: false, // 截图框能否拖动
+        original: false, // 上传图片按照原始比例渲染
+        centerBox: false, // 截图框是否被限制在图片里面
+        infoTrue: true // true 为展示真实输出图片宽高 false 展示看到的截图框宽高
+      },
+    }
+  },
+  methods: {
+    submitInv(){
+      if(this.formName==1){
+        saveYlqxzczh(this.inputQuery,"add").then((response) => {
+          if(response.code == 20000){
+            this.closeDialog();
+          }else{
+            this.$message.error(response.message);
+          }
+
+        })
+          .catch(() => {
+            this.$message.error("添加失败");
+          });
+      }else if(this.formName==2){
+        saveYlqxzczh(this.inputQuery,"edit").then((response) => {
+          if(response.code == 20000){
+            this.closeDialog();
+          }else{
+            this.$message.error(response.message);
+          }
+
+        })
+          .catch(() => {
+            this.$message.error("添加失败");
+          });
+      }
+    },
+    determine(){
+      this.$confirm("是否审核通过?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        let params ={
+          id:this.inputQuery.id,
+          checkStatus:1,
+          checkComment:"",
+          name:this.inputQuery.name,
+          createUser:this.$store.getters.name,
+          key:"key"
+        }
+        updateCert(params).then((res)=>{
+          if (res.code === 20000) {
+            this.$message.success("提交成功");
+            this.closeDialog();
+          }
+        })
+
+
+      }).catch(() => {
+      });
+    },
+    addCert(){
+      this.$prompt('请输入结果说明', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+      }).then(({value}) => {
+        let params ={
+          checkComment :value,
+          id:this.inputQuery.id,
+          checkStatus:2,
+          name:this.inputQuery.name,
+          createUser: this.$store.getters.name,
+          key:"key"
+        }
+        updateCert(params).then((res)=>{
+          if (res.code === 20000) {
+            this.$message.success("提交成功");
+            this.closeDialog();
+          }
+        })
+
+
+      }).catch(() => {
+      });
+    },
+
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
+    },
+    getCertTypeMethod(_this,query) {
+      _this.fromOptions = [];
+      let cQuery = {
+        searchKey: query,
+        page: 1,
+        limit: 10,
+      };
+      getCertType(cQuery)
+        .then((response) => {
+          _this.loading = false;
+          _this.options.getCertTypeMethod = response.data || [];
+        })
+        .catch(() => {
+          _this.loading = false;
+          _this.options.findMethod= [];
+        });
+    },
+    change(_this) {
+      var pinyin = require("pinyin");
+      var py = pinyin(_this.inputQuery.companyName, {
+        style: pinyin.STYLE_FIRST_LETTER, // 设置拼音风格
+        heteronym: true,
+      });
+      var str = "";
+      py.forEach((item) => {
+        str = str + item[0];
+      });
+      _this.inputQuery.spell = str;
+    },
+  },
+  components: {
+    updateZz
+  },
+  created() {
+    var type = "supcert";
+    if(this.formName == 3){
+      type = "supcert-auth";
+    }
+    this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file";
+    getHead(type,"1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+    });
+    this.getCertTypeMethod(this);
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/userManage/customerAddDialog.vue

@@ -129,21 +129,27 @@
         <!--              &lt;!&ndash;                            <el-button type="primary" size="mini" icon="search" @click="toViewCompanyCert"&ndash;&gt;-->
         <!--              &lt;!&ndash;                                       style="text-align:right"&ndash;&gt;-->
         <!--              &lt;!&ndash;                            >文件预览&ndash;&gt;-->
-        <!--              &lt;!&ndash;                            </el-button&ndash;&gt;-->
+        <!--              &lt;!&ndash;                            </el-button&ndash;&gt;--> <el-row >
+        <el-col :span="3">
+          <div class="ao-text">
+            <span>文件：</span>
+          </div>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item  prop="文件：">
+            <updateZz :inputQuery="inputQuery"
+                      :formName="editTye"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
         <!--              &lt;!&ndash;                            >&ndash;&gt;-->
 
         <!--            </el-form-item>-->
         <!--          </el-col>-->
         <!--        </el-row>-->
 
-        <el-row gutter="20" class="el-row" type="flex">
+
-          <el-col :span="11" class="el-col">
-            <el-form-item label="文件：" prop="filePath">
-              <cusEditor ref="editorRef" style="width:90vh;height: 100%;overflow: auto; " :content="formData.filePath"
-                         :type="`image2`"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
       </el-card>
     </el-form>
 
@@ -152,7 +158,9 @@
 
 <script>
 import draggable from "vuedraggable";
-import store from "@/store";
+import store from "../../store";
+import updateZz from "@/views/basic/manu/updateZz";
+import {isertCert, updateCert} from "../../api/sup/userCert";
 import {insertCompanyCert, updateCompanyCert} from "@/api/purchase/companyCert";
 import ElImageViewer from "element-ui/packages/image/src/image-viewer"
 import {lo} from "pinyin/data/dict-zi-web";
@@ -212,7 +220,8 @@ export default {
   },
   components: {
     draggable,
-    ElImageViewer
+    ElImageViewer,
+    updateZz
   },
   methods: {
     submitUpload() {
@@ -279,9 +288,8 @@ export default {
 
       if (this.formData.auditStatus != 1)
         this.formData.auditStatus = "6";
-      this.formData.filePath = this.$refs.editorRef.html
       if (this.editTye == 1) {
-        insertCompanyCert(this.formData).then(response => {
+        isertCert(this.formData).then(response => {
           this.loading = false;
           if (response.code === 20000) {
             this.$message.success("添加成功");
@@ -291,7 +299,7 @@ export default {
           }
         });
       } else {
-        updateCompanyCert(this.formData).then(response => {
+        updateCert(this.formData).then(response => {
           this.loading = false;
           if (response.code === 20000) {
             this.$message.success("添加成功");

src/views/userManage/customerManage.vue

@@ -625,8 +625,7 @@ export default {
       this.getCompanyCertList();
     },
     showImgViewer(row) {
-      let newWindow = window.open();
+      let newWindow = window.open(row.filePath);
-      newWindow.document.write(row.filePath)
       // this.certFileUrl =
       //   this.BASE_URL +
       //   "/udiwms/image/register/file/getImage?type=image2&name=";

src/views/userManage/customerUser.vue

@@ -303,11 +303,7 @@ export default {
           { validator: validatePass, trigger: "blur" },
         ],
         checkPassword: [
-          {
+
-            required: true,
-            message: "请再次输入密码",
-            trigger: "blur",
-          },
           { validator: validatePass2, trigger: "blur" },
         ],
       },

src/views/userManage/registerManage.vue

@@ -508,6 +508,25 @@
         ></pagination>
 
       </el-dialog>
+
+      <el-dialog
+        :title="formCertMap[formCertName]"
+        :visible.sync="orderMutiSetCertVisible"
+        :before-close="close"
+        width="60%"
+        v-if="orderMutiSetCertVisible"
+        @close='closeCertDialog'
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        :append-to-body="true"
+
+      >
+        <certDetail
+          :closeDialog="closeCertDialog"
+          :inputQuery="inputCertQuery"
+          :formName="formCertName"
+        ></certDetail>
+      </el-dialog>
       <pagination
         v-show="total>0"
         :total="total"
@@ -525,7 +544,6 @@
     />
 
 
-
   </div>
 </template>
 
@@ -534,6 +552,7 @@ import {selectReslist,NotApproved} from "@/api/auth/registComPer";
 import {filterCompanyCert,deleteCert,updateCert} from "@/api/sup/userCert";
 import { previewImage } from "@/api/purchase/supCompany";
 import ElImageViewer from "element-ui/packages/image/src/image-viewer";
+import certDetail from "./certDetail";
 
 import draggable from "vuedraggable";
 
@@ -542,6 +561,12 @@ import draggable from "vuedraggable";
 export default {
   data() {
     return {
+      formCertName: 3,
+      formCertMap: {
+        3: "资质详情",
+      },
+      inputCertQuery:{},
+      orderMutiSetCertVisible: false,
       formName: 1,
       formMap: {
         1: "注册企业详情",
@@ -651,6 +676,10 @@ export default {
       };
       this.getList();
     },
+    closeCertDialog(){
+      this.orderMutiSetCertVisible = false;
+      this.getCertList(this.query);
+    },
     onSubmit() {
       this.filterQuery.page = 1;
       this.getList();
@@ -681,8 +710,7 @@ export default {
     },
 
     showImgViewer(row) {
-      let newWindow = window.open();
+      let newWindow = window.open(row.filePath);
-      newWindow.document.write(row.filePath)
       // this.certFileUrl =
       //   this.BASE_URL +
       //   "/udiwms/image/register/file/getImage?type=image2&name=";
@@ -739,9 +767,12 @@ export default {
     },
 
     determine1(row){
-      this.details=true;
+      // this.details=true;
-      this.rowCertData=row;
+      // this.rowCertData=row;
-      console.log(this.rowCertData)
+      // console.log(this.rowCertData)
+      this.formCertName=3;
+      this.inputCertQuery=row
+      this.orderMutiSetCertVisible = true;
     },
 
     determine(){
@@ -918,7 +949,7 @@ export default {
 
   },
   components: {
-    ElImageViewer,
+    ElImageViewer,certDetail
   },
   filters: {
     statusFilterType(status) {