Merge branch 'material-ui' into dev-sy-11-8

src/views/material/purchase/goodsAccept/detail.vue

@@ -11,7 +11,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="机具厂家："  prop="supplierId">
+        <!-- <el-form-item label="机具厂家："  prop="supplierId">
           <el-select v-model="queryParams.supplierId" placeholder="请选择机具厂家" clearable>
             <el-option
               v-for="dict in supplierList"
@@ -20,7 +20,7 @@
               :value="dict.value"
             />
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="出厂日期："  prop="productionTime"> 
             <el-date-picker 
                 v-model="queryParams.productionTime"
@@ -87,13 +87,12 @@
         <el-table-column label="验收结论" align="center" prop="checkResult" :show-overflow-tooltip="true"/>
         <el-table-column label="操作" align="center" width="180">
             <template slot-scope="scope">
-                <!-- <el-button size="mini" type="success">
+                <el-button size="mini" type="success">
                     合格
                 </el-button>
                 <el-button size="mini" type="danger">
                     不合格
-                </el-button> -->
+                </el-button>
-                    
             </template>
         </el-table-column>
       </el-table>

src/views/material/purchase/goodsEntry/detail.vue

@@ -11,7 +11,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="机具厂家："  prop="supplierId">
+      <!-- <el-form-item label="机具厂家："  prop="supplierId">
         <el-select v-model="queryParams.supplierId" placeholder="请选择机具厂家" clearable>
           <el-option
             v-for="dict in supplierList"
@@ -20,7 +20,7 @@
             :value="dict.value"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="出厂日期："  prop="productionTime"> 
           <el-date-picker 
               v-model="queryParams.productionTime"
@@ -44,7 +44,7 @@
                   size="mini"
                   icon="el-icon-back"
                   @click="jumpList"
-                  >新购到货验收</el-button
+                  >新购到货入库</el-button
               >
           </el-col>
 
@@ -53,7 +53,7 @@
                   type="success" 
                   icon="el-icon-check" v-show="!isView"
                   size="mini" :disabled="multiple"
-              >合格</el-button>
+              >入库</el-button>
           </el-col>
 
           <el-col :span="1.5">
@@ -61,7 +61,7 @@
                   type="danger" 
                   icon="el-icon-close" v-show="!isView"
                   size="mini" :disabled="multiple"
-              >不合格</el-button>
+              >驳回</el-button>
           </el-col>
       </el-row>
 
@@ -70,25 +70,29 @@
       <el-table-column label="序号" align="center" width="80" type="index">
         
       </el-table-column>
-      <el-table-column label="物资名称" align="center" prop="maTypeName" />
+      <el-table-column label="物资名称" align="center" prop="maTypeName" :show-overflow-tooltip="true"/>
-      <el-table-column label="规格型号" align="center" prop="typeName" />
+      <el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true"/>
-      <el-table-column label="单位" align="center" prop="unitName"/>
+      <el-table-column label="单位" align="center" prop="unitName" :show-overflow-tooltip="true"/>
-      <el-table-column label="采购数量" align="center" prop="purchaseNum" />
+      <el-table-column label="采购数量" align="center" prop="purchaseNum" :show-overflow-tooltip="true"/>
-      <el-table-column label="购置单价(元含税)" align="center" prop="purchaseTaxPrice" />
+      <el-table-column label="购置单价(元含税)" align="center" prop="purchaseTaxPrice" :show-overflow-tooltip="true"/>
-      <el-table-column label="购置单价（元不含税）" align="center" prop="purchasePrice" />
+      <el-table-column label="购置单价（元不含税）" align="center" prop="purchasePrice" :show-overflow-tooltip="true"/>
-      <el-table-column label="供应商" align="center" prop="supplierName" />
+      <!-- <el-table-column label="供应商" align="center" prop="supplierName" /> -->
-      <el-table-column label="出厂日期" align="center" prop="productionTime" />
+      <el-table-column label="是否未固定资产" align="center" prop="fixCodeStr" :show-overflow-tooltip="true"/>
-      <el-table-column label="相关配套资料" align="center" prop="" />
+      <el-table-column label="出厂日期" align="center" prop="productionTime" :show-overflow-tooltip="true"/>
-      <el-table-column label="验收结论" align="center" prop="checkResult" />
+      <el-table-column label="相关配套资料" align="center" prop="" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <div style="color: rgb(2, 167, 240);cursor: pointer;" @click="openFileDialog(scope.row)">报告管理</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="验收结论" align="center" prop="checkResult" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" width="180">
           <template slot-scope="scope">
               <el-button size="mini" type="success">
