Merge remote-tracking branch 'origin/master'

src/views/inout/IoSupSearchOrder.vue

@@ -789,7 +789,7 @@ export default {
     printOrder(row) {
       let tQuery = {
         action: row.action,
-        moduleId: 1,
+        moduleId: 4,
       }
       this.loading = true;
       inspectionOrderPDFFromTemplateFile(tQuery).then((response) => {

src/views/purchase/cert/supCertAudit.vue

@@ -35,6 +35,13 @@
         <el-table-column label="统一社会信用号" prop="creditNum"></el-table-column>
         <el-table-column label="所属地区" prop="area"></el-table-column>
         <el-table-column label="详细地址" prop="detailAddr" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="生产企业状态" prop="auditStatus" width="120">
+          <template slot-scope="scope">
+            <span v-if="scope.row.failCout==0 && scope.row.passCout==0">未提交</span>
+            <span v-if="scope.row.failCout>0">未审核</span>
+            <span v-if="scope.row.failCout==0 && scope.row.passCout>0">已审核</span>
+          </template>
+        </el-table-column>
         <el-table-column label="审核状态" prop="auditStatus" width="120">
           <template slot-scope="scope">
             <el-tag :type="(scope.row.auditStatus) | statusFilterType">
@@ -131,6 +138,13 @@
         <el-table-column label="所在地区" prop="placeArea"></el-table-column>
         <el-table-column label="所在地址" prop="placeAddress" :show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="所属供应商" prop="supName" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="配送产品状态" prop="auditStatus" width="120">
+          <template slot-scope="scope">
+            <span v-if="scope.row.failCout==0 && scope.row.passCout==0">未提交</span>
+            <span v-if="scope.row.failCout>0">未审核</span>
+            <span v-if="scope.row.failCout==0 && scope.row.passCout>0">已审核</span>
+          </template>
+        </el-table-column>
         <el-table-column label="审核状态" prop="auditStatus" width="120">
           <template slot-scope="scope">
             <el-tag :type="(scope.row.auditStatus) | statusFilterType">
@@ -412,6 +426,17 @@ export default {
       };
       return statusMap[status];
     },
+    manufacturerStatusType(passCount,failCout) {
+      const statusMap = {
+        0: "warning",
+        1: "success",
+        2: "danger",
+        6: "warning",
+        3: "warning",
+      };
+      return statusMap[status];
+    },
+
     statusFilterName(status) {
       const statusMap = {
         0: "禁用",
@@ -444,6 +469,7 @@ export default {
     },
     getList() {
       this.loading = true;
+      this.filterQuery.manufacturerStatus=1;
       getSupComapnys(this.filterQuery)
         .then((response) => {
           console.log(response)
@@ -536,6 +562,7 @@ export default {
     },
     getManufacturerList() {
       this.manufacturerLoading = true;
+      this.filterManufacturerQuery.productStatus=1;
       getCompanyList(this.filterManufacturerQuery)
         .then((response) => {
           this.manufacturerLoading = false;

src/views/purchase/company/supCompanyAduditDialog.vue

@@ -139,6 +139,7 @@
 
         <el-table v-loading="certLoading" :data="certList" ref="certTable" style="width: 100%" border
                   highlight-current-row>
+          <el-table-column type="selection" width="55"></el-table-column>
           <el-table-column type="index" label="序号" width="50"></el-table-column>
           <el-table-column label="证书名称" prop="name"></el-table-column>
           <el-table-column label="证书编号" prop="code"></el-table-column>

src/views/supplier/products/selectDIDetailDialog.vue

@@ -2,6 +2,22 @@
     <div>
         <el-card>
             <el-form :model="editQuery" :rules="rules" ref="editQuery"   label-width="150px" style="margin-top: 20px" >
+
+              <el-row v-if="editQuery.isAudit==2" type="flex" justify="end">
+                <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px;margin-top: -10px">
+                  <el-button type="primary" @click="checkPass(2)">通过</el-button>
+                  <el-button type="primary" @click="checkPass(3)">不通过</el-button>
+                </el-button-group>
+              </el-row>
+
+              <el-row v-if="editQuery.isAudit==2">
+                <el-col :span="12">
+                  <el-form-item label="审核意见:">
+                    <el-input style="width: 90%"  size="small" splaceholder="请输入审核意见" v-model="remark"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
                 <el-collapse v-model="activeNames">
                     <el-collapse-item name="1">
                         <template slot="title">
@@ -204,6 +220,8 @@
 
 <script>
 
+import { updateDiProduct } from '@/api/supplier/supProductsAddDi'
+
 export default {
     name: "SelectDIDetailDialog",
     props: {
@@ -211,13 +229,44 @@ export default {
             type: Object,
             required: true,
         },
+      close:{
+          type:Function,
+          required: true,
+      },
+      editDate: {
+        type: Object,
+        required: true,
+      },
     },
     data() {
         return {
-            activeNames: ['1']
+            activeNames: ['1'],
+            remark:"",
         }
     },
-    methods: {},
+    methods: {
+
+      checkPass(val) {
+        let query = {
+          id: this.editDate.id,
+          status: val,
+          uuid: this.editDate.uuid,
+          customerId: this.editDate.customerId,
+          remark: this.remark
+        }
+        updateDiProduct(query).then((res) => {
+          if (res.code === 20000) {
+          this.close();
+          } else {
+            this.$message.error(res.message)
+          }
+        }).catch((error) => {
+          this.$message.error(error.message)
+        })
+      },
+
+
+    },
 
     created() {
     },

src/views/supplier/products/supDiProductsCheck.vue

@@ -83,9 +83,9 @@
         <el-table-column label="审核意见" prop="remark" show-overflow-tooltip></el-table-column>
         <el-table-column label="操作" >
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click.native.stop="detailDialog(scope.row)">详情</el-button>
+            <el-button type="text" size="small" @click.native.stop="detailDialog(scope.row,1)">详情</el-button>
             <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)" :disabled="scope.row.status==2">删除</el-button>
-            <el-button type="text" size="small" :disabled="scope.row.status==2" @click="checDialog(scope.row)">审核</el-button>
+            <el-button type="text" size="small" :disabled="scope.row.status==2" @click="detailDialog(scope.row,2)">审核</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -101,24 +101,30 @@
     <el-dialog
       :close-on-click-modal="false"
       :close-on-press-escape="false"
-      title="产品信息详情"
+      :title=title
       :visible.sync="thrProductsDiDetailVisible"
       width="60%"
       v-if="thrProductsDiDetailVisible"
     >
-      <selectDiDetail :editQuery="thisData"></selectDiDetail>
+      <selectDiDetail
+        :editQuery="thisData"
+        :editDate="editDate"
+        :close="close"
+      >
+      </selectDiDetail>
     </el-dialog>
 
     <el-dialog
       :close-on-click-modal="false"
       :close-on-press-escape="false"
-      title="产品信息详情"
+      :title=title
       :visible.sync="thrProductsDetailVisible"
       width="80%"
       v-if="thrProductsDetailVisible"
     >
       <thrProductsDetail
         :data="thisDetail"
+        :close="close"
       ></thrProductsDetail>
     </el-dialog>
     <el-dialog
@@ -173,6 +179,8 @@ export default {
       },
       total: 0,
       list: [],
+      title:null,
+      editDate:null,
       thisDetail:null,
       uploadFileUrl: null,
       fileList: [],
@@ -218,6 +226,11 @@ export default {
       this.remark = ''
       this.curRow = row
     },
+    close(){
+      this.thrProductsDiDetailVisible=false;
+      this.thrProductsDetailVisible=false;
+      this.getList();
+    },
     search() {
       this.filterQuery.page = 1
       this.getList()
@@ -267,19 +280,29 @@ export default {
         .catch(() => {
         })
     },
-    detailDialog(row) {
+    detailDialog(row,type) {
+      if(type==1){
+        this.title="产品信息详情"
+      }else{
+        this.title="产品信息审核"
+      }
+
       if(row.type==1){
         let query = { uuid: row.uuid }
         getDiProductDetail(query).then((res) => {
           if (res.code === 20000) {
             this.thisData = res.data
+            this.editDate=row
+            this.thisData.isAudit=type
             this.thrProductsDiDetailVisible = true
           } else {
             this.$message.error('参数错误')
           }
         })
       }else{
+        debugger
         this.thisDetail = row;
+        this.thisDetail.isAudit=type
         this.thrProductsDetailVisible = true;
       }
     },

src/views/supplier/products/supProductsDetail.vue

@@ -3,6 +3,14 @@
         <el-card class="el-card">
             <div v-if="!isImport" style="margin-bottom: 20px">
               <el-form :model="data" size="mini" label-width="150px">
+
+                <el-row v-if="data.isAudit==2" type="flex" justify="end">
+                  <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px;margin-top: -10px">
+                    <el-button type="primary" @click="checkPass(2)">通过</el-button>
+                    <el-button type="primary" @click="checkPass(3)">不通过</el-button>
+                  </el-button-group>
+                </el-row>
+
                 <div style="margin-bottom: 20px">
                   <el-row>
                     <el-col :span="12" class="el-col">
@@ -95,10 +103,16 @@
                     </el-col>
                   </el-row>
 
-                  <el-row>
-                    <el-col :span="23" class="el-col" style="margin-top: 12px">
+
+                  <el-row v-if="data.isAudit==2">
+                    <el-col :span="12">
+                      <el-form-item label="审核意见:">
+                        <el-input style="width: 90%"  size="small" splaceholder="请输入审核意见" v-model="remark"></el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12" class="el-col" style="margin-top: 12px">
                       <el-form-item label="产品描述:">
-                        <el-input style="width: 100%" :disabled="true" type="textarea" size="mini" rows="4" placeholder="请输入内容" v-model.trim="data.cpms"></el-input>
+                        <el-input style="width: 90%" :disabled="true" type="textarea" size="mini" rows="1" placeholder="请输入内容" v-model.trim="data.cpms"></el-input>
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -110,6 +124,8 @@
 </template>
 
 <script>
+import { updateDiProduct } from '@/api/supplier/supProductsAddDi'
+
 export default {
     name: "ThrProductsDetail",
     props: {
@@ -117,7 +133,40 @@ export default {
             type: Object,
             required: true,
         },
+      close:{
+        type:Function,
+        required: true,
+      },
+    },
+  data() {
+    return {
+      remark:"",
+    }
+  },
+  methods: {
+
+    checkPass(val) {
+      let query = {
+        id: this.data.id,
+        status: val,
+        uuid: this.data.uuid,
+        customerId: this.data.customerId,
+        remark: this.remark
+      }
+      updateDiProduct(query).then((res) => {
+        if (res.code === 20000) {
+          this.close();
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch((error) => {
+        this.$message.error(error.message)
+      })
     },
+
+
+  },
+
 }
 </script>