Merge remote-tracking branch 'origin/dev' into dev

.gitignore

@@ -32,3 +32,4 @@ pnpm-debug.log*
 /.vscode/
 /.history/
 /svn clear.bat
+package-lock.json

src/api/mes/pro/workorder.js

@@ -57,4 +57,12 @@ export function dofinish(workorderId){
     url: '/mes/pro/workorder/'+workorderId,
     method: 'put'
   })
+}
+
+  //单个完成工单，将草稿->已确认
+  export function confirmedWorkorder(workorderId){
+    return request({
+      url: '/mes/pro/workorder/setStatus/'+workorderId,
+      method: 'get'
+    })
 }
\ No newline at end of file

src/views/mes/dv/brandquotation/brandquotationApply.vue

@@ -290,6 +290,7 @@ export default {
         itemName: null, // 可以查简称与英文名
         brandQuotationName: null,
         brandName: null,
+        amount: null,
       },
       options: [
         // { value: null, label: "全部订单" },
@@ -346,6 +347,7 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
+        amount: null,
       };
       this.resetForm("form");
     },

src/views/mes/dv/brandquotation/brandquotationInfo.vue

@@ -26,7 +26,7 @@
         <el-row>
           <el-col :md="6" :sm="12" :xs="12">
             <el-form-item prop="brandQuotationCode">
-              <template slot="label"> 品牌报价单编码 </template>
+              <template slot="label"> 编码 </template>
               <el-input
                 disabled
                 v-model="form.brandQuotationCode"
@@ -36,7 +36,7 @@
           </el-col>
 
           <el-col :md="6" :sm="12" :xs="12">
-            <el-form-item label="品牌报价单名称" prop="brandQuotationName">
+            <el-form-item label="名称" prop="brandQuotationName">
               <el-input
                 v-model="form.brandQuotationName"
                 placeholder="请输入品牌报价单名称"
@@ -47,7 +47,8 @@
             <el-form-item label="总金额" prop="amount">
               <el-input-money 
               v-model="form.amount" 
-              placeholder="请输入总金额"/>
+              v-bind:disabled="form.brandQuotationId==0"
+              placeholder="新增时不可输入，请修改时操作"/>
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
@@ -87,9 +88,7 @@
               @onSelected="onBrandSelected"
             ></BrandSelect>
           </el-col> -->
-        </el-row>
 
-        <el-row>
           <el-col :md="6" :sm="12" :xs="12">
             <el-form-item label="产品" prop="itemId">
               <el-input

src/views/mes/pro/productiorequest/requestApply.vue

@@ -153,12 +153,12 @@
         prop="factoryName"
         :show-overflow-tooltip="true"
       />
-      <el-table-column
+      <!-- <el-table-column
         label="仓库"
         align="center"
         prop="warehouse"
         :show-overflow-tooltip="true"
-      />
+      /> -->
       <el-table-column
         label="尺码组"
         align="center"

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

