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

src/api/basic/basic.js

@@ -46,7 +46,7 @@ export function updateProject(data) {
 export function delProject(proId) {
   return request({
     url: '/material/bm_project/' + proId,
-    method: 'post'
+    method: 'delete'
   })
 }
 
@@ -90,7 +90,7 @@ export function updateProjectLot(data) {
 export function delProjectLot(lotId) {
   return request({
     url: '/material/base/bmProjectLot/' + lotId,
-    method: 'post'
+    method: 'delete'
   })
 }
 //工程项目下拉数据
@@ -131,7 +131,7 @@ export function updateUnit(data) {
 export function delUnit(unitId) {
   return request({
     url: '/material/bm_unit/' + unitId,
-    method: 'post'
+    method: 'delete'
   })
 }
 
@@ -266,7 +266,7 @@ export function statusUnitType(data) {
 export function delUnitType(typeIds) {
   return request({
     url: '/material/bm_unit_type/' + typeIds,
-    method: 'post'
+    method: 'delete'
   })
 }
 
@@ -301,7 +301,7 @@ export function updatePropInfo(data) {
 export function delPropInfo(id) {
   return request({
     url: `/material/bm_asset_attributes/${id}`,
-    method: 'post'
+    method: 'delete'
   })
 }
 

src/api/ma/base.js

@@ -74,7 +74,7 @@ export function queryKeeperNameApi(query) {
 export function delMaType(typeId) {
   return request({
       url: '/material/ma_type/' + typeId,
-      method: 'post',
+      method: 'delete',
   })
 }
 

src/api/ma/device.js

@@ -40,7 +40,7 @@ export function getZichanType(query) {
 export function delDevice(id) {
   return request({
       url: '/material/ma_machine/' + id,
-      method: 'post',
+      method: 'delete',
   })
 }
 

src/api/ma/partType.js

@@ -76,6 +76,6 @@ export function updateMaType(data) {
 export function delMaType(id) {
   return request({
     url: '/material/ma_part_type/' + id,
-    method: 'post',
+    method: 'delete',
   })
 }

src/api/ma/supplier.js

@@ -32,7 +32,7 @@ export function getFacturerDetail(id) {
 export function delFacturer(id) {
   return request({
       url: '/material/ma_supplier_info/' + id,
-      method: 'post',
+      method: 'delete',
   })
 }
 

src/api/ma/whHouse.js

@@ -31,7 +31,7 @@ export function queryKeeperNameApi(query) {
 export function delHouse(id) {
   return request({
       url: '/material/wh_house_info/' + id,
-      method: 'post',
+      method: 'delete',
   })
 }
 

src/views/material/lease/protocol/index.vue

@@ -390,7 +390,7 @@
             list-type="picture-card"
             accept=".png, .jpg, .jpeg, .pdf"
             :on-change="handleChangeBusinessList"
-            :class="{ disabled: uploadDisabled }"
+            :class="{ disabled: true }"
             :on-preview="picturePreview"
             :on-remove="handleRemoveElectricianImgList"
             :disabled="isEdits"
@@ -425,7 +425,7 @@
     </el-dialog>
 
     <!-- 查看全部图片的弹窗 -->
-    <el-dialog :title="title" :visible.sync="showAllImg" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="showAllImg" width="800px" append-to-body>
       <el-form ref="form" label-width="120px">
         <el-form-item label="营业执照">
           <el-upload
@@ -438,7 +438,7 @@
             list-type="picture-card"
             accept=".png, .jpg, .jpeg, .pdf"
             :on-change="handleChangeBusinessList"
-            :class="{ disabled: uploadDisabled }"
+            :class="{ disabled: true }"
             :on-preview="picturePreview"
             :on-remove="handleRemoveElectricianImgList"
             :disabled="isEdits"
@@ -460,7 +460,6 @@
                 </span>
               </span>
             </div>
-
             <i class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
         </el-form-item>

src/views/material/ma/supplier/index.vue

@@ -24,7 +24,7 @@
                               icon="el-icon-plus"
                               size="mini"
                               @click="handleAdd"
-                              v-hasPermi="['machinery:type:add']"
+                              v-hasPermi="['ma:info:add']"
                               >新增</el-button
                           >
                       </el-col>  
@@ -67,7 +67,7 @@
                                 type="text"
                                 icon="el-icon-edit"
                                 @click="handleUpdate(scope.row)"
-                                v-hasPermi="['machinery:type:edit']"
+                                v-hasPermi="['ma:info:edit']"
                             >
                                 编辑
                             </el-button>
@@ -76,7 +76,7 @@
                                 type="text"
                                 icon="el-icon-delete"
                                 @click="handleDelete(scope.row)"
-                                v-hasPermi="['machinery:type:del']"
+                                v-hasPermi="['ma:info:remove']"
                             >
                                 删除
                             </el-button>

src/views/material/ma/type/index.vue

@@ -185,7 +185,7 @@
                 type="text"
                 icon="el-icon-edit"
                 @click="handleView(scope.row)"
-                v-hasPermi="['machinery:type:config']"
+                v-hasPermi="['ma:type:query']"
               >
                 查看
               </el-button>
@@ -806,15 +806,20 @@ export default {
     getTreeData() {
       getMaTypeList().then((response) => {
         this.treeOptions = response.data;
-        if (
+        console.log(this.treeOptions)
-          this.treeOptions.length > 0 &&
+        if (this.treeOptions.length > 0 ){ 
-          this.treeOptions[0].children.length > 0
+            if(this.treeOptions[0].children&&this.treeOptions[0].children.length > 0) {
-        ) {
+              const firstNode = this.treeOptions[0].children[0];
-          const firstNode = this.treeOptions[0].children[0];
+              this.queryParams.typeId = firstNode.id;
-          this.queryParams.typeId = firstNode.id;
+              this.queryParams.level = 1;
-          this.queryParams.level = 1;
+              this.queryParams.houseId = firstNode.houseId;
-          this.queryParams.houseId = firstNode.houseId;
+              this.getList();
-          this.getList();
+            }else{
+              this.queryParams.typeId = this.treeOptions[0].id;
+              this.queryParams.level = 0;
+              this.queryParams.houseId = this.treeOptions[0].id;
+              this.getList();
+            }
         }
       });
     },

src/views/material/ma/typeConfigKeeper/index.vue

@@ -105,7 +105,7 @@
               icon="el-icon-plus"
               size="mini"
               @click="handleBind"
-              v-hasPermi="['machinery:type:add']"
+              v-hasPermi="['ma:keeper:add']"
               >绑定</el-button
             >
           </el-col>
@@ -116,7 +116,7 @@
               icon="el-icon-minus"
               size="mini"
               @click="handleNoBind"
-              v-hasPermi="['machinery:type:add']"
+              v-hasPermi="['ma:keeper:remove']"
               >解绑</el-button
             >
           </el-col>

src/views/material/ma/typeConfigRepair/index.vue

@@ -105,7 +105,7 @@
               icon="el-icon-plus"
               size="mini"
               @click="handleBind"
-              v-hasPermi="['machinery:type:add']"
+              v-hasPermi="['ma:repair:add']"
               >绑定</el-button
             >
           </el-col>
@@ -116,7 +116,7 @@
               icon="el-icon-minus"
               size="mini"
               @click="handleNoBind"
-              v-hasPermi="['machinery:type:add']"
+              v-hasPermi="['ma:repair:remove']"
               >解绑</el-button
             >
           </el-col>

src/views/material/ma/whHouse/index.vue

@@ -39,7 +39,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['machinery:type:add']"
+          v-hasPermi="['warehouse:info:add']"
           >新增</el-button
         >
       </el-col>
@@ -118,7 +118,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['machinery:type:edit']"
+            v-hasPermi="['warehouse:info:edit']"
           >
             编辑
           </el-button>
@@ -127,7 +127,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['machinery:type:del']"
+            v-hasPermi="['warehouse:info:remove']"
           >
             删除
           </el-button>

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

@@ -428,12 +428,12 @@
         print() {
             this.$refs.remarksPrintRef.print()
         },
-
-
         handleExport() {
-        //     this.download('/material/ma_machine/export', {
+            this.download(
-        //       ...this.queryParams
+                "/material/purchase_check_info/export",
-        //     }, `仓库管理_${new Date().getTime()}.xlsx`)
+                { ...this.queryParams },
+                `新购到货验收_${new Date().getTime()}.xlsx`
+            );
         },
         
 

src/views/material/purchase/goodsArrived/component/addTools.vue

@@ -40,7 +40,6 @@
                     v-model="maForm.productionTime"
                     style="width: 240px"
                     value-format="yyyy-MM-dd"
-                    :picker-options="pickerOptions"
                     type="date"
                     placeholder="请选择出厂日期"
                      @change="productionTimeChange"
@@ -261,7 +260,7 @@
                 <el-table-column label="操作" align="center" width="100">
                 <template slot-scope="scope">
                 <div style="display: flex;align-items: center;justify-content: space-between;">
-                    <el-upload ref="upload" :limit="1" :headers="upload.headers"
+                    <el-upload ref="upload" :limit="3" :headers="upload.headers"
                     :action="upload.url" :show-file-list="false" accept=".png, .jpg, .jpeg, .pdf, .doc, .docx"
                     :on-success="handleFileSuccess"   :auto-upload="true"
                     >
@@ -459,12 +458,12 @@ export default {
         // 含税单价
         purchaseTaxPriceChange(row,val){
             // this.equipmentList[val].purchasePrice = (row.purchaseTaxPrice/(1 + this.maForm.taxRate/100)).toFixed(2)
-            row.purchasePrice = (row.purchaseTaxPrice/(1 + this.maForm.taxRate/100)).toFixed(2)
+            row.purchasePrice = (row.purchaseTaxPrice/(1 + this.maForm.taxRate/100)).toFixed(3)
         },
         // 不含税单价
         purchasePriceChange(row,val){
             // this.equipmentList[val].purchaseTaxPrice = (row.purchasePrice*(1 + this.maForm.taxRate/100)).toFixed(2)
-            row.purchaseTaxPrice = (row.purchasePrice*(1 + this.maForm.taxRate/100)).toFixed(2)
+            row.purchaseTaxPrice = (row.purchasePrice*(1 + this.maForm.taxRate/100)).toFixed(3)
         },
         /** 物资厂家-下拉选 */
         supplierInfoList() {

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

@@ -47,7 +47,16 @@
                   >新购到货入库</el-button
               >
           </el-col>
-
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+              >导出</el-button
+            >
+          </el-col>
           <!-- <el-col :span="1.5">
               <el-button
                   type="success" 
@@ -482,7 +491,14 @@ export default {
           this.dialogVisible = true
         }
       },
-
+      /** 导出按钮操作 */
+      handleExport() {
+        this.download(
+          "/material/purchase_check_info/exportDetails",
+          { taskId: this.taskId },
+          `新购到货详情_${new Date().getTime()}.xlsx`
+        );
+      },
 
   }
 };

src/views/material/repair/repairManage/component/edit.vue

@@ -1843,7 +1843,7 @@ export default {
 
     //数量管理左侧
     addPartItem() {
-      this.partItems.push({ partType: "", num: "", isCharge: "" });
+      this.partItems.push({ partType: "", partNum: "", isCharge: "" });
       this.dividerHeight += 200; // 每次增加配件时，竖线高度增加
     },
     removePartItem(index) {
@@ -1855,7 +1855,7 @@ export default {
 
     //数量管理中间
     addPartItemMiddle() {
-      this.partItemsMiddle.push({ partTypeName: "", num: "", isCharge: "" });
+      this.partItemsMiddle.push({ partTypeName: "", partNum: "", isCharge: "" });
       this.dividerHeight += 200; // 每次增加配件时，竖线高度增加
     },
     removePartItemMiddle(index) {

src/views/system/log/businessLog/index.vue

@@ -116,47 +116,8 @@
       />
     </div>
 
-    <el-table
-      :key="tableKey"
-      v-loading="listLoading"
-      :data="list"
-      border
-      fit
-      highlight-current-row
-      style="width: 100%"
-      :max-height="tableHeight"
-    >
-      <el-table-column label="序号" align="center" width="80" type="index">
-        <template slot-scope="scope">
-          <span>{{
-            (listQuery.pageNum - 1) * listQuery.pageSize + scope.$index + 1
-          }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作人" align="center" prop="operaUserName" />
-      <el-table-column label="操作时间" align="center" prop="operTime" />
-      <el-table-column label="IP地址" align="center" prop="ip" />
-      <el-table-column label="操作模块" align="center" prop="model" />
-      <el-table-column label="操作类型" align="center" prop="operType" />
-      <el-table-column label="操作详情" align="center" prop="operateDetail" />
-      <el-table-column label="操作结果" align="center" prop="result">
-        <template slot-scope="{ row }">
-          {{ row.result }}
-        </template>
-      </el-table-column>
-      <el-table-column label="操作参数" align="center" prop="params" />
-      <el-table-column label="操作方法" align="center" prop="method" />
-      <el-table-column label="操作路径" align="center" prop="operUri" />
-      <el-table-column label="执行时间(ms)" align="center" prop="times" />
-    </el-table>
 
-    <pagination
+
-      v-show="total > 0"
-      :total="total"
-      :page.sync="listQuery.pageNum"
-      :limit.sync="listQuery.pageSize"
-      @pagination="getList"
-    />
   </div>
 </template>