合并

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/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
@@ -291,9 +299,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 +328,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>
@@ -608,6 +623,7 @@
 </template>
 
 <script>
+<<<<<<< HEAD
 import {
   listWorkorder,
   getWorkorder,
@@ -617,6 +633,9 @@ import {
   dofinish,
 } from "@/api/mes/pro/workorder";
 import { addProtaskList } from "@/api/mes/pro/protask";
+=======
+import { listWorkorder, getWorkorder, delWorkorder, addWorkorder, updateWorkorder ,dofinish,confirmedWorkorder} from "@/api/mes/pro/workorder";
+>>>>>>> feature/jzc/brand/0.0.2
 import Workorderbom from "./bom/bom.vue";
 import WorkorderItemList from "./items/item.vue";
 import ItemSelect from "@/components/itemSelect/single.vue";
@@ -687,6 +706,17 @@ export default {
         ancestors: null,
         status: null,
       },
+// 表单状态
+      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 +1047,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) {