@@ -243,25 +243,25 @@
           <span>{{ parseTime(scope.row.requestDate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         label="生产状态"
         align="center"
         prop="status"
         width="120"
-      />
-      <el-table-column label="备注" align="center" prop="remark" width="120" />
+      /> -->
       <el-table-column
         label="操作"
         width="150px"
         align="center"
         class-name="small-padding fixed-width"
+        fixed="right"
       >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.status == 'NORMARL'"
+            v-if="scope.row.status == 'PREPARE'"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['mes:pro:protask:edit']"
             >排产</el-button
@@ -289,7 +289,7 @@
         <el-row>
           <el-col :lg="8" :md="8" :sm="12" :xs="12">
             <el-form-item label="编号" prop="taskCode">
-              <el-input v-model="form.taskCode" readonly="readonly" disabled/>
+              <el-input v-model="form.taskCode" readonly="readonly" disabled />
             </el-form-item>
           </el-col>
           <el-col :lg="8" :md="8" :sm="12" :xs="12">
@@ -299,24 +299,32 @@
           </el-col>
           <el-col :lg="8" :md="8" :sm="12" :xs="12">
             <el-form-item label="产品名称" prop="itemName">
-              <el-input v-model="form.itemName" readonly="readonly"  disabled/>
+              <el-input v-model="form.itemName" readonly="readonly" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :lg="8" :md="8" :sm="12" :xs="12">
             <el-form-item label="工序名称" prop="processName">
-              <el-input v-model="form.processName" readonly="readonly" disabled />
+              <el-input
+                v-model="form.processName"
+                readonly="readonly"
+                disabled
+              />
             </el-form-item>
           </el-col>
           <el-col :lg="8" :md="8" :sm="12" :xs="12">
             <el-form-item label="工作站" prop="workstationName">
-              <el-input v-model="form.workstationName" readonly="readonly" disabled />
+              <el-input
+                v-model="form.workstationName"
+                readonly="readonly"
+                disabled
+              />
             </el-form-item>
           </el-col>
           <el-col :lg="8" :md="8" :sm="12" :xs="12">
-            <el-form-item label="工作单元" prop="workunitId" required: true>
-              <el-input v-model="form.workunitName" >
+            <el-form-item label="工作单元" prop="workunitId">
+              <el-input v-model="form.workunitName">
                 <el-button
                   slot="append"
                   icon="el-icon-search"
@@ -333,12 +341,17 @@
         </el-row>
         <el-row>
           <el-col :lg="8" :md="8" :sm="12" :xs="12">
-            <el-form-item label="排产数量" prop="quantity" required: true>
-              <el-input-number :step="1" :min="0"  v-model="form.quantity" placeholder="请输入排产数量" />
+            <el-form-item label="排产数量" prop="quantity">
+              <el-input-number
+                :step="1"
+                :min="0"
+                v-model="form.quantity"
+                placeholder="请输入排产数量"
+              />
             </el-form-item>
           </el-col>
           <el-col :lg="8" :md="8" :sm="12" :xs="12">
-            <el-form-item label="开始时间" prop="startTime"  required: true>
+            <el-form-item label="开始时间" prop="startTime">
               <el-date-picker
                 v-model="form.startTime"
                 type="datetime"
@@ -349,8 +362,13 @@
             </el-form-item>
           </el-col>
           <el-col :lg="8" :md="8" :sm="12" :xs="12">
-            <el-form-item label="生产时长" prop="duration" required: true>
-              <el-input-number :step="1" :min="0"  v-model="form.duration" placeholder="请输入生产时长" />
+            <el-form-item label="生产时长" prop="duration">
+              <el-input-number
+                :step="1"
+                :min="0"
+                v-model="form.duration"
+                placeholder="请输入生产时长"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -395,25 +413,25 @@
         <el-button
           type="primary"
           @click="cancel"
-          v-if="optType == 'view' || form.status != 'NORMARL'"
+          v-if="optType == 'view' || form.status != 'PREPARE'"
           >返回</el-button
         >
         <el-button
           type="primary"
           @click="submitForm"
-          v-if="form.status == 'NORMARL' && optType != 'view'"
+          v-if="form.status == 'PREPARE' && optType != 'view'"
           >确 定</el-button
         >
-        <el-button
+        <!-- <el-button
           type="success"
           @click="handleFinish"
           v-if="
-            form.status == 'NORMARL' &&
+            form.status == 'PREPARE' &&
             optType != 'view' &&
             form.workorderId != null
           "
           >完成</el-button
-        >
+        > -->
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -421,13 +439,6 @@
 </template>
 
 <script>
-import {
-  listWorkorder,
-  getWorkorder,
-  delWorkorder,
-  addWorkorder,
-  updateWorkorder,
-} from "@/api/mes/pro/workorder";
 import {
   listProtask,
   listGanttTaskList,
@@ -441,7 +452,6 @@ import { listProductprocess } from "@/api/mes/pro/routeprocess";
 import WorkuintSelect from "@/components/workunitSelect/single.vue";
 import ProTask from "./proTask.vue";
 import GanttChar from "./ganttx.vue";
-import { listWorkunit } from "@/api/mes/md/workunit";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
@@ -523,7 +533,7 @@ export default {
         colorCode: null,
         requestDate: null,
         remark: null,
-        status: "NORMARL",
+        status: "PREPARE",
         workunitName: null,
         workunitId: null,
       },
@@ -565,14 +575,11 @@ export default {
     },
     // 获取工作单元
     onWorkunitSelect(row) {
-
       console.log(45456, row);
       if (row != undefined && row != null) {
         this.form.workunitId = row.workunitId;
         this.form.workunitName = row.workunitName;
-        console.log(111111, this.form)
-
-        
+        console.log(111111, this.form);
       }
     },
 
@@ -753,9 +760,10 @@ export default {
           if (this.form.taskId != null) {
             updateProtask(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
-              //this.open = false;
-              this.$refs["bomlist"].getList();
+              this.open = false;
+              // this.$refs["bomlist"].getList();
               this.getList();
+              this.getGanttTasks();
             });
           } else {
             addProtask(this.form).then((response) => {

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

 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
-      <el-form-item label="工单编码" prop="workorderCode">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <!-- <el-form-item label="工单编码" prop="workorderCode">
         <el-input
           v-model="queryParams.workorderCode"
           placeholder="请输入工单编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
+      </el-form-item> -->
+      <el-form-item label="状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          clearable
+          placeholder="请选择状态"
+        >
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="工单名称" prop="workorderName">
         <el-input
@@ -33,14 +41,14 @@
         />
       </el-form-item>
 
-      <el-form-item label="产品编号" prop="productCode">
+      <!-- <el-form-item label="产品编号" prop="productCode">
         <el-input
           v-model="queryParams.productCode"
           placeholder="请输入产品编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="产品名称" prop="productName">
         <el-input
           v-model="queryParams.productName"
@@ -50,14 +58,14 @@
         />
       </el-form-item>
 
-      <el-form-item label="客户编码" prop="clientCode">
+      <!-- <el-form-item label="客户编码" prop="clientCode">
         <el-input
           v-model="queryParams.clientCode"
           placeholder="请输入客户编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="客户名称" prop="clientName">
         <el-input
           v-model="queryParams.clientName"
@@ -66,14 +74,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工单类型" prop="workorderType">
+      <!-- <el-form-item label="工单类型" prop="workorderType">
         <el-input
           v-model="queryParams.workorderType"
           placeholder="请选择工单类型"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="需求日期" prop="requestDate">
         <el-date-picker
           clearable
@@ -281,6 +289,7 @@
         label="操作"
         width="150px"
         align="center"
+        fixed="right"
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
@@ -291,9 +300,16 @@
             v-if="scope.row.status == 'PREPARE'"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['mes:pro:workorder:edit']"
-            >修改</el-button
-          >
-          <el-button
+          >修改</el-button> 
+           <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            v-if="scope.row.status == 'PREPARE'"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['mes:pro:workorder:remove']"
+          >删除</el-button>
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-plus"
@@ -313,16 +329,16 @@
             @click="handleFinish(scope.row)"
             v-hasPermi="['mes:pro:workorder:update']"
             >完成</el-button
-          >
-          <el-button
+          > -->
+         
+          <!-- <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
-            v-if="scope.row.status == 'PREPARE'"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:pro:workorder:remove']"
-            >删除</el-button
-          >
+            icon="el-icon-circle-check"
+            v-if="scope.row.status =='PREPARE'"
+            @click="confirmWorkorder(scope.row)"
+            v-hasPermi="['mes:pro:workorder:update']"
+          >确认</el-button> -->
         </template>
       </el-table-column>
     </el-table>
@@ -685,8 +701,19 @@ export default {
         requestDate: null,
         parentId: null,
         ancestors: null,
-        status: null,
+        status: 'PREPARE',
       },
+// 表单状态
+      options: [
+          { value: "PREPARE", label: "待确认" },
+          { value: "CONFIRMED", label: "已确认" },
+          { value: "APPROVING", label: "审批中" },
+          { value: "APPROVED", label: "已审批" },
+          { value: "FINISHED", label: "已完成" },
+          { value: "TASKGENERATED", label: "已生成任务单" },
+          { value: "ISSUEGENERATED", label: "已生成领料单" },
+          { value: "PRODUCIONG", label: "生产中" },
+        ],
       // 表单参数
       form: {},
       // 表单校验
@@ -1017,6 +1044,15 @@ export default {
         this.form.vendorName = obj.vendorName;
       }
     },
+    /** 完成任务单操作 */
+    confirmWorkorder(row) {
+      this.$modal.confirm('是否将工单编号"' + row.workorderCode + '"的草稿数据项改为已确认？').then(function() {
+        return confirmedWorkorder(row.workorderId);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("已确认成功");
+      }).catch(() => {});
+    },
     //自动生成编码
     handleAutoGenChange(autoGenFlag) {
       if (autoGenFlag) {

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

@@ -597,8 +597,13 @@ export default {
             this.loading = false;
             this.$modal.msgSuccess("提交成功！");
 
-            // 关闭页签
-            tabPlugins.closeOpenPage();
+            this.$nextTick(() => {
+              // 关闭页签
+              tabPlugins.closeOpenPage();
+              this.$router.replace({
+                path: '/mes/pro/workorder'
+              })
+            })
           })
           .catch(() => {
             this.loading = false;

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

@@ -50,7 +50,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -59,8 +59,8 @@
           @click="handleAdd"
           v-hasPermi="['mes:wm:issueheader:add']"
         >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
+      </el-col> -->
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -70,7 +70,7 @@
           @click="handleUpdate"
           v-hasPermi="['mes:wm:issueheader:edit']"
         >修改</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -130,14 +130,14 @@
             @click="handleExecute(scope.row)"
             v-hasPermi="['mes:wm:issueheader:edit']"
           >执行领出</el-button>
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             v-if="scope.row.status =='PREPARE'"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['mes:wm:issueheader:edit']"
-          >修改</el-button>
+          >修改</el-button> -->
           <el-button
             size="mini"
             type="text"