!18 同步代码

同步

src/views/mes/dv/machinery/index.vue

@@ -646,7 +646,7 @@ export default {
 
       inputName: "",
 
-      queryParamsdata:{},
+      queryParamsdata: {},
 
       // 表单校验
       rules: {
@@ -663,9 +663,9 @@ export default {
         machineryTypeId: [
           { required: true, message: "设备分类不能为空", trigger: "blur" },
         ],
-        // idList: [
+        workshopName: [
-        //   { required: true, message: "关联代码程序不能为空", trigger: "blur" },
+          { required: true, message: "所属车间不能为空", trigger: "blur" },
-        // ],
+        ],
       },
     };
   },
@@ -794,9 +794,9 @@ export default {
       this.getWorkshops();
       this.userName = "";
       this.inputName = "";
-      if (this.queryParamsdata.machineryTypeId != 0) {
+      // if (this.queryParamsdata.machineryTypeId != 0) {
-        this.form = this.queryParamsdata;
+      //   this.form = this.queryParamsdata;
-      }
+      // }
       this.optType = "add";
       this.open = true;
       this.title = "新增设备";

src/views/mes/pro/workorder/index.vue

@@ -703,7 +703,7 @@ export default {
     },
     handleConfirm(){
       let that = this;
-      this.$modal.confirm('是确认完成工单编制？【确认后将不能更改】').then(function(){
+      this.$modal.confirm('是否确认完成工单编制？【确认后将不能更改】').then(function(){
         that.form.status = 'CONFIRMED';
         that.submitForm();
       });

src/views/mes/wm/issue/line.vue

@@ -9,7 +9,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['mes:wm:issueheader:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -20,7 +21,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['mes:wm:issueheader:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -31,24 +33,59 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['mes:wm:issueheader:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="issuelineList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="issuelineList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="产品物料编码" width="120px" align="center" prop="itemCode" />
+      <el-table-column
-      <el-table-column label="产品物料名称" width="120px"  align="center" prop="itemName" :show-overflow-tooltip="true"/>
+        label="产品物料编码"
-      <el-table-column label="规格型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
+        width="120px"
+        align="center"
+        prop="itemCode"
+      />
+      <el-table-column
+        label="产品物料名称"
+        width="120px"
+        align="center"
+        prop="itemName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="规格型号"
+        align="center"
+        prop="specification"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column label="单位" align="center" prop="unitOfMeasure" />
       <el-table-column label="领料数量" align="center" prop="quantityIssued" />
       <el-table-column label="批次号" align="center" prop="batchCode" />
       <el-table-column label="仓库名称" align="center" prop="warehouseName" />
       <el-table-column label="库区名称" align="center" prop="locationName" />
       <el-table-column label="库位名称" align="center" prop="areaName" />
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>
+      <el-table-column
-      <el-table-column label="操作" align="center" v-if="optType != 'view'" width="100px" class-name="small-padding fixed-width">
+        label="备注"
+        align="center"
+        prop="remark"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="操作"
+        align="center"
+        v-if="optType != 'view'"
+        width="100px"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -57,7 +94,8 @@
             @click="handleUpdate(scope.row)"
             v-if="optType != 'view'"
             v-hasPermi="['mes:wm:issueheader:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
@@ -65,13 +103,14 @@
             @click="handleDelete(scope.row)"
             v-if="optType != 'view'"
             v-hasPermi="['mes:wm:issueheader:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -80,15 +119,28 @@
 
     <!-- 添加或修改生产领料单行对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-row>
           <el-col :span="8">
             <el-form-item label="产品物料编码" prop="itemCode">
-                    <el-input v-model="form.itemCode" readonly="readonly" placeholder="请选择产品物料编码" >
+              <el-input
-                      <el-button slot="append" @click="handleSelectStock" icon="el-icon-search"></el-button>
+                v-model="form.itemCode"
+                readonly="readonly"
+                placeholder="请选择产品物料编码"
+              >
+                <el-button
+                  slot="append"
+                  @click="handleSelectStock"
+                  icon="el-icon-search"
+                ></el-button>
               </el-input>
             </el-form-item>
-                <StockSelect ref="stockSelect" :batchCode="batchCdoe" :vendorId="vendorId" @onSelected="onStockSelected"></StockSelect>
+            <StockSelect
+              ref="stockSelect"
+              :batchCode="batchCdoe"
+              :vendorId="vendorId"
+              @onSelected="onStockSelected"
+            ></StockSelect>
           </el-col>
           <el-col :span="8">
             <el-form-item label="产品物料名称" prop="itemName">
@@ -97,14 +149,22 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="领料数量" prop="quantityIssued">
-              <el-input-number :max="form.quantityMax" v-model="form.quantityIssued" placeholder="请输入领料数量" />
+              <el-input-number
+                :max="form.quantityMax"
+                v-model="form.quantityIssued"
+                placeholder="请输入领料数量"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="规格型号" prop="specification">
-                    <el-input v-model="form.specification" readonly="readonly" type="textarea" />
+              <el-input
+                v-model="form.specification"
+                readonly="readonly"
+                type="textarea"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -119,9 +179,7 @@
               <el-input v-model="form.batchCode" readonly="readonly" />
             </el-form-item>
           </el-col>
-            <el-col :span="8">
+          <el-col :span="8"> </el-col>
-
-            </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
@@ -157,17 +215,23 @@
 </template>
 
 <script>
-import { listIssueline, getIssueline, delIssueline, addIssueline, updateIssueline } from "@/api/mes/wm/issueline";
+import {
-import StockSelect from "@/components/stockSelect/single.vue"
+  listIssueline,
+  getIssueline,
+  delIssueline,
+  addIssueline,
+  updateIssueline,
+} from "@/api/mes/wm/issueline";
+import StockSelect from "@/components/stockSelect/single.vue";
 export default {
   name: "Issueline",
-  components:{StockSelect},
+  components: { StockSelect },
-    props:{
+  props: {
     optType: null,
     issueId: null,
     warehouseId: null,
     locationId: null,
-    areaId: null
+    areaId: null,
   },
   data() {
     return {
@@ -216,12 +280,15 @@ export default {
       // 表单校验
       rules: {
         itemId: [
-          { required: true, message: "产品物料不能为空", trigger: "blur" }
+          { required: true, message: "产品物料不能为空", trigger: "blur" },
         ],
         quantityIssued: [
-          { required: true, message: "领料数量不能为空", trigger: "blur" }
+          { required: true, message: "领料数量不能为空", trigger: "blur" },
         ],
-      }
+        itemCode: [
+          { required: true, message: "产品物料编码不能为空", trigger: "blur" },
+        ],
+      },
     };
   },
   created() {
@@ -231,7 +298,7 @@ export default {
     /** 查询生产领料单行列表 */
     getList() {
       this.loading = true;
-      listIssueline(this.queryParams).then(response => {
+      listIssueline(this.queryParams).then((response) => {
         this.issuelineList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -271,7 +338,7 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
       };
       this.resetForm("form");
     },
@@ -287,9 +354,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.lineId)
+      this.ids = selection.map((item) => item.lineId);
-      this.single = selection.length!==1
+      this.single = selection.length !== 1;
-      this.multiple = !selection.length
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -300,8 +367,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const lineId = row.lineId || this.ids
+      const lineId = row.lineId || this.ids;
-      getIssueline(lineId).then(response => {
+      getIssueline(lineId).then((response) => {
         this.form = response.data;
         this.warehouseInfo[0] = response.data.warehouseId;
         this.warehouseInfo[1] = response.data.locationId;
@@ -312,16 +379,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.lineId != null) {
-            updateIssueline(this.form).then(response => {
+            updateIssueline(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addIssueline(this.form).then(response => {
+            addIssueline(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -333,20 +400,24 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const lineIds = row.lineId || this.ids;
-      this.$modal.confirm('是否确认删除生产领料单行编号为"' + lineIds + '"的数据项？').then(function() {
+      this.$modal
+        .confirm('是否确认删除生产领料单行编号为"' + lineIds + '"的数据项？')
+        .then(function () {
           return delIssueline(lineIds);
-      }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+        })
+        .catch(() => {});
     },
-    handleSelectStock(){
+    handleSelectStock() {
       this.$refs.stockSelect.showFlag = true;
       this.$refs.stockSelect.getList();
     },
     //物料选择弹出框
-    onStockSelected(obj){
+    onStockSelected(obj) {
-        if(obj != undefined && obj != null){
+      if (obj != undefined && obj != null) {
         this.form.materialStockId = obj.materialStockId;
         this.form.itemId = obj.itemId;
         this.form.itemCode = obj.itemCode;
@@ -369,10 +440,14 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('wm/issueline/export', {
+      this.download(
-        ...this.queryParams
+        "wm/issueline/export",
-      }, `issueline_${new Date().getTime()}.xlsx`)
+        {
-    }
+          ...this.queryParams,
-  }
+        },
+        `issueline_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>

src/views/mes/wm/itemrecpt/index.vue

@@ -496,7 +496,7 @@ export default {
       itemrecptlineList: [],
       itemList: [],
       perform: {},
-      remainingquantity: "",
+      remainingquantity: 0,
       recptIdsData: "",
       itemData: "",
       // 查询参数
@@ -699,7 +699,12 @@ export default {
       });
     },
     selectEncoding(data) {
-      this.remainingquantity = data.quantityRecived;
+      var arr = data.quantityRecived - data.accepted;
+      if (arr != 0) {
+        this.remainingquantity = arr;
+      } else {
+        this.remainingquantity = 0;
+      }
       this.perform.itemCode = data.itemCode;
       this.perform.lineId = data.lineId;
       this.perform.itemId = data.itemId;
@@ -709,12 +714,19 @@ export default {
       this.perform.palletCode = data.palletCode;
     },
     submitFileForm() {
+      if (this.remainingquantity != 0) {
         storage(this.perform).then((response) => {
           this.$modal.msgSuccess("入库成功");
           this.warehousing = false;
           this.getList();
           this.selectEncoding();
         });
+      } else {
+        this.$message({
+          message: "当前入库数量为0",
+          type: "warning",
+        });
+      }
     },
     /** 提交按钮 */
     submitForm() {

src/views/system/user/index.vue

@@ -165,14 +165,14 @@
         >
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column
-            label="用户编号"
+            label="员工工号"
             align="center"
             key="userId"
             prop="userId"
             v-if="columns[0].visible"
           />
           <el-table-column
-            label="用户名称"
+            label="登录账号"
             align="center"
             key="userName"
             prop="userName"
@@ -180,7 +180,7 @@
             :show-overflow-tooltip="true"
           />
           <el-table-column
-            label="用户昵称"
+            label="员工姓名"
             align="center"
             key="nickName"
             prop="nickName"