生产方案功能

src/api/mes/pro/productionSolution.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询生产方案列表
 export function listProductionSolution(query) {
   return request({
-    url: '/mes/pro/productionSolution/list',
+    url: 'pro/productionSolution/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listProductionSolution(query) {
 // 查询生产方案详细
 export function getProductionSolution(productionSolutionId) {
   return request({
-    url: '/mes/pro/productionSolution/' + productionSolutionId,
+    url: 'pro/productionSolution/' + productionSolutionId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getProductionSolution(productionSolutionId) {
 // 新增生产方案
 export function addProductionSolution(data) {
   return request({
-    url: '/mes/pro/productionSolution',
+    url: 'pro/productionSolution',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addProductionSolution(data) {
 // 修改生产方案
 export function updateProductionSolution(data) {
   return request({
-    url: '/mes/pro/productionSolution',
+    url: 'pro/productionSolution',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateProductionSolution(data) {
 // 删除生产方案
 export function delProductionSolution(productionSolutionId) {
   return request({
-    url: '/mes/pro/productionSolution/' + productionSolutionId,
+    url: 'pro/productionSolution/' + productionSolutionId,
     method: 'delete'
   })
 }

src/views/mes/pro/productionSolution/proofingApply.vue

@@ -8,19 +8,19 @@
       v-show="showSearch"
       label-width="100px"
     >
-      <el-form-item label="产品名称" prop="itemName">
+      <el-form-item label="生产方案名称" prop="productionSolutionName">
         <el-input
           v-model="queryParams.itemName"
-          placeholder="请输入产品名称"
+          placeholder="请输入方案名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="单据状态" prop="prototypeRequestStatus">
+      <el-form-item label="生产用途" prop="usageName">
         <el-select
           v-model="queryParams.prototypeRequestStatus"
           clearable
-          placeholder="请选择单据状态"
+          placeholder="请输入生产用途"
         >
           <el-option
             v-for="item in options"
@@ -61,7 +61,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -72,8 +72,8 @@
           v-hasPermi="['mes:pro:prototypeRequest:add']"
           >新增</el-button
         > 
-      </el-col>
-      <el-col :span="1.5">
+      </el-col>-->
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -84,8 +84,8 @@
           v-hasPermi="['mes:pro:prototypeRequest:edit']"
           >修改</el-button
         > 
-      </el-col>
-      <el-col :span="1.5">
+      </el-col>-->
+      <!-- <el-col :span="1.5">
         <el-button
           type="danger"
           plain
@@ -96,8 +96,8 @@
           v-hasPermi="['mes:pro:prototypeRequest:remove']"
           >删除</el-button
         >
-      </el-col>
-      <el-col :span="1.5">
+      </el-col> -->
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -107,83 +107,41 @@
           v-hasPermi="['mes:pro:prototypeRequest:export']"
           >导出</el-button
         >
-      </el-col>
-      <right-toolbar
+      </el-col> -->
+      <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
       ></right-toolbar>
-    </el-row>
+    </el-row> -->
 
-    <el-table
-      v-loading="loading"
-      :data="prototypeRequestList"
-      row-key="prototypeRequestId"
-      default-expand-all
-    >
-      <el-table-column label="样品编码" width="180" prop="prototypeRequestCode">
+    <el-table v-loading="loading" :data="productionSolutionList" row-key="productionSolutionId" default-expand-all  >
+      <el-table-column label="生产方案编码"  prop="productionSolutionCode">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             @click="handleView(scope.row)"
-            v-hasPermi="['mes:pro:prototypeRequest:query']"
-            >{{ scope.row.prototypeRequestCode }}</el-button
-          >
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="产品名称"
-        width="120"
-        align="center"
-        prop="itemName"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column label="工艺路线名称" align="center" prop="routeName">
-      </el-table-column>
-      <el-table-column
-        label="计划完成日期"
-        align="center"
-        prop="plannedFinishDate"
-        width="180"
-      >
-        <template slot-scope="scope">
-          <span>{{
-            parseTime(scope.row.plannedFinishDate, "{y}-{m}-{d}")
-          }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="版面需求时间"
-        align="center"
-        prop="plannedLayoutDate"
-        width="180"
+            v-hasPermi="['mes:pro:productionSolutionCode:query']"
+            >{{ scope.row.productionSolutionCode }}</el-button
           >
-        <template slot-scope="scope">
-          <span>{{
-            parseTime(scope.row.plannedLayoutDate, "{y}-{m}-{d}")
-          }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="申请单状态"
-        align="center"
-        prop="prototypeRequestStatus"
-      >
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.mes_pr_status"
-            :value="scope.row.prototypeRequestStatus"
+      <el-table-column  label="产品方案名称"    align="center"  prop="productionSolutionName"  :show-overflow-tooltip="true"
       />
-        </template>
-      </el-table-column>
+      <el-table-column label="生产用途"  align="center" prop="usageName" />
       <el-table-column label="备注"  align="center" prop="remark" />
-      <el-table-column
+      <!-- <el-table-column label="备注" align="center" prop="usageName"  width="180"/> -->
+       
+     
+      
+      <!-- <el-table-column
         label="操作"
         width="200px"
         align="center"
         class-name="small-padding fixed-width"
-      >
-        <template slot-scope="scope">
+      /> -->
+     
+        <!-- <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
@@ -192,8 +150,8 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['mes:pro:prototypeRequest:edit']"
             >修改</el-button
-          >
-          <el-button
+          > -->
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-circle-check"
@@ -201,16 +159,16 @@
             @click="handleFinish(scope.row)"
             v-hasPermi="['mes:pro:prototypeRequest:update']"
             >通过</el-button
-          >
-          <el-button
+          > -->
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['mes:pro:prototypeRequest:remove']"
             >删除</el-button
-          >
-          <el-button
+          > -->
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -218,9 +176,9 @@
             @click="generatea(scope.row)"
             v-hasPermi="['mes:pro:prototypeRequest:edit']"
             >生成制作单</el-button
-          >
-        </template>
-      </el-table-column>
+          > -->
+        <!-- </template> -->
+      <!-- </el-table-column>-->
     </el-table>
     <pagination
       v-show="total > 0"
@@ -230,17 +188,23 @@
       @pagination="getList"
     />
   </div>
+  
 </template>
 
 <script>
 import {
-  listPrototypeRequest,
-  getPrototypeRequest,
-  delPrototypeRequest,
-  addPrototypeRequest,
-  updatePrototypeRequest,
-  dofinish,
-} from "@/api/mes/pro/prototypeRequest";
+//   listPrototypeRequest,
+//   getPrototypeRequest,
+//   delPrototypeRequest,
+//   addPrototypeRequest,
+//   updatePrototypeRequest,
+//   dofinish,
+listProductionSolution,
+getProductionSolution,
+addProductionSolution,
+updateProductionSolution,
+delProductionSolution,
+ } from "@/api/mes/pro/productionSolution";
 import ItemSelect from "@/components/itemSelect/single.vue";
 import ClientSelect from "@/components/clientSelect/single.vue";
 import VendorSelect from "@/components/vendorSelect/single.vue";
@@ -289,8 +253,17 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        itemName: null, // 可以查简称与英文名
-        prototypeRequestStatus: null,
+        productionSolutionId: null, // 可以查简称与英文名
+        productionSolutionCode: null,
+        productionSolutionName: null,
+         itemId: null,
+        routeId: null,
+        usageId: null,
+        remark: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
       },
       options: [
         // { value: null, label: "全部订单" },
@@ -319,8 +292,8 @@ export default {
     /** 查询生产工单列表 */
     getList() {
       this.loading = true;
-      listPrototypeRequest(this.queryParams).then((response) => {
-        this.prototypeRequestList = response.rows;
+      listProductionSolution(this.queryParams).then((response) => {
+        this.productionSolutionList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
@@ -333,23 +306,12 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        prototypeRequestId: null,
-        prototypeRequestCode: null,
+        productionSolutionId: null,
+        productionSolutionCode: null,
+        productionSolutionName: null,
         itemId: null,
-        itemName: null,
         routeId: null,
-        routeName: null,
-        abbreviation: null,
-        enName: null,
-        num: null,
-        type: null,
-        modality: null,
-        surfaceTreatment: null,
-        ngReason: null,
-        plannedFinishDate: null,
-        plannedLayoutDate: null,
-        prototypeRequestStatus: null,
-        testStandard: null,
+        usageId: null,
         remark: null,
         createBy: null,
         createTime: null,
@@ -390,9 +352,9 @@ export default {
     // 查询明细按钮操作
     handleView(row) {
       this.reset();
-      const prototypeRequestId = row.prototypeRequestId || this.ids;
+      const productionSolutionId = row.productionSolutionId || this.ids;
       this.$router.push(
-        "/mes/proofing/info?prototypeRequestId=" + prototypeRequestId
+        "/mes/pro/productionSolution/info?productionSolutionId=" + productionSolutionId
       );
       // getprototypeRequest(prototypeRequestId).then((response) => {
       //   this.form = response.data;

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

@@ -4,13 +4,13 @@
       {{ pageTitle }}
       <!-- 申请按钮显示 -->
       <template slot="buttons" v-if="mode == 'apply'">
-        <el-button size="mini" @click="resetForm">重置</el-button>
-        <el-button size="mini" type="primary" @click="saveForm">提交</el-button>
+        <!-- <el-button size="mini" @click="resetForm">重置</el-button>
+        <el-button size="mini" type="primary" @click="saveForm">提交</el-button> -->
       </template>
 
       <!-- 修改 按钮显示 -->
       <template slot="buttons" v-if="mode == 'edit'">
-        <el-button size="mini" type="primary" @click="saveForm">提交</el-button>
+        <!-- <el-button size="mini" type="primary" @click="saveForm">提交</el-button> -->
       </template>
     </PageTitle>
 
@@ -23,143 +23,65 @@
         label-width="8em"
       >
       <el-row>
-          <el-col :md="8" :xs="12">
-            <el-form-item label="申请单编码" prop="prototypeRequestCode">
+        <el-col :md="12" :xs="12">
+            <el-form-item label="生产方法编码" prop="productionSolutionCode">
               <el-input
+                v-model="form.productionSolutionCode"
                 disabled
-                v-model="form.prototypeRequestCode"
-                placeholder="自动生成"
+                placeholder
               ></el-input>
             </el-form-item>
           </el-col>
-
-          <el-col :md="8" :xs="12" style="height: 50.5px">
-            <el-form-item label="产品" prop="itemId">
-              <el-input
-                v-model="form.itemName"
-                readonly
-                placeholder="请选择产品"
-              >
-                <el-button
-                  slot="append"
-                  icon="el-icon-search"
-                  @click="$refs['ItemSelectRef'].showFlag = true"
-                ></el-button>
-              </el-input>
-              <ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />
-            </el-form-item>
-          </el-col>
-          <el-col :md="8" :xs="12" style="height: 50.5px">
-            <el-form-item label="工艺路线" prop="routeId">
-              <el-input
-                v-model="form.routeName"
-                readonly
-                placeholder="请选择工艺路线"
-              >
-                <el-button
-                  slot="append"
-                  icon="el-icon-search"
-                  @click="$refs['RoutesProcessSelectRef'].showFlag = true"
-                ></el-button>
-              </el-input>
-              <RoutesProcessSelect
-                ref="RoutesProcessSelectRef"
-                @onSelected="onRoutesProcessSelect"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="8" :xs="12">
-            <el-form-item label="简称" prop="abbreviation">
-              <el-input
-                v-model="form.abbreviation"
-                placeholder="请输入简称"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="8" :xs="12">
-            <el-form-item label="样品英文名" prop="enName">
-              <el-input
-                v-model="form.enName"
-                placeholder="请输入样品英文名称"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="8" :xs="12">
-            <el-form-item label="样品数量" prop="num">
-              <el-input v-model="form.num" placeholder="请输入样品数量">
-                <template slot="suffix">{{ form.unit }}</template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="8" :xs="12">
-            <el-form-item label="打样形式" prop="type">
+          <el-col :md="12" :xs="12">
+            <el-form-item label="生产方法名称" prop="productionSolutionName">
               <el-input
-                v-model="form.type"
-                placeholder="请选择打样形式"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="8" :xs="12">
-            <el-form-item label="分配方式" prop="modality">
-              <el-input
-                v-model="form.modality"
-                placeholder="请选择分配方式"
+                v-model="form.productionSolutionName"
+                disabled
+                placeholder
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :md="8" :xs="12">
-            <el-form-item label="表面处理" prop="surfaceTreatment">
+          <el-col :md="12" :xs="12">
+            <el-form-item label="产品名称" prop="itemName">
               <el-input
-                v-model="form.surfaceTreatment"
-                placeholder="请输入表面处理"
+                v-model="form.itemName"
+                disabled
+                placeholder
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :md="8" :xs="12">
-            <el-form-item label="NG原因" prop="ngReason">
+      </el-row>
+      <el-row>    
+          <el-col :md="12" :xs="12">
+            <el-form-item label="工艺路线" prop="routeName">
               <el-input
-                v-model="form.ngReason"
-                placeholder="请输入NG原因"
+                v-model="form.routeName"
+                disabled
+                placeholder
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :md="8" :xs="12">
-            <el-form-item label="计划完成日期" prop="plannedFinishDate">
-              <el-date-picker
-                value-format="yyyy-MM-dd"
-                v-model="form.plannedFinishDate"
-                placeholder="请输入计划完成日期"
-              ></el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :md="8" :xs="12">
-            <el-form-item label="版面需求时间" prop="plannedLayoutDate">
-              <el-date-picker
-                value-format="yyyy-MM-dd"
-                v-model="form.plannedLayoutDate"
-                placeholder="请输入版面需求时间"
-              ></el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :md="8" :xs="12">
-            <el-form-item label="测试标准" prop="testStandard">
+          <el-col :md="12" :xs="12">
+            <el-form-item label="生产用途" prop="usageName">
               <el-input
-                v-model="form.testStandard"
-                placeholder="测试标准"
+                v-model="form.usageName"
+                disabled
+                placeholder
               ></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
+
+        
+         
+          
  <el-col :md="24" :xs="12">
             <el-form-item label="备注" prop="remark">
               <el-input
                 type="textarea"
                 :rows="3"
                 v-model="form.remark"
-                placeholder="备注"
+                disabled
+                placeholder
               ></el-input>
             </el-form-item>
           </el-col>
@@ -187,10 +109,11 @@ import RoutesProcessSelect from "@/components/routesProcessSelect/index.vue";
 import { listRouteprocess } from "@/api/mes/pro/routeprocess";
 import tabPlugins from "@/plugins/tab";
 import {
-  addPrototypeRequest,
-  getPrototypeRequest,
-  updatePrototypeRequest,
-} from "@/api/mes/pro/prototypeRequest";
+  // addPrototypeRequest,
+  // getPrototypeRequest,
+  // updatePrototypeRequest,
+  getProductionSolution
+} from "@/api/mes/pro/productionSolution";
 
 export default {
   components: { ProogingBom, ProogingProcess, ItemSelect, RoutesProcessSelect },
@@ -206,23 +129,19 @@ export default {
       bomList: [],
       // 表单参数
       form: {
-        prototypeRequestCode: "",
+      productionSolutionId: "", 
+        productionSolutionCode: "",
+        productionSolutionName: "",
          itemId: "",
          itemName: "",
-        unit: "",
         routeId: "",
         routeName: "",
-        abbreviation: "",
-        enName: "",
-        num: "",
-        type: "",
-        modality: "",
-        surfaceTreatment: "",
-        ngReason: "",
-        plannedFinishDate: "",
-        plannedLayoutDate: "",
-        testStandard: "",
+        usageId: "",
         remark: "",
+        createBy: "",
+        createTime: "",
+        updateBy: "",
+        updateTime: "",
       },
       rules: {},
     };
@@ -237,7 +156,7 @@ export default {
     pageTitle() {
       const titles = {
         edit: "打样单修改",
-        info: "打样单查看",
+        info: "生产方案详情",
         apply: "打样单申请",
       };
       return titles[this.mode];
@@ -253,9 +172,9 @@ export default {
     /** 根据 id 获取页面数据 */
     getFormInfo() {
       if (this.mode != "apply") {
-        const id = this.$route.query.prototypeRequestId;
+        const id = this.$route.query.productionSolutionId;
         this.loading = true;
-        getPrototypeRequest(id)
+        getProductionSolution(id)
           .then(({ data }) => {
             Object.assign(this.form, data);
             this.bomList = data.bomList;
@@ -338,21 +257,17 @@ export default {
     /**重置表单 */
     resetForm() {
       this.form = {
-        prototypeRequestCode: "",
+       productionSolutionId: "", 
+        productionSolutionCode: "",
+        productionSolutionName: "",
          itemId: "",
-        itemName: "",
         routeId: "",
-        abbreviation: "",
-        enName: "",
-        num: "",
-        type: "",
-        modality: "",
-        surfaceTreatment: "",
-        ngReason: "",
-        plannedFinishDate: "",
-        plannedLayoutDate: "",
-        testStandard: "",
+        usageId: "",
         remark: "",
+        createBy: "",
+        createTime: "",
+        updateBy: "",
+        updateTime: "",
       };
       this.$refs["ProogingBomRef"].resetState();
       this.$refs["ProogingProcessRef"].resetState();

src/views/mes/pro/prototypeMake/prototypeMakeInfo.vue

@@ -36,7 +36,14 @@
 
           <el-col :md="8" :xs="12">
             <el-form-item label="申请单编码" prop="prototypeRequestCode">
-              <el-input disabled v-model="form.prototypeRequestCode"></el-input>
+              <el-input 
+               v-model="form.prototypeRequestCode"
+              readonly
+              disabled
+              :placeholder="mode=='edit' ? '':'请输入申请单编码'"
+              >
+                
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :md="8" :xs="12" style="height: 50.5px">
@@ -45,7 +52,7 @@
                 v-model="form.itemName"
                 readonly
                 disabled
-                placeholder="请选择产品"
+                :placeholder="mode=='edit' ? '':'请选择产品'"
               />
               <!-- <el-button
                   slot="append"
@@ -64,7 +71,7 @@
                 v-model="form.routeName"
                 readonly
                 disabled
-                placeholder="请选择工艺路线"
+                :placeholder="mode=='edit' ? '':'请选择工艺路线'"
               />
               <!-- <el-button
                   slot="append"