-                  合格
+                  入库
               </el-button>
               <el-button size="mini" type="danger">
-                  不合格
+                  驳回
               </el-button>
-                  
           </template>
       </el-table-column>
     </el-table>
@@ -101,13 +105,59 @@
       @pagination="getList"
     /> -->
 
+    <el-dialog title="报告管理" :visible.sync="open" width="900px" append-to-body> 
+      <el-table v-loading="dialogLoading" :data="fileDataList" width="100%" height="350px">
+          <el-table-column label="序号" type="index" width="55" align="center"/>
+          <el-table-column label="报告类型" align="center" prop="dictLabel" :show-overflow-tooltip="true"/>
+          <el-table-column label="文件名称" align="center" prop="name" :show-overflow-tooltip="true"/>
+          <el-table-column label="类型名称" align="center" :show-overflow-tooltip="true">
+            <template>
+              <div>{{this.rowData.maTypeName}}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="规格型号" align="center" :show-overflow-tooltip="true">
+            <template>
+              <div>{{this.rowData.typeName}}</div>
+            </template>
+          </el-table-column>
+          <!-- <el-table-column label="报告日期" align="center" prop="orgName" :show-overflow-tooltip="true"/>
+          <el-table-column label="截止有效期" align="center" prop="orgName" :show-overflow-tooltip="true"/> -->
+          <el-table-column label="操作" align="center" width="100">
+          <template slot-scope="scope">
+            <div style="display: flex;align-items: center;justify-content: center;">
+              <el-upload ref="upload" :limit="1" :headers="upload.headers" v-show="!isView"
+                :action="upload.url" :show-file-list="false" accept=".png, .jpg, .jpeg, .pdf, .doc, .docx"
+                :on-success="handleFileSuccess"   :auto-upload="true"
+              >
+                <el-button size="mini" type="text" @click="beforeFileUpload(scope.row)">
+                      上传
+                </el-button>
+              </el-upload>
+              
+              <el-button size="mini" type="text" @click="picturePreview(scope.row)" v-if="scope.row.url" style="margin-left: 10px;">
+                  查看
+              </el-button>
+            </div>
+           
+                  
+          </template>
+      </el-table-column>
+      </el-table>
+    </el-dialog>
+
+     <!-- 图片查看弹窗 -->
+    <el-dialog :visible.sync="dialogVisible" width="500px" height="500px" >
+      <img width="100%" height="500px" :src="dialogImageUrl"  />
+    </el-dialog>
+
+
   </div>
 </template> 
 
 <script>
 import { getDeviceType} from "@/api/ma/device";
 import { getManufacturerSelect} from "@/api/ma/supplier";
