Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui

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

@@ -21,16 +21,16 @@
           />
         </el-select>
       </el-form-item> -->
-      <el-form-item label="出厂日期："  prop="productionTime"> 
-          <el-date-picker 
+      <el-form-item label="出厂日期："  prop="productionTime">
+          <el-date-picker
               v-model="queryParams.productionTime"
-              placeholder="请选择出厂日期" 
+              placeholder="请选择出厂日期"
               value-format="yyyy-MM-dd HH:mm:ss"
               type="datetime">
           </el-date-picker>
       </el-form-item>
 
-      
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -59,7 +59,7 @@
           </el-col>
           <!-- <el-col :span="1.5">
               <el-button
-                  type="success" 
+                  type="success"
                   icon="el-icon-check" v-show="!isView"
                   size="mini" :disabled="multiple"
               >入库</el-button>
@@ -67,7 +67,7 @@
 
           <el-col :span="1.5">
               <el-button
-                  type="danger" 
+                  type="danger"
                   icon="el-icon-close" v-show="!isView"
                   size="mini" :disabled="multiple"
               >驳回</el-button>
@@ -77,7 +77,7 @@
     <el-table v-loading="loading" :data="tableList" ref="multipleTable" row-key="typeId" @selection-change="handleSelectionChange">
       <!-- <el-table-column type="selection" width="55" align="center" :reserve-selection="true" v-if="!isView"/> -->
       <el-table-column label="序号" align="center" width="80" type="index">
-        
+
       </el-table-column>
       <el-table-column label="物资名称" align="center" prop="maTypeName" :show-overflow-tooltip="true"/>
       <el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true"/>
@@ -129,7 +129,7 @@
       @pagination="getList"
     /> -->
 
-    <el-dialog title="报告管理" :visible.sync="open" width="900px" append-to-body> 
+    <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"/>
@@ -157,13 +157,13 @@
                       上传
                 </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>
@@ -175,7 +175,7 @@
     </el-dialog>
 
     <!-- 编码入库 -->
-    <el-dialog title="编码入库" :visible.sync="openCode" width="1000px" append-to-body> 
+    <el-dialog title="编码入库" :visible.sync="openCode" width="1000px" append-to-body>
         <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
                 <el-button type="primary" size="mini" @click="codeWarehouse">入库</el-button>
@@ -193,11 +193,11 @@
               <template slot-scope="scope">
                    <span>{{ codeRowData.typeName }}</span>
               </template>
-            </el-table-column> 
+            </el-table-column>
             <el-table-column label="设备编码" prop="maCode" align="center" :show-overflow-tooltip="true"></el-table-column>
             <!-- <el-table-column label="操作" align="center"  width="300px">
               <template slot-scope="scope">
-                  <el-button size="mini" type="warning" @click="openInnerDialog(scope.row)">内部维修</el-button> 
+                  <el-button size="mini" type="warning" @click="openInnerDialog(scope.row)">内部维修</el-button>
                   <el-button size="mini" type="danger" @click="openScrapDialog(scope.row)">待报废</el-button>
               </template>
             </el-table-column> -->
@@ -208,7 +208,7 @@
         </div> -->
     </el-dialog>
   </div>
-</template> 
+</template>
 
 <script>
 import { getDeviceType} from "@/api/ma/device";
@@ -225,23 +225,23 @@ export default {
       Id:'',
       taskId:'',
       // 遮罩层
-      loading: false,     
-      dialogLoading: false,     
-      isView: false,     
+      loading: false,
+      dialogLoading: false,
+      isView: false,
       // 非单个禁用
       single: true,
       // 非多个禁用
-      multiple: true, 
+      multiple: true,
       // 显示搜索条件
       showSearch: true,
-      showHouse: false, 
+      showHouse: false,
       materialModelList:[],//规格型号下拉
       supplierList:[],//厂家下拉
       ids:[],
       // 总条数
-      total: 0, 
+      total: 0,
       //表格数据
-      tableList: [], 
+      tableList: [],
       fixCodeList:["否","是"],
       // 弹出层标题
       title: "",
@@ -254,7 +254,7 @@ export default {
         {dictLabel:"出厂检测报告",fileType:"2",name:"",url:""},
         {dictLabel:"第三方监测报告",fileType:"3",name:"",url:""},
         {dictLabel:"其他报告",fileType:"4",name:"",url:""},
-      ], 
+      ],
       // 查询参数
       queryParams: {
         // pageNum: 1,
@@ -281,7 +281,7 @@ export default {
     };
   },
   mounted() {
-     
+
       const taskId = this.$route.query && this.$route.query.taskId
       const Id = this.$route.query && this.$route.query.Id
       const isView = this.$route.query && this.$route.query.isView
@@ -294,7 +294,7 @@ export default {
       }
       this.getDeviceType()
       this.getSupplierList()
-     
+
       console.log(this.isView)
       this.getList()
   },
