计划借调页面修改

sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue

@@ -90,9 +90,9 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="退料申请时间" prop="time">
+      <el-form-item label="退料申请时间" prop="timeRange">
         <el-date-picker
-          v-model="queryParams.time"
+          v-model="timeRange"
           type="datetimerange"
           range-separator="至"
           start-placeholder="开始日期"
@@ -561,6 +561,7 @@ export default {
       open: false,
       // 日期范围
       dateRange: [],
+      timeRange:[],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -570,7 +571,6 @@ export default {
         lotId: '',//工程id
         taskStatus: '',//状态  
         typeId: '',//工机具类型
-        time: '',
         agreementCode: '',//协议
         startTime: '',
         endTime: ''
@@ -626,8 +626,8 @@ export default {
     /** 查询字典类型列表 startTime,结束日期endTime  */
     async getList() {
       this.loading = true;
-      this.queryParams.startTime = this.queryParams.time[0]
+      this.queryParams.startTime = this.timeRange[0]
-      this.queryParams.endTime = this.queryParams.time[1]
+      this.queryParams.endTime = this.timeRange[1]
       try {
         let params = {
           companyId: this.companyId,

sgzb-ui/src/views/store/newBuy/plan.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="app-container" id="plan">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="名称" prop="dictName">
+      <el-form-item label="名称" prop="name">
         <el-input
-            v-model="queryParams.dictName"
+            v-model="queryParams.name"
             placeholder="请输入名称"
             clearable maxlength="50"
             style="width: 240px"
@@ -24,30 +24,9 @@
             plain
             icon="el-icon-plus"
             size="mini"
+            @click="handleAdd"
         >新增</el-button>
       </el-col>
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--          type="success"-->
-      <!--          plain-->
-      <!--          icon="el-icon-edit"-->
-      <!--          size="mini"-->
-      <!--          :disabled="single"-->
-      <!--          @click="handleUpdate"-->
-      <!--          v-hasPermi="['store:labelType:edit']"-->
-      <!--        >修改</el-button>-->
-      <!--      </el-col>-->
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--          type="danger"-->
-      <!--          plain-->
-      <!--          icon="el-icon-delete"-->
-      <!--          size="mini"-->
-      <!--          :disabled="multiple"-->
-      <!--          @click="handleDelete"-->
-      <!--          v-hasPermi="['store:labelType:remove']"-->
-      <!--        >删除</el-button>-->
-      <!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
             type="warning"
@@ -60,25 +39,17 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="dictId" />
+      <el-table-column label="序号" align="center" type="index" />
-      <el-table-column label="基层单位" align="center" prop="dictName" :show-overflow-tooltip="true" />
+      <el-table-column label="基层单位" align="center" prop="" :show-overflow-tooltip="true" />
-      <el-table-column label="物资名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
+      <el-table-column label="物资名称" align="center" prop="" :show-overflow-tooltip="true" />
-      <el-table-column label="规格型号" align="center" prop="dictName" :show-overflow-tooltip="true" />
+      <el-table-column label="规格型号" align="center" prop="" :show-overflow-tooltip="true" />
-      <el-table-column label="单位" align="center" prop="dictName" :show-overflow-tooltip="true" />
+      <el-table-column label="单位" align="center" prop="" :show-overflow-tooltip="true" />
-      <el-table-column label="计划数" align="center" prop="dictName" :show-overflow-tooltip="true" />
+      <el-table-column label="计划数" align="center" prop="" :show-overflow-tooltip="true" />
-      <el-table-column label="计划单价" align="center" prop="dictName" :show-overflow-tooltip="true" />
+      <el-table-column label="计划单价" align="center" prop="" :show-overflow-tooltip="true" />
-      <el-table-column label="计划总价" align="center" prop="dictName" :show-overflow-tooltip="true" />
+      <el-table-column label="计划总价" align="center" prop="" :show-overflow-tooltip="true" />
-      <el-table-column label="备注" align="center" prop="dictName" :show-overflow-tooltip="true" />
+      <el-table-column label="备注" align="center" prop="" :show-overflow-tooltip="true" />
-<!--      <el-table-column label="状态" align="center" prop="createTime" width="180">-->
-<!--        <template slot-scope="scope">-->
-<!--          <el-switch-->
-<!--              v-model="scope.row.status">-->
-<!--          </el-switch>-->
-
-<!--        </template>-->
-<!--      </el-table-column>-->
       <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -107,52 +78,11 @@
         @pagination="getList"
     />
 
-    <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="基层单位" prop="dictName">
-          <el-input v-model="form.dictName" placeholder="请输入基层单位" maxlength="50"/>
-        </el-form-item>
-        <el-form-item label="规格型号" prop="dictName">
-          <el-input v-model="form.dictName" placeholder="请输入基层单位" maxlength="50"/>
-        </el-form-item>
-        <el-form-item label="计划数" prop="dictName">
-          <el-input v-model="form.dictName" placeholder="请输入基层单位" maxlength="50"/>
-        </el-form-item>
-        <el-form-item label="计划单价" prop="dictName">
-          <el-input v-model="form.dictName" placeholder="请输入基层单位" maxlength="50"/>
-        </el-form-item>
-        <el-form-item label="备注" prop="dictName">
-          <el-input v-model="form.dictName" placeholder="请输入基层单位" maxlength="50"/>
-        </el-form-item>
-
-
-        <!--        <el-form-item label="字典类型" prop="dictType">-->
-        <!--          <el-input v-model="form.dictType" placeholder="请输入字典类型" />-->
-        <!--        </el-form-item>-->
-        <!--        <el-form-item label="状态" prop="status">-->
-        <!--          <el-radio-group v-model="form.status">-->
-        <!--            <el-radio-->
-        <!--              v-for="dict in dict.type.sys_normal_disable"-->
-        <!--              :key="dict.value"-->
-        <!--              :label="dict.value"-->
-        <!--            >{{dict.label}}</el-radio>-->
-        <!--          </el-radio-group>-->
-        <!--        </el-form-item>-->
-        <!--        <el-form-item label="备注" prop="remark">-->
-        <!--          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>-->
-        <!--        </el-form-item>-->
-      </el-form>
-      <div slot="footer" class="dialog-footer" style="text-align: center">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
+import { listType } from "@/api/system/dict/type";
 
 export default {
   name: "Plan",
@@ -172,32 +102,14 @@ export default {
       // 总条数
       total: 0,
       // 字典表格数据
-      typeList: [],
+      planList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 日期范围
-      dateRange: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        dictName: undefined,
         dictType: undefined,
         status: undefined
       },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        dictName: [
-          { required: true, message: "字典名称不能为空", trigger: "blur" }
-        ],
-        dictType: [
-          { required: true, message: "字典类型不能为空", trigger: "blur" }
-        ]
-      }
     };
   },
   created() {
@@ -207,29 +119,13 @@ export default {
     /** 查询字典类型列表 */
     getList() {
       this.loading = true;
-      listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listType(this.queryParams).then(response => {
-            this.typeList = response.rows;
+            this.planList = response.rows;
             this.total = response.total;
             this.loading = false;
           }
       );
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        dictId: undefined,
-        dictName: undefined,
-        dictType: undefined,
-        status: "0",
-        remark: undefined
-      };
-      this.resetForm("form");
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -237,75 +133,41 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRange = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
+      this.$tab.closeOpenPage({ path: "/store/plan/planAdd"});
-      this.open = true;
-      this.title = "添加字典类型";
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.dictId)
+      this.ids = selection.map(item => item)
       this.single = selection.length!=1
       this.multiple = !selection.length
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
+      let query = { taskId:row.taskId }
-      const dictId = row.dictId || this.ids
+      this.$tab.closeOpenPage({ path: "/store/plan/planAdd", query });
-      getType(dictId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改字典类型";
-      });
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.dictId != undefined) {
-            updateType(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addType(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
     },
+ 
     /** 删除按钮操作 */
     handleDelete(row) {
-      const dictIds = row.dictId || this.ids;
+      // const dictIds = row.dictId || this.ids;
-      this.$modal.confirm('是否确认删除该数据项？').then(function() {
+      // this.$modal.confirm('是否确认删除该数据项？').then(function() {
-        return delType(dictIds);
+      //   return delType(dictIds);
-      }).then(() => {
+      // }).then(() => {
-        this.getList();
+      //   this.getList();
-        this.$modal.msgSuccess("删除成功");
+      //   this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      // }).catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/dict/type/export', {
+      // this.download('system/dict/type/export', {
-        ...this.queryParams
+      //   ...this.queryParams
-      }, `type_${new Date().getTime()}.xlsx`)
+      // }, `type_${new Date().getTime()}.xlsx`)
     },
-    /** 刷新缓存按钮操作 */
-    handleRefreshCache() {
-      refreshCache().then(() => {
-        this.$modal.msgSuccess("刷新成功");
-        this.$store.dispatch('dict/cleanDict');
-      });
-    }
   }
 };
 </script>

sgzb-ui/src/views/store/newBuy/planAdd.vue

@@ -0,0 +1,500 @@
+<template>
+    <div class="app-container" id="newDevicesArrival">
+      <el-row :gutter="24" class="mb8">
+        <!-- <el-col :span="4" style="text-align:center;"><h4>新购任务信息:</h4></el-col> -->
+          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" >
+            <el-col :span="6">
+              <el-form-item label="机具类型" prop="equipmentId">
+                <treeselect 
+                  v-model="queryParams.equipmentId" 
+                  default-expand-all :options="equipmentTypeList" 
+                  placeholder="请选择机具类型" 
+                  @select="select"
+                  :disable-branch-nodes="true"
+                  style="width: 240px;"  
+                  noChildrenText="没有数据了"
+                  noOptionsText="没有数据"
+                  noResultsText="没有搜索结果"/>
+              </el-form-item> 
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂日期">
+                <el-date-picker
+                    v-model="queryParams.productionTime"
+                    style="width: 240px"
+                    value-format="yyyy-MM-dd"
+                    type="date"
+                    placeholder="出厂日期"
+                    @change="changeTime"
+                ></el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="机具厂家" prop="supplierId">
+                <el-select 
+                    v-model="queryParams.supplierId"
+                    placeholder="机具厂家"
+                    clearable filterable
+                    style="width: 240px"
+                    @change="changeSupplier"
+                >
+                  <el-option
+                      v-for="item in supplierList"
+                      :key="item.supplierId"
+                      :label="item.supplier"
+                      :value="item.supplierId"
+                  />
+                </el-select>
+              </el-form-item> 
+            </el-col>
+            <el-col :span="9"></el-col>
+          </el-form>
+      </el-row>
+      <el-form :model="maForm" ref="maForm" :rules="rules" size="small" :inline="true">
+        <el-row>
+          <el-form-item label="采购日期" prop="purchaseTime">
+            <el-date-picker
+                v-model="maForm.purchaseTime"
+                style="width: 240px"
+                value-format="yyyy-MM-dd"
+                type="date"
+                placeholder="请选择采购日期"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="到货日期" prop="arrivalTime"> 
+            <el-date-picker 
+                v-model="maForm.arrivalTime"
+                style="width: 240px"
+                value-format="yyyy-MM-dd"
+                :picker-options="pickerOptions"
+                type="date"
+                placeholder="请选择到货日期"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="采购员" prop="purchaser">
+            <el-select v-model="maForm.purchaser" filterable placeholder="请选择采购员" style="width: 100%;">
+              <el-option label="请选择" :value="0" ></el-option>
+              <el-option
+                v-for="item in userList"
+                :key="item.userId"
+                :label="item.userName"
+                :value="item.userId"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="备注" prop="remark">
+            <el-input
+                v-model="maForm.remark"
+                placeholder="请输入备注"
+                clearable maxlength="150" 
+                type="textarea"
+                style="width: 240px"
+            />
+          </el-form-item>
+        </el-row>
+      </el-form>
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="2">
+          <el-button
+              type="success"
+              plain
+              icon="el-icon-back"
+              size="mini"
+              @click="backList"
+          >返回</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleSave"
+          >保存</el-button>
+        </el-col>
+      </el-row>
+  
+      <el-table v-loading="loading" :data="equipmentList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="序号" type="index" width="55"/>
+        <el-table-column label="机具类型" prop="machineTypeName" :show-overflow-tooltip="true"   width="200">
+        </el-table-column>
+        <el-table-column label="规格型号" prop="specificationType" :show-overflow-tooltip="true"  width="200"/>
+        <el-table-column label="单位" prop="unitName" width="100" />
+        <el-table-column label="购置单价(元)" prop="purchasePrice" align="center"  width="150">
+          <template slot-scope="scope">
+            <el-input-number  v-model="scope.row.purchasePrice" controls-position="right" style="width: 100%;" :min="0"></el-input-number>
+          </template>
+        </el-table-column>
+        <el-table-column label="采购数量" prop="purchaseNum" width="150" type="number" maxlength="10">
+          <template slot-scope="scope">
+            <el-input-number  v-model="scope.row.purchaseNum" controls-position="right" style="width: 100%;" :min="1"></el-input-number>
+          </template>
+        </el-table-column>
+        <el-table-column label="机具厂家" prop="supplierId" width="200" >
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.supplierId" placeholder="机具厂家" filterable clearable style="width: 180px">
+              <el-option v-for="item in supplierList" :key="item.supplierId" :label="item.supplier" :value="item.supplierId" />
+            </el-select>
+  
+            <!-- <el-input v-model="scope.row.supplierId"></el-input> -->
+          </template>
+        </el-table-column>
+        <el-table-column label="出厂日期" align="center" prop="productionTime" width="200">
+          <template slot-scope="scope">
+            <el-date-picker
+                v-model="scope.row.productionTime"
+                style="width: 180px"
+                value-format="yyyy-MM-dd"
+                type="date"
+                range-separator="-"
+                placeholder="出厂日期"
+            ></el-date-picker>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+            <el-button
+                size="mini"
+                type="danger"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)" 
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table> 
+  
+    
+   
+    </div>
+  </template>
+  
+  <script>
+  import { addPurchaseCheckInfo,getPurchaseCheckInfo,updatePurchaseCheckInfo } from "@/api/store/newBuy";
+  import { getUserByRoleList } from "@/api/system/user";
+  import { equipmentTypeTree ,supplierInfoList} from "@/api/store/tools";
+  import Treeselect from "@riophae/vue-treeselect";
+  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+  
+  import {  } from "@/api/store/newBuy";
+  
+  export default {
+    name: "NewDevicesArrival",
+    dicts: ['sys_normal_disable'],
+    components: { Treeselect },
+    data() {
+      return {
+        taskId:'',
+        isEdit:false,
+        // 遮罩层
+        loading: false,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        //机具厂家（供应商管理）
+        supplierList: [],
+        //机具类型
+        equipmentTypeList: [],
+        // 用户数据
+        userList: [],
+        // 角色表格数据
+        equipmentList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 是否显示弹出层（数据权限）
+        openDataScope: false,
+        menuExpand: false,
+        menuNodeAll: false,
+        deptExpand: true,
+        deptNodeAll: false,
+        // 日期范围
+        dateRange: [],
+        // 数据范围选项
+        dataScopeOptions: [
+          {
+            value: "1",
+            label: "全部数据权限"
+          },
+          {
+            value: "2",
+            label: "自定数据权限"
+          },
+          {
+            value: "3",
+            label: "本部门数据权限"
+          },
+          {
+            value: "4",
+            label: "本部门及以下数据权限"
+          },
+          {
+            value: "5",
+            label: "仅本人数据权限"
+          }
+        ],
+        // 菜单列表
+        menuOptions: [],
+        // 部门列表
+        deptOptions: [],
+        // 查询参数
+        queryParams: {
+          equipmentId:undefined,
+          productionTime:'', 
+          supplierId:'',
+        },
+        maForm:{
+          purchaseTime:'',
+          arrivalTime:'',
+          purchaser:'',
+          remark:'',
+        },
+        // 表单参数
+        form: {},
+        defaultProps: {
+          children: "children",
+          label: "label"
+        },
+        // 表单校验
+        rules: {
+          purchaseTime: [
+            { required: true, message: "采购日期不能为空", trigger: "blur" }
+          ],
+          arrivalTime: [
+            { required: true, message: "到货日期不能为空", trigger: "blur" }
+          ],
+          // purchaser: [
+          //   { required: true, message: "采购员不能为空", trigger: "blur" }
+          // ]
+        },
+      };
+    },
+    computed: {
+      pickerOptions() {
+        const that = this;
+        return {
+          disabledDate(time) {
+            if (that.maForm.purchaseTime) {
+              return (
+                time.getTime() < Date.now()-8.64e7 ||
+                time.getTime() < new Date(that.maForm.purchaseTime).getTime()-8.64e7
+              );
+            }
+            return time.getTime() < Date.now(); //实现1效果
+          },
+        };
+      },
+    },
+    watch: {
+      'maForm.purchaseTime'() {
+        if (this.maForm.purchaseTime != '') {
+          this.maForm.arrivalTime = ''
+        }
+      }
+    },
+    created() {
+      const taskId = this.$route.query && this.$route.query.taskId;
+      this.taskId = taskId;
+      if(this.taskId=='' || !this.taskId){
+        this.isEdit = false
+      }else if(this.taskId!=''){
+        this.isEdit = true;
+        this.getTaskInfo()
+      }
+      //采购员
+      this.getUserList()
+      //机具类型
+      this.equipmentType();
+      //机具厂家
+      this.supplierInfoList();
+    },
+    methods: {
+       /** 查询用户列表--采购员 */
+       getUserList() {
+        getUserByRoleList({roleId:'104'}).then(response => {
+          this.userList = response.data;
+          }
+        );
+      },
+      /** 机具厂家 */
+      supplierInfoList() {
+        supplierInfoList().then(response => {
+          this.supplierList = response.rows;
+          }
+        );
+      },
+      /** 机具类型 */
+      equipmentType() {
+        equipmentTypeTree().then(response => {
+          this.equipmentTypeList = response.data;
+          this.equipmentTypeList.forEach((item,index)=>{
+            if(item.children&&item.children.length>0){
+              item.children.forEach((item2,index2)=>{
+                if(item2.children&&item2.children.length>0){
+                  item2.children.forEach(item3=>{
+                    if(item3.children&&item3.children.length>0){
+                      item3.children.forEach(item4=>{ 
+                        item4.machineTypeName = item3.typeName
+                        item4.specificationType = item4.typeName
+                        this.$set(item4, 'purchasePrice', 0);
+                        this.$set(item4, 'purchaseNum', 1);
+                      })
+                    }
+  
+                  })
+                }
+  
+              })
+            }
+          })
+        });
+      },
+      //添加机具类型
+      select(row){
+        console.log(row)
+        if(row.level==4){
+          for(let i = 0; i < this.equipmentList.length; i++) {
+              if (this.equipmentList[i].typeId == row.typeId) {
+                  this.equipmentList.splice(i,1)
+                  break;
+              }
+          }
+          this.$set(row, 'createTime', null);
+          this.$set(row, 'productionTime', '');
+          this.$set(row, 'supplierId', '');
+          this.$set(row, 'purchasePrice', 0);
+          this.$set(row, 'purchaseNum', 1);
+          this.equipmentList.unshift(row)
+        }
+      },
+      //选择机具厂家
+      changeSupplier(supplierId){
+        this.equipmentList.forEach(item=>{
+          this.$set(item, 'supplierId', supplierId);
+        })
+      },
+      //选择出厂日期
+      changeTime(time){
+        console.log(time)
+        this.equipmentList.forEach(item=>{
+          this.$set(item, 'productionTime', time);
+        })
+      },
+      //获取任务详情--- 编辑回显数据
+      getTaskInfo(){
+        // this.loading = true;
+        getPurchaseCheckInfo({taskId:this.taskId,keyWord:this.queryParams.keyWord}).then(response => {
+          // this.taskInfo = response.data
+          this.maForm.purchaseTime = response.data.purchaseTime;
+          this.maForm.arrivalTime = response.data.arrivalTime;
+          this.maForm.purchaser = response.data.purchaser;
+          this.maForm.remark = response.data.remark;
+          this.equipmentList = response.data.checkDetailsList;
+          // this.loading = false;
+        })
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.roleId)
+        this.single = selection.length!=1
+        this.multiple = !selection.length
+      }, 
+    
+      /** 新增按钮操作 */
+      handleSave() {
+        if(this.equipmentList.length>0){
+           this.$refs["maForm"].validate(valid => {
+              if (valid) {
+                // console.log(this.maForm,'maForm')
+                // console.log(this.equipmentList,'equipmentList')
+                let isEmpty = true
+                this.equipmentList.forEach(item=>{
+                  if(item.purchaseNum=='' || !item.purchaseNum){
+                    isEmpty = false
+                  }
+                })
+                // console.log(this.taskId)
+              
+                this.maForm.taskId = this.taskId
+                this.maForm.checkDetailsList = this.equipmentList;
+                // console.log(this.maForm)
+                if(isEmpty){
+                  if(this.equipmentList.length>0){
+                    this.$modal.confirm('是否确认保存当前页面').then(function() { }).then(() => {
+                      
+                    if(this.isEdit){
+                      console.log('编辑')
+                    //   this.loading = true;
+                    //   updatePurchaseCheckInfo(this.maForm).then(response => {
+                    //     if(response.code == 200){
+                    //       this.$modal.msgSuccess("编辑成功");
+                    //       this.$tab.closeOpenPage({ path: "/store/plan/plan"}); 
+                    //     }
+                    //     this.loading = false;
+                    //   })
+                      
+                    }else if(!this.isEdit){
+                      console.log('新增')
+                    //   this.loading = true;
+                    //   addPurchaseCheckInfo(this.maForm).then(response => {
+                    //     if(response.code == 200){
+                    //       this.$modal.msgSuccess("新增成功");
+                    //       this.$tab.closeOpenPage({ path: "/store/plan/plan"});
+                    //     }
+                    //     this.loading = false;
+                    //   })
+                    }
+                  }).catch(() => {});
+                  }else{
+                    this.$modal.msgError("请先选择并添加机具类型！！！");
+                  }
+                }else{
+                  this.$modal.msgError("请填写采购数量！！！");
+                }
+              }
+          })
+        }else{
+          this.$modal.msgError("请先添加机具类型");
+        }
+      },
+      backList(){
+        const obj = { path: "/store/plan/plan" }
+        this.$tab.closeOpenPage(obj);
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        console.log(row.id)
+        this.$modal.confirm('是否确认删除该数据项？').then(() => {
+          this.equipmentList.forEach((item,index)=>{
+            if(item.id == row.id){
+              this.equipmentList.splice(index,1)
+            }
+          })
+        }).catch(() => {});
+      },
+      
+  
+    }
+  };
+  </script>
+  <style lang="scss" scoped>
+  ::v-deep.el-table .fixed-width .el-button--mini {
+    width: 60px !important;
+    margin-bottom: 10px;
+  }
+  
+  ::v-deep input::-webkit-inner-spin-button {
+      -webkit-appearance: none !important;
+  }
+  ::v-deep input[type="number"] {
+      -moz-appearance: textfield !important;
+  }
+  </style>

sgzb-ui/src/views/store/newBuy/planSecond.vue

@@ -38,16 +38,7 @@
             v-hasPermi="['store:labelType:export']"
         >导出</el-button>
       </el-col>
-      <el-col :span="1.5">
+
-        <el-button
-            type="danger"
-            plain
-            icon="el-icon-refresh"
-            size="mini"
-            @click="handleRefreshCache"
-            v-hasPermi="['store:labelType:remove']"
-        >刷新缓存</el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -138,10 +129,10 @@
       <el-table v-loading="loading" :data="typeList" height="500px" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" align="center" prop="dictId" />
-        <el-table-column label="物资名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
+        <el-table-column label="物资名称" align="center" prop="" :show-overflow-tooltip="true" />
-        <el-table-column label="规格型号" align="center" prop="dictName" :show-overflow-tooltip="true" />
+        <el-table-column label="规格型号" align="center" prop="" :show-overflow-tooltip="true" />
-        <el-table-column label="单位" align="center" prop="dictName" :show-overflow-tooltip="true" />
+        <el-table-column label="单位" align="center" prop="" :show-overflow-tooltip="true" />
-        <el-table-column label="剩余计划数" align="center" prop="dictName" :show-overflow-tooltip="true" />
+        <el-table-column label="剩余计划数" align="center" prop="" :show-overflow-tooltip="true" />
         <el-table-column label="借调数量" align="center" class-name="small-padding fixed-width" width="200">
           <template slot-scope="scope">
             <el-input
@@ -155,7 +146,7 @@
           <template slot-scope="scope">
             <el-input
                 v-model="scope.row.dictName"
-                placeholder="请输入借调数量"
+                placeholder="请输入备注"
                 clearable
             />
           </template>
@@ -205,8 +196,6 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      // 日期范围
-      dateRange: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -219,12 +208,12 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        dictName: [
+        // dictName: [
-          { required: true, message: "字典名称不能为空", trigger: "blur" }
+        //   { required: true, message: "字典名称不能为空", trigger: "blur" }
-        ],
+        // ],
-        dictType: [
+        // dictType: [
-          { required: true, message: "字典类型不能为空", trigger: "blur" }
+        //   { required: true, message: "字典类型不能为空", trigger: "blur" }
-        ]
+        // ]
       }
     };
   },