-import { getPurchaseDetailsList } from "@/api/purchase/goodsAccept";
+import { getPurchaseDetailsList,getPurchaseFileList,uploadPurchaseFile } from "@/api/purchase/goodsAccept";
 import { downloadFile } from '@/utils/download'
 import { getToken } from '@/utils/auth'
 export default {
@@ -118,6 +168,7 @@ export default {
       taskId:'',
       // 遮罩层
       loading: false,     
+      dialogLoading: false,     
       isView: false,     
       // 非单个禁用
       single: true,
@@ -133,11 +184,19 @@ export default {
       total: 0, 
       //表格数据
       tableList: [], 
+      fixCodeList:["否","是"],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
       rowData:{},
+      fileDataList: [
+        {dictLabel:"合格证",fileType:"0",name:"",url:""},
+        {dictLabel:"型式试验报告",fileType:"1",name:"",url:""},
+        {dictLabel:"出厂检测报告",fileType:"2",name:"",url:""},
+        {dictLabel:"第三方监测报告",fileType:"3",name:"",url:""},
+        {dictLabel:"其他报告",fileType:"4",name:"",url:""},
+      ], 
       // 查询参数
       queryParams: {
         // pageNum: 1,
@@ -146,6 +205,16 @@ export default {
         supplierId:undefined,
         productionTime:undefined,
       },
+       //图片查看弹窗
+      dialogImageUrl: '',
+      dialogVisible: false,
+      //上传
+      upload: {
+        // 设置上传的请求头部
+        headers: { Authorization: 'Bearer ' + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + '/file/upload'
+      },
     };
   },
   mounted() {
@@ -162,6 +231,7 @@ export default {
       }
       this.getDeviceType()
       this.getSupplierList()
+     
       console.log(this.isView)
       this.getList()
   },
@@ -200,6 +270,9 @@ export default {
           this.queryParams.taskId=this.taskId
           getPurchaseDetailsList(this.queryParams).then(response => {
               this.tableList = response.data.purchaseCheckDetailsList;
+              this.tableList.forEach((item) => {
+                  item.fixCodeStr = this.fixCodeList[Number(item.fixCode)]
+              })
               // this.total = response.total;
               this.loading = false;
           });
@@ -221,6 +294,71 @@ export default {
           this.single = selection.length != 1
           this.multiple = !selection.length
       },
+      //文件管理
+      openFileDialog(row){
+        this.rowData=row;
+        this.fileDataList = [{dictLabel:"合格证",fileType:"0",name:"",url:""},
+              {dictLabel:"型式试验报告",fileType:"1",name:"",url:""},
+              {dictLabel:"出厂检测报告",fileType:"2",name:"",url:""},
+              {dictLabel:"第三方监测报告",fileType:"3",name:"",url:""},
+              {dictLabel:"其他报告",fileType:"4",name:"",url:""}]
+        this.getFileData()
+        this.open=true
+      },
+      getFileData(){
+        let param = {
+          modelId:this.rowData.typeId,
+          taskType:0,
+          taskId:this.rowData.taskId
+        }
+        getPurchaseFileList(param).then((response) => {
+          if(response.rows.length>0){
+              response.rows.forEach(item=>{
+                  let index = this.fileDataList.findIndex(v=>v.fileType==item.fileType)
+                  this.fileDataList[index].name = item.name
+                  this.fileDataList[index].url = item.url
+              })
+          }
+          }).catch(() => {
+          })
+      },
+      beforeFileUpload(row){
+        this.rowData.fileType=row.fileType;
+        // this.rowData.dictLabel=row.dictLabel;
+      },
+      // 文件上传成功处理
+      handleFileSuccess(response, file, fileList) { 
+        if(response.code==200){ 
+          let param = {
+            "taskId": this.taskId,
+            "taskType": "0",
+            "name": response.data.name,
+            "url": response.data.url,
+            "modelId": this.rowData.typeId,
+            "fileType": this.rowData.fileType,
+          }
+          console.log(param) 
+          uploadPurchaseFile(param).then((response) => {
+              this.$modal.msgSuccess('上传成功')
+              this.getFileData()
+          }).catch(() => {
+                this.$modal.msgError('上传失败')
+          })
+        }
+      },
+      //图片查看
+      picturePreview(file) {
+        this.dialogImageUrl = file.url;
+        const parts = file.name.split('.');
+        const extension = parts.pop();
+        if(extension === 'doc'||extension === 'docx'||extension === 'pdf'){
+          const windowName = file.name;
+          window.open(file.url,windowName)
+        }else{
+          this.dialogVisible = true
+        }
+      },
+
 
   }
 };

src/views/material/purchase/goodsEntry/index.vue

@@ -39,22 +39,14 @@
     <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
               <el-button
-                  type="success"
+                  type="success" plain
                   size="mini"
                   :disabled="multiple"
+                  @click="acceptancePurchase"
               >   
                   入库
               </el-button>
           </el-col>
-          <el-col :span="1.5">
-              <el-button
-                  type="danger"
-                  size="mini"
-                  :disabled="multiple"
-              >   
-                  驳回
-              </el-button>
-          </el-col>
 
           <el-col :span="1.5">
               <el-button
@@ -67,23 +59,24 @@
       </el-row>
 
 
-    <el-table v-loading="loading" :data="tableList" ref="multipleTable" row-key="teamId" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="tableList" ref="multipleTable" row-key="teamId" @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="55" align="center" :reserve-selection="true" />
       <el-table-column label="序号" align="center" width="80" type="index">
         <template slot-scope="scope">
           <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="到货时间" align="center" prop="arrivalTime" />
+      <el-table-column label="到货时间" align="center" prop="arrivalTime" :show-overflow-tooltip="true"/>
-      <el-table-column label="采购单号" align="center" prop="code" />
+      <el-table-column label="采购单号" align="center" prop="code" :show-overflow-tooltip="true"/>
-      <el-table-column label="采购物资" align="center" prop="purchaseMaTypeName" />
+      <el-table-column label="采购物资" align="center" prop="purchaseMaTypeName" :show-overflow-tooltip="true"/>
-      <el-table-column label="采购数量" align="center" prop="purchaseMaNumber" />
+      <el-table-column label="采购数量" align="center" prop="purchaseMaNumber" :show-overflow-tooltip="true"/>
-      <el-table-column label="采购价格(元含税)" align="center" prop="purchaseTaxPrice" width="80"/>
+      <el-table-column label="采购价格(元含税)" align="center" prop="purchaseTaxPrice" width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="采购价格（元不含税）" align="center" prop="purchasePrice" width="98"/>
+      <el-table-column label="采购价格（元不含税）" align="center" prop="purchasePrice" width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="税率" align="center" prop="taxRate" />
+      <el-table-column label="税率" align="center" prop="taxRate" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建人" align="center" prop="createUserName" />
+      <el-table-column label="物资厂家" align="center" prop="supplier" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="操作人" align="center" prop="createBy" :show-overflow-tooltip="true"/>
-      <el-table-column label="状态" align="center" prop="taskStatus">
+      <el-table-column label="操作时间" align="center" prop="createTime" :show-overflow-tooltip="true"/>
+      <el-table-column label="状态" align="center" prop="taskStatus" :show-overflow-tooltip="true">
           <template slot-scope="scope">
               <span v-if="scope.row.taskStatus==0">待提交</span>
               <span v-if="scope.row.taskStatus==1">待通知</span>
@@ -96,20 +89,36 @@
               <span v-if="scope.row.taskStatus==8">驳回待入库</span>
               <span v-if="scope.row.taskStatus==9">入库进行中</span>
               <span v-if="scope.row.taskStatus==10">未完成</span>
-              <span v-else>/</span>
+              <!-- <span v-else>/</span> -->
+
+
+
           </template>
+          
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" width="180">
+      <el-table-column label="操作" align="center" width="250">
                       <template slot-scope="scope">
-                          <el-button size="mini"
+                          <el-button
-                              @click="handleView(scope.row)">
+                              size="mini"
+                              @click="handleView(scope.row)" 
+                          >
                               查看
                           </el-button>
-                          <el-button size="mini" type="success"
+                          <el-button
-                              @click="handleUpdate(scope.row)">
+                              size="mini"
+                              type="primary"
+                              @click="handleUpdate(scope.row)" 
+                          >
                               入库
                           </el-button>
+                          <el-button
+                              size="mini"
+                              type="warning"
+                              @click="handlePrint(scope.row)"
+                          >
+                              入库单
+                          </el-button>
                            
                       </template>
                   </el-table-column>
@@ -123,11 +132,176 @@
       @pagination="getList"
     />
 
+    <!-- 验收单弹窗 -->
+    <el-dialog
+          :title="title"
+          :visible.sync="openPrint"
+          width="1100px"
+          append-to-body
+      >
+          <div style="height: 500px; overflow-y: scroll">
+              <vue-easy-print tableShow ref="remarksPrintRef" class="print">
+                  <div
+                      class="title"
+                      style="
+                          text-align: center;
+                          font-weight: 600;
+                          font-size: 16px;
+                      "
+                  >
+                      机具设备到货验收单
+                  </div>
+                  <div
+                      class="info"
+                      style="margin-top: 10px; display: flex; flex-wrap: wrap"
+                  >
+                      <div
+                          class="item"
+                          style="
+                              width: 100%;
+                              flex-shrink: 0;
+                              margin-bottom: 5px;
+                              font-size: 14px;
+                          "
+                      >
+                          <span>单据编号：{{printData.code}}</span>
+                      </div>
+                      <div
+                          class="item"
+                          style="
+                              width: 50%;
+                              flex-shrink: 0;
+                              margin-bottom: 5px;
+                              font-size: 14px;
+                          "
+                      >
+                          <span>生产厂家（供应商）：{{printData.supplierName}}</span>
+                      </div>
+
+                      <div
+                          class="item"
+                          style="
+                              width: 50%;
+                              flex-shrink: 0;
+                              margin-bottom: 5px;
+                              font-size: 14px;
+                          "
+                      >
+                          <span>到货日期：{{printData.arrivalDate}}</span>
+                      </div>
+                  </div>
+                  <el-table
+                      :data="printTableData"
+                      class="table"
+                      style="
+                          margin-top: 20px;
+                          width: 1000px;
+                          padding-bottom: 1px;
+                      "
+                      border
+                  >
+                      <!--          <el-table-column type="selection" width="55" align="center" />-->
+                      <el-table-column
+                          label="序号"
+                          align="center"
+                          type="index"
+                          row=2
+                      />
+                      <el-table-column
+                          label="物资名称"
+                          align="center"
+                          prop="maTypeName"
+                      />
+                      <el-table-column
+                          label="规格型号"
+                          align="center"
+                          prop="typeName"
+                      />
+                      <el-table-column
+                          label="单位"
+                          align="center"
+                          prop="unitName"
+                      />
+                      <el-table-column label="配送信息" align="center">
+                        <el-table-column
+                          label="采购数量"
+                          align="center"
+                          prop="purchaseNum"
+                      />
+                         <el-table-column
+                          label="验收结论"
+                          align="center"
+                          prop="checkResult"
+                      />
+                         <el-table-column label="质保质量" align="center">
+                          <el-table-column
+                          label="实收份数"
+                          align="center"
+                          prop="checkNum"
+                      />
+                          <el-table-column
+                          label="符合要求"
+                          align="center"
+                      />
+                         </el-table-column>
+                      </el-table-column>
+                      <el-table-column
+                          label="备注"
+                          align="center"
+                          prop="remark"
+                      />
+
+<!--                        <el-table-column-->
+<!--                            label="合格证及技术资料"-->
+<!--                            align="center"-->
+<!--                            prop=""-->
+<!--                        />-->
+<!--                        <el-table-column label="包装" align="center" prop="" />-->
+                  </el-table>
+
+                  <div
+                      class="fillIn"
+                      style="
+                          margin-top: 20px;
+                          display: flex;
+                          justify-content: space-between;
+                      "
+                  >
+                      <div class="item" style="width: 33%">
+                          <div>
+                              <span>供应科：{{printData.supplyDept}}</span>
+                          </div>
+                      </div>
+
+                      <div class="item" style="width: 33%">
+                          <div>
+                              <span>生产技术科：{{printData.productionTechDept}}</span>
+                          </div>
+                      </div>
+
+                       <div class="item" style="width: 33%">
+                          <div>
+                              <span>库管班：{{printData.warehouseTeam}}</span>
+                          </div>
+                      </div>
+                  </div>
+              </vue-easy-print>
+          </div>
+
+          <div slot="footer" class="dialog-footer" style="text-align: center">
+              <el-button type="primary" @click="print">打 印</el-button>
+              <el-button @click="openPrint = false">关 闭</el-button>
+          </div>
+    </el-dialog>
+
+
+
+
   </div>
 </template> 
 
 <script> 
-import { getPurchaseList } from "@/api/purchase/goodsAccept";
+import { getPurchaseList,acceptancePurchase,getPurchaseCheckFormByTaskId } from "@/api/purchase/goodsAccept";
 import { downloadFile } from '@/utils/download'
 import { getToken } from '@/utils/auth'
 export default {
@@ -161,6 +335,9 @@ export default {
         keyWord:undefined,
         taskStatus:undefined,
       },
+      openPrint: false,
+      printData: {},
+      printTableData: [],
     };
   },
   created() { 
@@ -177,7 +354,7 @@ export default {
               this.queryParams.startTime=undefined
               this.queryParams.endTime=undefined
           }
-          this.queryParams.modelName="新购入库"
+          this.queryParams.modelName="新购验收"
           getPurchaseList(this.queryParams).then(response => {
               this.tableList = response.rows;
               this.total = response.total;
@@ -204,9 +381,13 @@ export default {
       },
       handleUpdate(row){
           console.log(row)
-          
+          let query = { Id:row.id,taskId: row.taskId,isView:"false" }
+          this.$tab.closeOpenPage({
+              path: '/purchase/goodsEntryDetail',
+              query,
+          })
       },
-
+      //查看
       handleView(row){
           console.log(row)
           let query = { Id:row.id,taskId: row.taskId,isView:"true" }
@@ -215,6 +396,43 @@ export default {
               query,
           })
       }, 
+      //批量合格
+      acceptancePurchase(){
+        acceptancePurchase(this.ids).then((response) => {
+              this.$modal.msgSuccess('操作成功')
+              this.getList()
+        }).catch(() => {
+              this.$modal.msgError('操作失败')
+        })
+      },
+      //查看验收单
+      handlePrint(row) {
+          // this.query.taskId = row.taskId
+          this.getPrintTable(row.taskId)
+          this.openPrint = true
+          this.title = '新购工机具验收单'
+      },
+      //获取验收单数据
+      getPrintTable(taskId) {
+        getPurchaseCheckFormByTaskId(taskId).then((response) => {
+              this.printData = response.data
+              this.printTableData = response.data.materialList
+              // let supplierList = []
+              // this.printTableData.forEach((e) => {
+              //     if (e.supplier) {
+              //         supplierList.push(e.supplier)
+              //     }
+              // })
+              // supplierList = [...new Set(supplierList)]
+              // this.supplierStr = supplierList.join(',')
+          })
+      },
+      //打印
+      print() {
+          this.$refs.remarksPrintRef.print()
+      },
+
+
       handleExport() {
       //     this.download('/material/ma_machine/export', {
       //       ...this.queryParams