@@ -304,7 +304,7 @@ export default {
           const obj = { path: '/purchase/goodsEntry' }
           this.$tab.closeOpenPage(obj)
       },
-      getDeviceType(){ 
+      getDeviceType(){
           getDeviceType({level:4,skipPermission:1}).then(response => {
           let matModelRes = response.data;
           this.materialModelList = matModelRes.map((item) => {
@@ -315,7 +315,7 @@ export default {
               });
           });
       },
-      getSupplierList(){ 
+      getSupplierList(){
           getManufacturerSelect().then(response => {
           let arrRes = response.rows;
           this.supplierList = arrRes.map((item) => {
@@ -352,7 +352,7 @@ export default {
       handleQuery() {
           this.queryParams.pageNum = 1;
           this.getList();
-      }, 
+      },
       // 多选框选中数据
       handleSelectionChange(selection) {
           this.ids = selection.map(item => item.id)
@@ -372,19 +372,22 @@ export default {
             this.inPutList=[]
             this.openCode=true
           })
-        }else{  
+        }else{
             let obj = {
               taskId: this.taskId,
               typeId:row.typeId,
-              purchaseId: row.id
+              purchaseId: row.id,
+              typeName: row.maTypeName,
+              typeModelName: row.typeName,
+              manageType: row.manageType
             };
             this.$modal.confirm('是否确认新购入库该物资类型？')
             .then(function() {
               console.log(obj)
               return purchaseWarehouse(obj)
-            }).then(() => { 
+            }).then(() => {
                   this.$modal.msgSuccess('入库成功')
-                  this.getList() 
+                  this.getList()
             }).catch(() => {});
         }
       },
@@ -400,13 +403,16 @@ export default {
             taskId: this.taskId,
             typeId:this.codeRowData.typeId,
             purchaseId: this.codeRowData.id,
-            inPutList: this.inPutList
+            inPutList: this.inPutList,
+            typeName: this.codeRowData.maTypeName,
+            typeModelName: this.codeRowData.typeName,
+            manageType: this.codeRowData.manageType
           };
           console.log(obj)
           this.$modal.confirm('是否确认新购入库勾选的编码？')
-          .then(function() { 
+          .then(function() {
             return purchaseWarehouse(obj)
-          }).then(() => {  
+          }).then(() => {
               // let param={
               //   taskId:this.taskId,
               //   typeId:this.codeRowData.typeId
@@ -415,13 +421,13 @@ export default {
               //   this.codeTableData=res.data
               // })
               this.openCode=false
-              this.getList() 
+              this.getList()
               this.$modal.msgSuccess('入库成功')
           }).catch(() => {});
         }else{
           this.$modal.msgError('请先勾选入库编码！')
         }
-        
+
       },
       //驳回
       reject(row) {
@@ -434,9 +440,9 @@ export default {
         .then(function() {
           console.log(obj)
           return rejectPurchaseWarehouse(obj)
-        }).then(() => { 
+        }).then(() => {
               this.$modal.msgSuccess('驳回成功')
-              this.getList() 
+              this.getList()
         }).catch(() => {});
       },
       //文件管理
@@ -472,8 +478,8 @@ export default {
         // this.rowData.dictLabel=row.dictLabel;
       },
       // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) { 
-        if(response.code==200){ 
+      handleFileSuccess(response, file, fileList) {
+        if(response.code==200){
           let param = {
             "taskId": this.taskId,
             "taskType": "0",
@@ -482,7 +488,7 @@ export default {
             "modelId": this.rowData.typeId,
             "fileType": this.rowData.fileType,
           }
-          console.log(param) 
+          console.log(param)
           uploadPurchaseFile(param).then((response) => {
               this.$modal.msgSuccess('上传成功')
               this.getFileData()
@@ -537,4 +543,4 @@ export default {
         display: none;
     }
 }
-</style>
+</style>