监管端 bug 修改

src/api/sup/userCert.js

@@ -14,8 +14,8 @@ export function listYlqxzczh(query) {
 export function saveYlqxzczh(data, formName, method = "post") {
   let url =
     formName !== "edit"
-      ? "/user/cert/save"
+      ? "/sup/info/insertCompanyCert"
-      : "/user/cert/edit";
+      : "/sale/sup/cert/audit";
   return request({
     url: url,
     method: method,

src/views/basic/corpMaintain/corpMaintain.vue

@@ -117,7 +117,7 @@
       <el-divider style="margin: 15px"></el-divider>
 
 
-      <el-table v-loading="loading" :data="list" border highlight-current-row>
+      <el-table v-loading="loading" :data="list" border highlight-current-row @current-change="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)">
 <!--        <el-table-column label="序号" type="index" width="50"></el-table-column>-->
 <!--        <el-table-column label="注册企业" prop="companyName" width="230"></el-table-column>-->
 <!--        <el-table-column label="往来单位" prop="name" width="230"></el-table-column>-->
@@ -202,10 +202,10 @@
                          :size="buttonItem.size"
                          :style="buttonItem.style"
                          :key="buttonItem"
-                         v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
+                         v-if="executeEval(scope.row,buttonItem.hasPermi,true) && buttonItem.name !== '资质证书'"
                          :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
                          @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
-              >{{ buttonItem.name }}
+              >{{ buttonItem.name}}
               </el-button>
             </template>
           </el-table-column>
@@ -222,10 +222,31 @@
               <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
             </template>
           </el-table-column>
+
+
+
+          <el-table-column
+            v-if="item.columnType == 'num' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}" v-if="scope.row[item.columnName] == 0 || scope.row[item.columnName] == null ">
+                <el-tag  type="danger">未上传证书</el-tag>
+              </span>
+              <el-tag v-else type="success">证书数量:{{ scope.row[item.columnName]}}</el-tag>
+
+            </template>
+          </el-table-column>
         </template>
       </el-table>
 
 
+
       <pagination
         v-show="total>0"
         :total="total"
@@ -458,7 +479,22 @@
 
 
 
-
+      <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"
+      >
+        <ylqxzczhManuDialog
+          :closeDialog="closeCertDialog"
+          :inputQuery="inputCertQuery"
+          :formName="formCertName"
+        ></ylqxzczhManuDialog>
+      </el-dialog>
 
       <el-dialog
         :title="formAuthName"
@@ -477,7 +513,188 @@
           :formName="formAuthName"
         ></certList>
       </el-dialog>
+
+
     </el-card>
+    <el-tabs type="border-card" style="margin: 15px">
+      <el-tab-pane>
+        <span slot="label">企业资质</span>
+        <el-form  v-if="queryList2 && queryList2.length > 0"   :inline="true" :model="bizQuery" class="query-form" size="mini">
+          <el-row style=" display:flex;  flex-wrap: wrap; ">
+            <template v-for="(item, index) in queryList2" >
+              <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+                <el-input
+                  v-model="bizQuery[item.columnName]"
+                  :placeholder="item.columnDesc"
+                  :disabled="executeEval(null,item.disabledFuc,false)"
+                  @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+                <el-select v-model="bizQuery[item.columnName]"
+                           :placeholder="item.columnDesc"
+                           :disabled="executeEval(null,item.disabledFuc,false)"
+                           clearable>
+                  <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' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+                <el-select
+                  v-model="bizQuery[item.columnName]"
+                  :placeholder="item.columnDesc"
+                  @change="executeFuc($event,'5',item.checkRules)"
+                  :disabled="executeEval(null,item.disabledFuc,false)"
+                  filterable
+                  remote
+                  :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
+                  clearable>
+                  <el-option
+                    v-for="item in options[item.clickFuc]"
+                    :key="item.code"
+                    :label="item.label"
+                    :value="item.code"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+                <el-date-picker
+                  :picker-options="pickerOptions"
+                  v-model="actDateRange"
+                  type="daterange"
+                  format="yyyy 年 MM 月 dd 日"
+                  value-format="yyyy-MM-dd"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                ></el-date-picker>
+              </el-form-item>
+              <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+                <el-date-picker
+                  v-model="bizQuery[item.columnName]"
+                  :style="`width:${item.width+'px'}`"
+                  value-format="yyyy-MM-dd"
+                  :disabled="executeEval(null,item.disabledFuc,false)"
+                  type="date"
+                  :placeholder="item.columnDesc"
+                ></el-date-picker>
+              </el-form-item>
+            </template>
+          </el-row>
+        </el-form>
+        <div class="top-right-btn">
+          <el-button-group style="display:flex;">
+            <el-button type="primary" icon="el-icon-refresh" @click="onBizReset">重置</el-button>
+            <el-button type="primary" icon="el-icon-search" @click="onBizSubmit">查询</el-button>
+            <el-button type="primary" icon="el-icon-plus"  @click="addOrderMutiAuth()">选入资质证书</el-button>
+            <el-button type="primary" icon="el-icon-plus"  @click="addOrderMutiCert()">新增资质证书</el-button>
+          </el-button-group>
+        </div>
+        <el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
+                  row-key="id"
+        >
+          <template v-for="(item, index) in tableHeader2">
+            <el-table-column
+              v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
+              type="index" :label="item.columnDesc"></el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'selection'"
+              type="selection"
+              :width="item.width"
+              :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
+            ></el-table-column>
+
+            <el-table-column
+              v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template  slot-scope="scope">
+                <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template   slot-scope="scope">
+                <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template   slot-scope="scope">
+                <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                  <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
+                </el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :width="item.width"
+              :key="item.columnName"
+              fixed="right"
+            >
+              <template slot-scope="scope">
+                <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
+                           :type="buttonItem.type"
+                           :size="buttonItem.size"
+                           :style="buttonItem.style"
+                           :key="buttonItem"
+                           v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
+                           :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
+                           @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
+                >{{ buttonItem.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template slot-scope="scope">
+                <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+              </template>
+            </el-table-column>
+          </template>
+        </el-table>
+        <pagination
+          v-show="bizTotal>0"
+          :total="bizTotal"
+          :page.sync="bizQuery.page"
+          :limit.sync="bizQuery.limit"
+          @pagination="getBizDetailList"
+        />
+      </el-tab-pane>
+    </el-tabs>
   </div>
 </template>
 
@@ -497,10 +714,11 @@ import {findConfig} from "@/api/sync/spsSyncStatus";
 import {getSupComapnys, previewImage} from "@/api/purchase/supCompany";
 import {deleteCompanyCert, filterCompanyCert} from "@/api/purchase/companyCert";
 import companyAddCert from "@/views/purchase/cert/supCertAddDialog.vue";
-import {getUUID} from "@/utils/strUtil";
+import {getUUID,isBlank} from "@/utils/strUtil";
 import {getCompanyList} from "@/api/purchase/supManufacturer";
 import {executeFuc, getHead} from "@/utils/customConfig";
 import certList from "./certList";
+import ylqxzczhManuDialog from "./certDialog";
 
 var pinyin = require("pinyin");
 
@@ -530,6 +748,20 @@ export default {
         0:"供应商信息",
         1:"客户信息"
       },
+      bizQuery: {
+        page: 1,
+        limit: 10
+      },
+      codeQuery: {
+        page: 1,
+        limit: 10
+      },
+      formCertName: 1,
+      formCertMap: {
+        1: "新增资质",
+        2: "编辑资质",
+        3:"客户资质维护"
+      },
       inputAuthQuery:{},
       orderMutiSetAuthVisible: false,
       BASE_URL: process.env.VUE_APP_BASE_API,
@@ -544,6 +776,8 @@ export default {
         page: 1,
         limit: 10,
       },
+      orderMutiSetCertVisible: false,
+      inputCertQuery:{},
       cuStatus: 0,
       imgViewerVisible: false,
       imgList: [],
@@ -565,6 +799,9 @@ export default {
         page: 1,
         limit: 20,
       },
+      tableHeader2: [],
+      queryList2 : [],
+      fromList2 : [],
       checkFlag: {
         0: "草稿",
         1: "已通过",
@@ -663,7 +900,12 @@ export default {
       defaultSys: null,
       companyIdFk: null,
       configParms: {},
-
+      bizDetailLoading:false,
+      bizTotal: 0,
+      bizDetailList: [],
+      currentRow: {
+        companyIdFk: ""
+      },
     };
   },
 
@@ -845,6 +1087,7 @@ export default {
       }).catch(() => {
       });
     },
+
     showImgViewer(row) {
       let newWindow = window.open();
       newWindow.document.write(row.filePath)
@@ -963,7 +1206,6 @@ export default {
         }
       });
     },
-
     deleteUnit(data) {
       this.loading = true;
       let tquery = {
@@ -1003,7 +1245,65 @@ export default {
         this.$message.error("添加失败！");
       }
     },
+    getBizDetailList() {
+      console.log("hshhhshhshshhshshs")
+      if (isBlank(this.currentRow.companyIdFk)) {
+        this.$message.error("请先选择用户！")
+        return;
+      }
+      this.bizDetailLoading = true;
+      this.bizQuery.companyIdFk = this.currentRow.companyIdFk;
+      filterCompanyCert(this.bizQuery).then((res) => {
+        this.bizDetailLoading = false;
+        if (res.code === 20000) {
+          this.bizDetailList = res.data.list || [];
+          this.bizTotal = res.data.total || 0;
+        } else {
+          this.$message.error(res.message);
+          this.bizDetailList = [];
+          this.bizTotal = 0;
+        }
+      }).catch((error) => {
+        this.bizDetailLoading = false;
+        this.$message.error(error.message);
+        this.bizDetailList = [];
+        this.bizTotal = 0;
+      })
+    },
+
+    onBizReset() {
+      this.bizQuery = {
+        page: 1,
+        limit: 10
+      };
+      this.getBizDetailList();
+    },
+    onBizSubmit() {
+      this.bizQuery.page = 1;
+      this.getBizDetailList();
+    },
 
+    addOrderMutiAuth(){
+      if (isBlank(this.currentRow.companyIdFk)) {
+        this.$message.error("请先选择用户！")
+        return;
+      }
+      this.inputAuthQuery={
+        companyIdFk:this.currentRow.companyIdFk
+      }
+      this.orderMutiSetAuthVisible = true;
+    },
+    addOrderMutiCert(){
+      if (isBlank(this.currentRow.companyIdFk)) {
+        this.$message.error("请先选择用户！")
+        return;
+      }
+      this.inputCertQuery={
+        companyIdFk:this.currentRow.companyIdFk
+      }
+      this.formCertName=1;
+      this.orderMutiSetCertVisible = true;
+    },
 
     handleModifyClick(row) {
       this.editDialogVisible = true;
@@ -1030,6 +1330,7 @@ export default {
     },
     closeAuthDialog(){
       this.orderMutiSetAuthVisible = false;
+      this.getBizDetailList();
       this.getList();
     },
     detailOrderMutiAuth(_this,row){
@@ -1050,14 +1351,55 @@ export default {
       this.selectSingleUnitVisible = true;
     },
 
-    handleSelectionChange(val) {
+    editCertDialog(_this,row){
-      this.multipleSelection = val;
+      _this.formCertName=2;
+      console.log("dangqianduixxiag",row)
+      _this.inputCertQuery=row
+      _this.orderMutiSetCertVisible = true;
+    },
+    closeCertDialog(){
+      this.orderMutiSetCertVisible = false;
+      this.getBizDetailList();
+      this.getList();
+    },
+    deleteCertDialog(_this,row) {
+      _this.$confirm("确认删除吗?", "提示", {
+        type: "warning",
+      })
+        .then(() => {
+          deleteCompanyCert(row)
+            .then((response) => {
+              if(response.code == 20000){
+                _this.getBizDetailList()
+                _this.getList()
+              }else{
+                _this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+              _this.$message.error(response.message);
+            });
+        });
     },
-
     handleCurrentChange(val) {
       this.query.page = val.page;
       this.getList();
     },
+    handleSelectionChange(_this,val) {
+      console.log("ddddddddddddddddddddddddddddd",val)
+      this.multipleSelection = val;
+      if(val){
+        _this.currentRow.companyIdFk = val.id;
+        _this.getOrderDetails();
+      }
+    },
+    // 获取单据 业务详情、扫码详情、扫码明细
+    getOrderDetails() {
+      this.bizQuery.page = 1;
+      this.codeQuery.page = 1;
+
+      this.getBizDetailList();
+    },
     getBasicThirdSys() {
       let query = {
         enabled: null,
@@ -1074,7 +1416,6 @@ export default {
     },
 
     getThirdSysDetail() {
-
       let query = {};
 
       if (this.formName == "update") {
@@ -1160,10 +1501,13 @@ export default {
   ,
   components: {
     companyAddCert,
-    selectUnit, selectSingleUnit,certList
+    selectUnit, selectSingleUnit,certList,ylqxzczhManuDialog
   }
   ,
   created() {
+
+    console.log("shayebushuo l xianda yin chu zhege ba ",this.inputQuery)
+    console.log("shayebushuo l xianda yin chu zhege leixing ",this.editType)
     getHead("corpMaintain","1").then((re) => {
       // 处理返回的数据
       this.tableObj = re.data;
@@ -1172,6 +1516,14 @@ export default {
       this.fromList = re.data.fromList;
       this.getList()
     });
+
+    getHead("client-usercert","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj2 = re.data;
+      this.tableHeader2 = re.data.tableList;
+      this.queryList2 = re.data.queryList;
+      this.fromList2 = re.data.fromList;
+    });
     //this.getSyncConfig();
     //this.getBasicThirdSys();
     if (this.editType == 0) {
@@ -1240,4 +1592,7 @@ export default {
   margin-top: 15px;
   /*transition: all .5s;*/
 }
+.two {
+  margin-top: 80px;
+}
 </style>

src/views/basic/manu/updateZz.vue

@@ -8,7 +8,7 @@
             ({{ imgList.length }})
           </el-button>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="6" v-if="formName !== 3">
           <cropperFile
             @getCropFile="getCropFile"
           ></cropperFile>

src/views/components/cropperFile.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="upfile">
     <div>
-      <el-button type="primary" icon="el-icon-plus"  size="small" @click="getCropImg">新增资质文件</el-button>
+      <el-button type="primary" icon="el-icon-plus"  size="small" @click="getCropImg">新增资质图片</el-button>
     </div>
     <!--    <div v-else class="addFileImg">-->
     <!--      <img :src="imgBase64">-->

src/views/udi/trace/auto/setAddDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-     <el-form  :model="inputQuery"  label-width="120px" >
+     <el-form  :model="inputQuery"  label-width="120px" :rules="rules" ref="inputQuery">
     <el-card>
       <el-row>
         <div style="margin: 0px 60px 10px auto; height: 35px;  float: right;">

src/views/userManage/registerManage.vue

@@ -189,7 +189,7 @@
 
           <el-row>
             <el-col :span="11">
-              <el-form-item label="有效期:" prop="vailDate">
+              <el-form-item label="生效日期:" prop="vailDate">
                 <el-input
                   size="small"
                   v-model="rowCertData.vailDate"
@@ -200,7 +200,7 @@
             </el-col>
 
             <el-col :span="11">
-              <el-form-item label="失效期:" prop="expireDate">
+              <el-form-item label="有效期至:" prop="expireDate">
                 <el-input
                   size="small"
                   v-model="rowCertData.expireDate"
@@ -457,8 +457,8 @@
             ></el-table-column>
             <el-table-column label="证书名称" prop="name" width="120"></el-table-column>
             <el-table-column label="证书编号" prop="code" width="120"></el-table-column>
-            <el-table-column label="有效期" prop="vailDate" width="120"></el-table-column>
+            <el-table-column label="生效日期" prop="vailDate" width="120"></el-table-column>
-            <el-table-column label="失效期" prop="expireDate" width="120"></el-table-column>
+            <el-table-column label="有效期至" prop="expireDate" width="120"></el-table-column>
             <el-table-column label="确认状态" prop="checkStatus" width="120">
               <template slot-scope="scope">
                 <el-tag :type="scope.row.checkStatus | statusFilterType">
@@ -501,8 +501,7 @@
                 <!--&gt;预览</el-button-->
                 <!--&gt;-->
 
-                <el-button type="primary" icon="el-icon-view" size="small" @click="showImgViewer(scope.row)">资质图片预览
+                <el-button   type="text" size="small" @click="showImgViewer(scope.row)">资质图片预览
-                  ({{ imgList.length }})
                 </el-button>
               </template>
             </el-table-column>