@@ -235,13 +224,23 @@ export default {
     /** 查询字典类型列表 */
     getList() {
       this.loading = true;
-      listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listType(this.queryParams).then(response => {
             this.typeList = response.rows;
             this.total = response.total;
             this.loading = false;
           }
       );
     },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -258,17 +257,6 @@ export default {
       };
       this.resetForm("form");
     },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
@@ -277,19 +265,19 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.dictId)
+      this.ids = selection.map(item => item)
       this.single = selection.length!=1
       this.multiple = !selection.length
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
+      // this.reset();
-      const dictId = row.dictId || this.ids
+      // const dictId = row.dictId || this.ids
-      getType(dictId).then(response => {
+      // getType(dictId).then(response => {
-        this.form = response.data;
+      //   this.form = response.data;
-        this.open = true;
+      //   this.open = true;
-        this.title = "修改";
+      //   this.title = "修改";
-      });
+      // });
     },
     /** 提交按钮 */
     submitForm: function() {
@@ -313,27 +301,21 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const dictIds = row.dictId || this.ids;
+      // const dictIds = row.dictId || this.ids;
-      this.$modal.confirm('是否确认删除该数据项？').then(function() {
+      // this.$modal.confirm('是否确认删除该数据项？').then(function() {
-        return delType(dictIds);
+      //   return delType(dictIds);
-      }).then(() => {
+      // }).then(() => {
-        this.getList();
+      //   this.getList();
-        this.$modal.msgSuccess("删除成功");
+      //   this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      // }).catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/dict/type/export', {
+      // this.download('system/dict/type/export', {
-        ...this.queryParams
+      //   ...this.queryParams
-      }, `type_${new Date().getTime()}.xlsx`)
+      // }, `type_${new Date().getTime()}.xlsx`)
     },
-    /** 刷新缓存按钮操作 */
+     
-    handleRefreshCache() {
-      refreshCache().then(() => {
-        this.$modal.msgSuccess("刷新成功");
-        this.$store.dispatch('dict/cleanDict');
-      });
-    }
   }
 };
 </script>