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

src/api/mes/md/clause.js

+import request from '@/utils/request'
+
+// 查询国际贸易销售条款列表
+export function listClause(query) {
+  return request({
+    url: '/md/clause/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询国际贸易销售条款详细
+export function getClause(id) {
+  return request({
+    url: '/md/clause/' + id,
+    method: 'get'
+  })
+}
+
+// 新增国际贸易销售条款
+export function addClause(data) {
+  return request({
+    url: '/md/clause',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改国际贸易销售条款
+export function updateClause(data) {
+  return request({
+    url: '/md/clause',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除国际贸易销售条款
+export function delClause(id) {
+  return request({
+    url: '/md/clause/' + id,
+    method: 'delete'
+  })
+}

src/api/mes/md/currency.js

+import request from '@/utils/request'
+
+// 查询订单 交易币别列表
+export function listCurrency(query) {
+  return request({
+    url: '/md/currency/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询订单 交易币别详细
+export function getCurrency(id) {
+  return request({
+    url: '/md/currency/' + id,
+    method: 'get'
+  })
+}
+
+// 新增订单 交易币别
+export function addCurrency(data) {
+  return request({
+    url: '/md/currency',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改订单 交易币别
+export function updateCurrency(data) {
+  return request({
+    url: '/md/currency',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除订单 交易币别
+export function delCurrency(id) {
+  return request({
+    url: '/md/currency/' + id,
+    method: 'delete'
+  })
+}

src/api/mes/md/paymentClause.js

+import request from '@/utils/request'
+
+// 查询销售订单付款条件列表
+export function listClause(query) {
+  return request({
+    url: '/md/payment/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询销售订单付款条件详细
+export function getClause(id) {
+  return request({
+    url: '/md/payment/' + id,
+    method: 'get'
+  })
+}
+
+// 新增销售订单付款条件
+export function addClause(data) {
+  return request({
+    url: '/md/payment',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改销售订单付款条件
+export function updateClause(data) {
+  return request({
+    url: '/md/payment',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除销售订单付款条件
+export function delClause(id) {
+  return request({
+    url: '/md/clause/' + id,
+    method: 'delete'
+  })
+}

src/api/mes/md/point.js

+import request from '@/utils/request'
+
+// 查询销售订单装运点列表
+export function listPoint(query) {
+  return request({
+    url: '/md/point/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询销售订单装运点详细
+export function getPoint(id) {
+  return request({
+    url: '/md/point/' + id,
+    method: 'get'
+  })
+}
+
+// 新增销售订单装运点
+export function addPoint(data) {
+  return request({
+    url: '/md/point',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改销售订单装运点
+export function updatePoint(data) {
+  return request({
+    url: '/md/point',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除销售订单装运点
+export function delPoint(id) {
+  return request({
+    url: '/md/point/' + id,
+    method: 'delete'
+  })
+}

src/api/mes/md/reason.js

+import request from '@/utils/request'
+
+// 查询销售订单原因列表
+export function listReason(query) {
+  return request({
+    url: '/md/reason/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询销售订单原因详细
+export function getReason(id) {
+  return request({
+    url: '/md/reason/' + id,
+    method: 'get'
+  })
+}
+
+// 新增销售订单原因
+export function addReason(data) {
+  return request({
+    url: '/md/reason',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改销售订单原因
+export function updateReason(data) {
+  return request({
+    url: '/md/reason',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除销售订单原因
+export function delReason(id) {
+  return request({
+    url: '/md/reason/' + id,
+    method: 'delete'
+  })
+}

src/api/mes/pro/productionRequest.js

+import request from "@/utils/request";
+
+// 查询打样申请列表
+export function listProductionRequest(query) {
+  return request({
+    url: "/mes/pro/productionRequest/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查询打样申请详细
+export function getProductionRequest(productionRequestId) {
+  return request({
+    url: "/mes/pro/productionRequest/" + productionRequestId,
+    method: "get",
+  });
+}
+
+// 新增打样申请
+export function addProductionRequest(data) {
+  return request({
+    url: "/mes/pro/productionRequest",
+    method: "post",
+    data: data,
+  });
+}
+
+// 修改打样申请
+export function updateProductionRequest(data) {
+  return request({
+    url: "/mes/pro/productionRequest",
+    method: "put",
+    data: data,
+  });
+}
+
+// 删除打样申请
+export function delProductionRequest(productionRequestId) {
+  return request({
+    url: "/mes/pro/productionRequest/" + productionRequestId,
+    method: "delete",
+  });
+}
+
+// 修改状态
+export function dofinish(data) {
+  return request({
+    url: "/mes/pro/productionRequest/modifyState/",
+    method: "put",
+    data: data,
+  });
+}

src/views/mes/md/product/components/look.vue

@@ -31,7 +31,7 @@
             <el-input v-model="form.weight" type="number" :precision="2" placeholder="请输入成品克重" />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <!--<el-col :span="8">
           <el-form-item label="角型" prop="angleType">
             <el-select v-model="form.angleType" placeholder="请选择角型">
               <el-option
@@ -42,6 +42,40 @@
               ></el-option>
             </el-select>
           </el-form-item>
+        </el-col>-->
+        <el-col :span="8">
+          <el-form-item label="单重(KG)" prop="singleWeight">
+            <el-input v-model="form.singleWeight" type="number" :precision="2" placeholder="请输入单重" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="圆角" prop="fillet">
+            <el-input v-model="form.fillet" type="number" :precision="2" placeholder="请输入圆角" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="是否异型" prop="fillet">
+            <el-radio-group v-model="form.isAllotype" >
+              <el-radio
+                v-for="dict in dict.type.sys_yes_no"
+                :key="dict.value"
+                :label="dict.value"
+              >{{dict.label}}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item :span="8" label="是否直角" prop="isRightAngle">
+            <el-radio-group v-model="form.isRightAngle">
+              <el-radio
+                v-for="dict in dict.type.sys_yes_no"
+                :key="dict.value"
+                :label="dict.value"
+              >{{dict.label}}</el-radio>
+            </el-radio-group>
+          </el-form-item>
         </el-col>
       </el-row>
       <el-row>
@@ -62,11 +96,7 @@
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="8">
-          <el-form-item label="单重(KG)" prop="singleWeight">
-            <el-input v-model="form.singleWeight" type="number" :precision="2" placeholder="请输入单重" />
-          </el-form-item>
-        </el-col>
+
         <el-col :span="8">
           <el-form-item label="层数" prop="layerNum">
             <el-input v-model="form.layerNum" type="number" :precision="2" placeholder="请输入层数" />
@@ -74,37 +104,33 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="是否防霉" prop="isMould">
-            <el-select v-model="form.isMould" placeholder="请选择是否防霉">
-              <el-option
+            <el-radio-group v-model="form.isMould" >
+              <el-radio
                 v-for="dict in dict.type.sys_yes_no"
                 :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
-            </el-select>
+                :label="dict.value"
+              >{{dict.label}}</el-radio>
+            </el-radio-group>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row>
         <el-col :span="8">
           <el-form-item label="是否写码" prop="isCoding">
-            <el-select v-model="form.isCoding" placeholder="请选择是否写码">
-              <el-option
+            <el-radio-group v-model="form.isCoding" >
+              <el-radio
                 v-for="dict in dict.type.sys_yes_no"
                 :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
-            </el-select>
+                :label="dict.value"
+              >{{dict.label}}</el-radio>
+            </el-radio-group>
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row>
         <el-col :span="8">
           <el-form-item label="体系认证" prop="certification">
             <el-input v-model="form.certification" placeholder="请输入体系认证" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row>
         <el-col :span="8">
           <el-form-item label="样品形状" prop="shape">
             <el-select v-model="form.shape" placeholder="请选择样品形状">
@@ -188,6 +214,9 @@ export default {
         thick: '',
         weight: '',
         angleType: '',
+        isAllotype:'',
+        isRightAngle:'',
+        fillet:'',
         angle: '',
         aperture: '',
         singleLayerThick: '',
@@ -245,6 +274,9 @@ export default {
         thick: null,
         weight: null,
         angleType: null,
+        isAllotype:null,
+        isRightAngle:null,
+        fillet:null,
         angle: null,
         aperture: null,
         singleLayerThick: null,

src/views/mes/md/sales/mdclause.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="code">
+          <el-input
+            v-model="queryParams.code"
+            placeholder="请输入编码"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="名称" prop="name">
+          <el-input
+            v-model="queryParams.name"
+            placeholder="请输入名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="是否启用" prop="enable">
+          <el-input
+            v-model="queryParams.enable"
+            placeholder="请输入是否启用"
+            clearable
+            @keyup.enter.native="handleQuery"
+          /> 
+        </el-form-item>
+        
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+  
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+            v-hasPermi="['md:clause:add']"
+          >新增</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="['md:clause: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="['md:clause:remove']"
+          >删除</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['md:clause:export']"
+          >导出</el-button>
+        </el-col>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
+  
+      <el-table v-loading="loading" :data="clauseList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <!-- <el-table-column label="是否启用" align="center" prop="id" /> -->
+        <el-table-column label="编码" align="center" prop="code" />
+        <el-table-column label="名称" align="center" prop="name" />
+        <el-table-column label="是否启用" align="center" prop="enable" >
+          <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.sys_yes_no"
+            :value="scope.row.enable"
+          />
+        </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['md:clause:edit']"
+            >修改</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['md:clause:remove']"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+  
+      <!-- 添加或修改国际贸易销售条款对话框 -->
+      <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+        <el-form ref="form" :model="form" :rules="rules"  label-width="80px">
+          <el-form-item label="编码" prop="code">
+            <el-input v-model="form.code" placeholder="请输入编码"  />
+          </el-form-item>
+          <el-form-item label="名称" prop="name">
+            <el-input v-model="form.name" placeholder="请输入名称" />
+          </el-form-item>
+          <!-- <el-form-item label="是否启用" prop="enable">
+            <el-input v-model="form.enable" placeholder="请输入是否启用" />
+           </el-form-item>  -->
+           <!-- <el-col :span="12">
+            <el-form-item label="是否启用" prop="enable">
+              <el-radio-group v-model="form.enable" disabled v-if="optType=='view'">
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+              <el-radio-group v-model="form.enable" v-else>
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col> -->
+           <el-col :span="12">
+            <el-form-item label="是否启用" prop="enable">
+              <el-select v-model="form.enable" placeholder="请选择是否">
+                <el-option
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+
+        
+      
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </el-dialog>
+    </div>
+  </template>
+  
+  <script>
+  import { listClause, getClause, delClause, addClause, updateClause } from "@/api/mes/md/clause";
+  
+  export default {
+    name: "Clause",
+    dicts: ["sys_yes_no"],
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 国际贸易销售条款表格数据
+        clauseList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          code: null,        
+          name: null,        
+          enable: null,      },
+        // 表单参数
+        form: {
+        },
+        // 表单校验
+        rules: {
+        code: [
+          { required: true, message: "编码不能为空", trigger: "blur" }
+        ],        Name: [
+          { required: true, message: "名称不能为空", trigger: "blur" }
+        ],      
+            
+        }
+      };
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+      /** 查询国际贸易销售条款列表 */
+      getList() {
+        this.loading = true;
+        listClause(this.queryParams).then(response => {
+          this.clauseList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          id: null,        
+          code: null,        
+          name: null,        
+          enable: null,        
+          createBy: null,        
+          createTime: null,        
+          updateBy: null,        
+          updateTime: null      };
+        this.resetForm("form");
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.id)
+        this.single = selection.length!==1
+        this.multiple = !selection.length
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.reset();
+        this.open = true;
+        this.title = "添加国际贸易销售条款";
+        this.optType="add";
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        this.reset();
+        const id = row.id || this.ids
+        getClause(id).then(response => {
+          this.form = response.data;
+          this.open = true;
+          this.title = "修改国际贸易销售条款";
+          this.optType="edit";
+        });
+      },
+      /** 提交按钮 */
+      submitForm() {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            if (this.form.id != null) {
+              updateClause(this.form).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              addClause(this.form).then(response => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
+          }
+        });
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const ids = row.id || this.ids;
+        this.$modal.confirm('是否确认删除国际贸易销售条款编号为"' + ids + '"的数据项？').then(function() {
+          return delClause(ids);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        this.download('md/clause/export', {
+          ...this.queryParams
+        }, `clause_${new Date().getTime()}.xlsx`)
+      }
+    }
+  };
+  </script>
+  
\ No newline at end of file

src/views/mes/md/sales/mdcurrency.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="code">
+          <el-input
+            v-model="queryParams.code"
+            placeholder="请输入编码"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="名称" prop="name">
+          <el-input
+            v-model="queryParams.name"
+            placeholder="请输入名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="是否启用" prop="enable">
+          <el-input
+            v-model="queryParams.enable"
+            placeholder="请输入是否启用"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+  
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+            v-hasPermi="['md:currency:add']"
+          >新增</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="['md:currency: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="['md:currency:remove']"
+          >删除</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['md:currency:export']"
+          >导出</el-button>
+        </el-col>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
+  
+      <el-table v-loading="loading" :data="currencyList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <!-- <el-table-column label="是否启用" align="center" prop="id" /> -->
+        <el-table-column label="编码" align="center" prop="code" />
+        <el-table-column label="名称" align="center" prop="name" />
+        <el-table-column label="是否启用" align="center" prop="enable" >
+          <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.sys_yes_no"
+            :value="scope.row.enable"
+          />
+        </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['md:currency:edit']"
+            >修改</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['md:currency:remove']"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+  
+      <!-- 添加或修改订单 交易币别对话框 -->
+      <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+          <el-form-item label="编码" prop="code">
+            <el-input v-model="form.code" placeholder="请输入编码" />
+          </el-form-item>
+          <el-form-item label="名称" prop="name">
+            <el-input v-model="form.name" placeholder="请输入名称" />
+          </el-form-item>
+          <!-- <el-form-item label="是否启用" prop="enable">
+            <el-input v-model="form.enable" placeholder="请输入是否启用" />
+          </el-form-item> -->
+          <!-- <el-col :span="12">
+            <el-form-item label="是否启用" prop="enable">
+              <el-radio-group v-model="form.enable" disabled v-if="optType=='view'">
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+              <el-radio-group v-model="form.enable" v-else>
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="12">
+            <el-form-item label="是否启用" prop="enable">
+              <el-select v-model="form.enable" placeholder="请选择是否">
+                <el-option
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+
+        
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </el-dialog>
+    </div>
+  </template>
+  
+  <script>
+  import { listCurrency, getCurrency, delCurrency, addCurrency, updateCurrency } from "@/api/mes/md/currency";
+  
+  export default {
+    name: "Currency",
+    dicts: ["sys_yes_no"],
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 订单 交易币别表格数据
+        currencyList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          code: null,        name: null,        enable: null,      },
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+          code: [
+          { required: true, message: "编码不能为空", trigger: "blur" }
+        ],        Name: [
+          { required: true, message: "名称不能为空", trigger: "blur" }
+        ],      
+        }
+      };
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+      /** 查询订单 交易币别列表 */
+      getList() {
+        this.loading = true;
+        listCurrency(this.queryParams).then(response => {
+          this.currencyList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          id: null,        code: null,        name: null,        enable: null,        createBy: null,        createTime: null,        updateBy: null,        updateTime: null      };
+        this.resetForm("form");
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.id)
+        this.single = selection.length!==1
+        this.multiple = !selection.length
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.reset();
+        this.open = true;
+        this.title = "添加订单 交易币别";
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        this.reset();
+        const id = row.id || this.ids
+        getCurrency(id).then(response => {
+          this.form = response.data;
+          this.open = true;
+          this.title = "修改订单 交易币别";
+        });
+      },
+      /** 提交按钮 */
+      submitForm() {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            if (this.form.id != null) {
+              updateCurrency(this.form).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              addCurrency(this.form).then(response => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
+          }
+        });
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const ids = row.id || this.ids;
+        this.$modal.confirm('是否确认删除订单 交易币别编号为"' + ids + '"的数据项？').then(function() {
+          return delCurrency(ids);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        this.download('md/currency/export', {
+          ...this.queryParams
+        }, `currency_${new Date().getTime()}.xlsx`)
+      }
+    }
+  };
+  </script>
+  
\ No newline at end of file

src/views/mes/md/sales/mdpaymentClause.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="code">
+        <el-input
+          v-model="queryParams.code"
+          placeholder="请输入编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否启用" prop="enable">
+        <el-input
+          v-model="queryParams.enable"
+          placeholder="请输入是否启用"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['md:clause:add']"
+        >新增</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="['md:clause: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="['md:clause:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['md:clause:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="clauseList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column label="是否启用" align="center" prop="id" /> -->
+      <el-table-column label="编码" align="center" prop="code" />
+      <el-table-column label="名称" align="center" prop="name" />
+      <el-table-column label="是否启用" align="center" prop="enable" >
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.sys_yes_no"
+            :value="scope.row.enable"
+          />
+        </template>
+        </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['md:clause:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['md:clause:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改销售订单付款条件对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="编码" prop="code">
+          <el-input v-model="form.code" placeholder="请输入编码" />
+        </el-form-item>
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入名称" />
+        </el-form-item>
+        <!-- <el-form-item label="是否启用" prop="enable">
+          <el-input v-model="form.enable" placeholder="请输入是否启用" />
+        </el-form-item> -->
+        <!-- <el-col :span="12">
+            <el-form-item label="是否启用" prop="enable">
+              <el-radio-group v-model="form.enable" disabled v-if="optType=='view'">
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+              <el-radio-group v-model="form.enable" v-else>
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="12">
+            <el-form-item label="是否启用" prop="enable">
+              <el-select v-model="form.enable" placeholder="请选择是否">
+                <el-option
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+        
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listClause, getClause, delClause, addClause, updateClause } from "@/api/mes/md/paymentClause";
+
+export default {
+  name: "Clause",
+  dicts: ["sys_yes_no"],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 销售订单付款条件表格数据
+      clauseList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        code: null,        name: null,        enable: null,      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: { code: [
+          { required: true, message: "编码不能为空", trigger: "blur" }
+        ],        Name: [
+          { required: true, message: "名称不能为空", trigger: "blur" }
+        ],      
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询销售订单付款条件列表 */
+    getList() {
+      this.loading = true;
+      listClause(this.queryParams).then(response => {
+        this.clauseList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,        code: null,        name: null,        enable: null,        createBy: null,        createTime: null,        updateBy: null,        updateTime: null      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加销售订单付款条件";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getClause(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改销售订单付款条件";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateClause(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addClause(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除销售订单付款条件编号为"' + ids + '"的数据项？').then(function() {
+        return delClause(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('md/clause/export', {
+        ...this.queryParams
+      }, `clause_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/mes/md/sales/mdreason.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="code">
+          <el-input
+            v-model="queryParams.code"
+            placeholder="请输入编码"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="名称" prop="name">
+          <el-input
+            v-model="queryParams.name"
+            placeholder="请输入名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="是否启用" prop="enable">
+          <el-input
+            v-model="queryParams.enable"
+            placeholder="请输入是否启用"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+  
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+            v-hasPermi="['md:reason:add']"
+          >新增</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="['md:reason: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="['md:reason:remove']"
+          >删除</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['md:reason:export']"
+          >导出</el-button>
+        </el-col>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
+  
+      <el-table v-loading="loading" :data="reasonList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <!-- <el-table-column label="是否启用" align="center" prop="id" /> -->
+        <el-table-column label="编码" align="center" prop="code" />
+        <el-table-column label="名称" align="center" prop="name" />
+        <el-table-column label="是否启用" align="center" prop="enable" >
+          <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.sys_yes_no"
+            :value="scope.row.enable"
+          />
+        </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['md:reason:edit']"
+            >修改</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['md:reason:remove']"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+  
+      <!-- 添加或修改销售订单原因对话框 -->
+      <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+          <el-form-item label="编码" prop="code">
+            <el-input v-model="form.code" placeholder="请输入编码" />
+          </el-form-item>
+          <el-form-item label="名称" prop="name">
+            <el-input v-model="form.name" placeholder="请输入名称" />
+          </el-form-item>
+          <!-- <el-form-item label="是否启用" prop="enable">
+            <el-input v-model="form.enable" placeholder="请输入是否启用" />
+          </el-form-item> -->
+          <el-col :span="12">
+            <el-form-item label="是否启用" prop="enable">
+              <el-select v-model="form.enable" placeholder="请选择是否">
+                <el-option
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+        
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </el-dialog>
+    </div>
+  </template>
+  
+  <script>
+  import { listReason, getReason, delReason, addReason, updateReason } from "@/api/mes/md/reason";
+  
+  export default {
+    name: "Reason",
+    dicts: ["sys_yes_no"],
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 销售订单原因表格数据
+        reasonList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          code: null,        name: null,        enable: null,      },
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: { 
+          code: [
+          { required: true, message: "编码不能为空", trigger: "blur" }
+        ],        Name: [
+          { required: true, message: "名称不能为空", trigger: "blur" }
+        ],      
+        }
+      };
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+      /** 查询销售订单原因列表 */
+      getList() {
+        this.loading = true;
+        listReason(this.queryParams).then(response => {
+          this.reasonList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          id: null,        code: null,        name: null,        enable: null,        createBy: null,        createTime: null,        updateBy: null,        updateTime: null      };
+        this.resetForm("form");
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.id)
+        this.single = selection.length!==1
+        this.multiple = !selection.length
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.reset();
+        this.open = true;
+        this.title = "添加销售订单原因";
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        this.reset();
+        const id = row.id || this.ids
+        getReason(id).then(response => {
+          this.form = response.data;
+          this.open = true;
+          this.title = "修改销售订单原因";
+        });
+      },
+      /** 提交按钮 */
+      submitForm() {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            if (this.form.id != null) {
+              updateReason(this.form).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              addReason(this.form).then(response => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
+          }
+        });
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const ids = row.id || this.ids;
+        this.$modal.confirm('是否确认删除销售订单原因编号为"' + ids + '"的数据项？').then(function() {
+          return delReason(ids);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        this.download('md/reason/export', {
+          ...this.queryParams
+        }, `reason_${new Date().getTime()}.xlsx`)
+      }
+    }
+  };
+  </script>
+  
\ No newline at end of file

src/views/mes/md/sales/mdshipmentPint.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="code">
+          <el-input
+            v-model="queryParams.code"
+            placeholder="请输入编码"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="名称" prop="name">
+          <el-input
+            v-model="queryParams.name"
+            placeholder="请输入名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="是否启用" prop="enable">
+          <el-input
+            v-model="queryParams.enable"
+            placeholder="请输入是否启用"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+  
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+            v-hasPermi="['md:point:add']"
+          >新增</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="['md:point: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="['md:point:remove']"
+          >删除</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['md:point:export']"
+          >导出</el-button>
+        </el-col>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
+  
+      <el-table v-loading="loading" :data="pointList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <!-- <el-table-column label="是否启用" align="center" prop="id" /> -->
+        <el-table-column label="编码" align="center" prop="code" />
+        <el-table-column label="名称" align="center" prop="name" />
+        <el-table-column label="是否启用" align="center" prop="enable" >
+          <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.sys_yes_no"
+            :value="scope.row.enable"
+          />
+        </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['md:point:edit']"
+            >修改</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['md:point:remove']"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+  
+      <!-- 添加或修改销售订单装运点对话框 -->
+      <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+          <el-form-item label="编码" prop="code">
+            <el-input v-model="form.code" placeholder="请输入编码" />
+          </el-form-item>
+          <el-form-item label="名称" prop="name">
+            <el-input v-model="form.name" placeholder="请输入名称" />
+          </el-form-item>
+          <!-- <el-form-item label="是否启用" prop="enable">
+            <el-input v-model="form.enable" placeholder="请输入是否启用" />
+          </el-form-item> -->
+           <!-- <el-col :span="12">
+            <el-form-item label="是否启用" prop="enable">
+              <el-radio-group v-model="form.enable" disabled v-if="optType=='view'">
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+              <el-radio-group v-model="form.enable" v-else>
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="12">
+            <el-form-item label="是否启用" prop="enable">
+              <el-select v-model="form.enable" placeholder="请选择是否">
+                <el-option
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+        
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </el-dialog>
+    </div>
+  </template>
+  
+  <script>
+  import { listPoint, getPoint, delPoint, addPoint, updatePoint } from "@/api/mes/md/point";
+  
+  export default {
+    name: "Point",
+    dicts: ["sys_yes_no"],
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 销售订单装运点表格数据
+        pointList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          code: null,        name: null,        enable: null,      },
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+          code: [
+          { required: true, message: "编码不能为空", trigger: "blur" }
+        ],        Name: [
+          { required: true, message: "名称不能为空", trigger: "blur" }
+        ],      
+        }
+      };
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+      /** 查询销售订单装运点列表 */
+      getList() {
+        this.loading = true;
+        listPoint(this.queryParams).then(response => {
+          this.pointList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          id: null,        code: null,        name: null,        enable: null,        createBy: null,        createTime: null,        updateBy: null,        updateTime: null      };
+        this.resetForm("form");
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.id)
+        this.single = selection.length!==1
+        this.multiple = !selection.length
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.reset();
+        this.open = true;
+        this.title = "添加销售订单装运点";
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        this.reset();
+        const id = row.id || this.ids
+        getPoint(id).then(response => {
+          this.form = response.data;
+          this.open = true;
+          this.title = "修改销售订单装运点";
+        });
+      },
+      /** 提交按钮 */
+      submitForm() {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            if (this.form.id != null) {
+              updatePoint(this.form).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              addPoint(this.form).then(response => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
+          }
+        });
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const ids = row.id || this.ids;
+        this.$modal.confirm('是否确认删除销售订单装运点编号为"' + ids + '"的数据项？').then(function() {
+          return delPoint(ids);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        this.download('md/point/export', {
+          ...this.queryParams
+        }, `point_${new Date().getTime()}.xlsx`)
+      }
+    }
+  };
+  </script>
+  
\ No newline at end of file

src/views/mes/md/sizegroup/index.vue

@@ -92,7 +92,11 @@
           <dict-tag :options="dict.type.size_type" :value="scope.row.sizeType"/>
         </template>
       </el-table-column>
-      <el-table-column label="是否启用" align="center" prop="enableFlag" />
+      <el-table-column label="是否启用" align="center" prop="enableFlag" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -140,9 +144,14 @@
             </el-col>
             <el-col :span="10">
               <el-form-item label="是否启用" label-width="100px" prop="enableFlag">
-                <el-input v-model="form.enableFlag" placeholder="请输入是否启用" />
+                <el-radio-group v-model="form.enableFlag" >
+                  <el-radio
+                    v-for="dict in dict.type.sys_yes_no"
+                    :key="dict.value"
+                    :label="dict.value"
+                  >{{dict.label}}</el-radio>
+                </el-radio-group>
               </el-form-item>
-
             </el-col>
           </el-row>
         </el-row>
@@ -160,7 +169,7 @@
         </el-row>
       </el-form>
 
-      <SizeGroupItem v-if="form.sizeGroupId" />
+      <SizeGroupItem v-if="form.sizeGroupId" :sizeGroupId="form.sizeGroupId"/>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -174,7 +183,7 @@ import { listGroup, getGroup, delGroup, addGroup, updateGroup } from "@/api/mes/
 import SizeGroupItem from './item/index.vue'
 export default {
   name: "Group",
-  dicts:['size_type'],
+  dicts:['size_type','sys_yes_no'],
   components: {SizeGroupItem},
   data() {
     return {

src/views/mes/md/sizegroup/item/index.vue

@@ -227,7 +227,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        sizeGroupId: null,
+        sizeGroupId: this.sizeGroupId,
         sizeIndex: null,
         sizeName: null,
         sizeDisplayName: null,
@@ -238,6 +238,10 @@ export default {
       rules: {},
     };
   },
+  props: {
+    optType: undefined,
+    sizeGroupId: undefined,
+  },
   created() {
     this.getList();
   },
@@ -260,7 +264,7 @@ export default {
     reset() {
       this.form = {
         sizeGroupItemId: null,
-        sizeGroupId: null,
+        sizeGroupId: this.sizeGroupId,
         sizeIndex: null,
         sizeName: null,
         sizeDisplayName: null,

src/views/mes/pro/productiorequest/components/ProogingBom.vue

@@ -289,14 +289,15 @@ export default {
     },
     /**表单提交 */
     submitForm() {
+      let thisObj = this;
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          if (this.optType == 'add') {
-            this.tableData.unshift({ ...this.form });
+          if (thisObj.optType == 'add') {
+            thisObj.tableData.unshift({ ...thisObj.form });
           } else {
-            this.tableData.splice(this.currentRowIdx, 1, this.form)
+            thisObj.tableData.splice(thisObj.currentRowIdx, 1, thisObj.form)
           }
-          this.showFlag = false;
+          thisObj.showFlag = false;
         }
       });
     },

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

@@ -8,17 +8,17 @@
       v-show="showSearch"
       label-width="100px"
     >
-    <el-form-item label="量产申请编码" prop="productionRequestCode">
+      <el-form-item label="产品名称" prop="itemName">
         <el-input
-          v-model="queryParams.productionRequestCode"
+          v-model="queryParams.itemName"
           placeholder="请输入产品名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工艺路线ID" prop="routeId">
+      <el-form-item label="单据状态" prop="productionRequestStatus">
         <el-select
-          v-model="queryParams.routeId"
+          v-model="queryParams.productionRequestStatus"
           clearable
           placeholder="请选择单据状态"
         >
@@ -69,7 +69,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['mes:pro:productiorequest:add']"
+          v-hasPermi="['mes:pro:productionRequest:add']"
         >新增</el-button
         >
       </el-col>
@@ -81,7 +81,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['mes:pro:productiorequest:edit']"
+          v-hasPermi="['mes:pro:productionRequest:edit']"
         >修改</el-button
         >
       </el-col>
@@ -93,7 +93,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['mes:pro:productiorequest:remove']"
+          v-hasPermi="['mes:pro:productionRequest:remove']"
         >删除</el-button
         >
       </el-col>
@@ -104,7 +104,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['mes:pro:productiorequest:export']"
+          v-hasPermi="['mes:pro:productionRequest:export']"
         >导出</el-button
         >
       </el-col>
@@ -116,41 +116,47 @@
 
     <el-table
       v-loading="loading"
-      :data="prototypeRequestList"
+      :data="productionRequestList"
       row-key="productionRequestId"
       default-expand-all
     >
-      <el-table-column label="量产申请单编码" width="180" prop="productionRequesCode">
+      <el-table-column label="量产申请单编码" width="180" prop="productionRequestCode">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             @click="handleView(scope.row)"
-            v-hasPermi="['mes:pro:productiorequest:query']"
-            >{{ scope.row.productionRequesCode }}</el-button
+            v-hasPermi="['mes:pro:productionRequest:query']"
+          >{{ scope.row.productionRequestCode }}</el-button
           >
         </template>
       </el-table-column>
       <el-table-column
-        label="工艺路线ID"
+        label="工艺路线"
         width="120"
         align="center"
-        prop="routeId"
+        prop="routeName"
         :show-overflow-tooltip="true"
       />
-      <el-table-column label="产品ID" align="center" prop="itemId">
-      </el-table-column>
       <el-table-column
-        label="制造工厂ID"
+        label="产品名称"
+        width="120"
+        align="center"
+        prop="itemName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="制造工厂"
         width="200"
         align="center"
-        prop="factoryId"
+        hidden="hidden"
+        prop="factoryName"
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="仓库"
         align="center"
-        prop="wareHouse"
+        prop="warehouse"
         :show-overflow-tooltip="true"
       />
       <el-table-column
@@ -162,53 +168,54 @@
         label="是否要鞋图"
         align="center"
         prop="isNeedShoeImg"
-      > <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.sys_yes_no"
-            :value="scope.row.isNeedShoeImg"
+        :formatter="yesNoFmt"
       />
-        </template>
-      </el-table-column>
       <el-table-column
         label="是否附样品"
         align="center"
         prop="isNeedPrototype"
-      ><template slot-scope="scope">
+        :formatter="yesNoFmt"
+      />
+      <el-table-column label="唯一码产品" align="center" prop="isUniqueCode"
+                       :formatter="yesNoFmt"/>
+      <el-table-column label="不考虑型体配色" align="center" prop="isConsiderColor"
+                       :formatter="yesNoFmt"/>
+      <el-table-column label="是否禁用" align="center" prop="isDisabled"
+                       :formatter="yesNoFmt"/>
+      <!-- <template slot-scope="scope">
         <dict-tag
+          :options="dict.type.sys_yes_no"
+          :value="scope.row.isNeedShoeImg"
+        />
+      </template> -->
+      <!-- <dict-tag
         :options="dict.type.sys_yes_no"
         :value="scope.row.isNeedPrototype"
       />
-        </template>
-      </el-table-column>
-       <el-table-column label="唯一码产品" align="center" prop="isUniqueCode" >
-        <template slot-scope="scope">
       <dict-tag
         :options="dict.type.sys_yes_no"
-            :value="scope.row.isUniqueCode"
+        :value="scope.row.isConsiderColor"
       />
-        </template>
-       </el-table-column>
-      <el-table-column label="不考虑型体配色" align="center" prop="isConsiderColor" >
-        <template slot-scope="scope">
       <dict-tag
         :options="dict.type.sys_yes_no"
-            :value="scope.row.isConsiderColor"
+        :value="scope.row.enableFlag"
       />
-        </template>
-      </el-table-column>
-      <el-table-column label="是否禁用" align="center" prop="isDisabled" >
-        <template slot-scope="scope">
       <dict-tag
         :options="dict.type.sys_yes_no"
-            :value="scope.row.isDisabled"
+        :value="scope.row.isDisabled" -->
+      />
+      <el-table-column
+        label="申请单状态"
+        align="center"
+        prop="prototypeRequestStatus"
+      >
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.mes_productionreq_status"
+            :value="scope.row.productionRequestStatus"
           />
         </template>
       </el-table-column>
-        
-           
-          
-         
-        
       <el-table-column
         label="操作"
         width="200px"
@@ -220,18 +227,18 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.prototypeRequestStatus == '0'"
+            v-if="scope.row.productionRequestStatus == '0'"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:pro:productiorequest:edit']"
+            v-hasPermi="['mes:pro:productionRequest:edit']"
           >修改</el-button
           >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-circle-check"
-            v-if="scope.row.prototypeRequestStatus == '0'"
+            v-if="scope.row.productionRequestStatus == '0'"
             @click="handleFinish(scope.row)"
-            v-hasPermi="['mes:pro:productiorequest:update']"
+            v-hasPermi="['mes:pro:productionRequest:update']"
           >通过</el-button
           >
           <el-button
@@ -239,16 +246,16 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:pro:productiorequest:remove']"
+            v-hasPermi="['mes:pro:productionRequest:remove']"
           >删除</el-button
           >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.prototypeRequestStatus == '1'"
+            v-if="scope.row.productionRequestStatus == '1'"
             @click="generate(scope.row)"
-            v-hasPermi="['mes:pro:productiorequest:edit']"
+            v-hasPermi="['mes:pro:productionRequest:edit']"
           >生成制作单</el-button
           >
         </template>
@@ -265,28 +272,27 @@
 </template>
 
 <script>
-import {
-  listPrototypeRequest,
-  getPrototypeRequest,
-  delPrototypeRequest,
-  addPrototypeRequest,
-  updatePrototypeRequest,
+  import {
+    listProductionRequest,
+    getProductionRequest,
+    delProductionRequest,
+    addProductionRequest,
+    updateProductionRequest,
     dofinish,
-} from "@/api/mes/pro/prototypeRequest";
+  } from "@/api/mes/pro/productionRequest";
+  import ItemSelect from "@/components/itemSelect/single.vue";
+  import ClientSelect from "@/components/clientSelect/single.vue";
+  import VendorSelect from "@/components/vendorSelect/single.vue";
+  import Treeselect from "@riophae/vue-treeselect";
+  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
-import ItemSelect from "@/components/itemSelect/single.vue";
-import ClientSelect from "@/components/clientSelect/single.vue";
-import VendorSelect from "@/components/vendorSelect/single.vue";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  name: "PrototypeRequest",
+  export default {
+    name: "ProductionRequest",
     dicts: [
       "sys_yes_no",
-    "mes_pr_status",
-    "mes_prototypeRequest_sourcetype",
-    "mes_prototypeRequest_type",
+      "mes_productionreq_status",
+      "mes_productionRequest_sourcetype",
+      "mes_productionRequest_type",
     ],
     components: {
       Treeselect,
@@ -312,9 +318,9 @@ export default {
         // 非多个禁用
         multiple: true,
         // 生产工单表格数据
-      prototypeRequestList: [],
+        productionRequestList: [],
         // 生产工单树选项
-      prototypeRequestOptions: [],
+        productionRequestOptions: [],
         // 弹出层标题
         title: "",
         // 是否显示弹出层
@@ -323,13 +329,13 @@ export default {
         queryParams: {
           pageNum: 1,
           pageSize: 10,
-        productionRequestCode: null,
-        routeId: null,
+          itemName: null, // 可以查简称与英文名
+          productionRequestStatus: null,
         },
         options: [
           { value: 0, label: "审批中" },
           { value: 1, label: "待制作" },
-        { value: 2, label: "打样中" },
+          { value: 2, label: "量产中" },
           { value: 3, label: "待质检" },
           { value: 4, label: "待确认" },
           { value: 5, label: "已完成" },
@@ -339,7 +345,7 @@ export default {
         form: {},
         // 表单校验
         rules: {
-        // prototypeRequestCode: [
+          // productionRequestCode: [
           //   { required: true, message: "工单编码不能为空", trigger: "blur" }
           // ],
         },
@@ -352,8 +358,8 @@ export default {
       /** 查询生产工单列表 */
       getList() {
         this.loading = true;
-      listPrototypeRequest(this.queryParams).then((response) => {
-        this.prototypeRequestList = response.rows;
+        listProductionRequest(this.queryParams).then((response) => {
+          this.productionRequestList = response.rows;
           this.total = response.total;
           this.loading = false;
         });
@@ -368,18 +374,21 @@ export default {
         this.form = {
           productionRequestId: null,
           productionRequestCode: null,
+          itemId: null,
+          itemName: null,
           routeId: null,
-        productId: null,
-        factoryId: null,
-        warehouse: null,
-        sizeGroup: null,
-        isNeedShoeImg: null,
-        isNeedPrototype: null,
-        isUniqueCode: null,
-        isConsiderColor: null,
-        isDisabled: null,
-        shoeImg: null,
-        prototype: null,
+          routeName: null,
+          abbreviation: null,
+          enName: null,
+          num: null,
+          type: null,
+          modality: null,
+          surfaceTreatment: null,
+          ngReason: null,
+          plannedFinishDate: null,
+          plannedLayoutDate: null,
+          productionRequestStatus: "0",
+          testStandard: null,
           remark: null,
           createBy: null,
           createTime: null,
@@ -405,8 +414,8 @@ export default {
         return;
         //   this.reset();
         //   this.getTreeselect();
-      //   if (row != null && row.prototypeRequestId) {
-      //     this.form.parentId = row.prototypeRequestId;
+        //   if (row != null && row.productionRequestId) {
+        //     this.form.parentId = row.productionRequestId;
         //     this.form.orderSource = row.orderSource;
         //     this.form.sourceCode = row.sourceCode;
         //     this.form.clientId = row.clientId;
@@ -422,9 +431,9 @@ export default {
         this.reset();
         const productionRequestId = row.productionRequestId || this.ids;
         this.$router.push(
-        "/mes/proofing/info?prototypeRequestId=" + prototypeRequestId
+          "/mes/proofing/info?productionRequestId=" + productionRequestId
         );
-      // getprototypeRequest(prototypeRequestId).then((response) => {
+        // getproductionRequest(productionRequestId).then((response) => {
         //   this.form = response.data;
         //   this.open = true;
         //   this.title = "查看工单信息";
@@ -436,9 +445,9 @@ export default {
         this.reset();
         const productionRequestId = row.productionRequestId || this.ids;
         this.$router.push(
-        "/mes/proofing/edit?productionRequestId=" + productionRequestId
+          "/mes/pro/productiorequest/edit?productionRequestId=" + productionRequestId
         );
-      // getPrototypeRequest(prototypeRequestId).then((response) => {
+        // getProductionRequest(productionRequestId).then((response) => {
         //   // this.form = response.data;
         //   // this.open = true;
         //   // this.title = "修改生产工单";
@@ -449,9 +458,9 @@ export default {
       /** 删除按钮操作 */
       handleDelete(row) {
         this.$modal
-        .confirm('是否确认删除编号为"' + row.productionRequestId + '"的打样单？')
+          .confirm('是否确认删除编号为"' + row.productionRequestId + '"的量产单？')
           .then(function () {
-          return delPrototypeRequest(row.productionRequestId);
+            return delProductionRequest(row.productionRequestId);
           })
           .then(() => {
             this.getList();
@@ -469,17 +478,17 @@ export default {
       /** 导出按钮操作 */
       handleExport() {
         this.download(
-        "mes/pro/prototypeRequest/export",
+          "mes/pro/productionRequest/export",
           {
             ...this.queryParams,
           },
-        `打样申请单_${new Date().getTime()}.xlsx`
+          `量产申请单_${new Date().getTime()}.xlsx`
         );
       },
 
       // 审批
       handleFinish(row) {
-      row.prototypeRequestStatus = 1
+        row.productionRequestStatus = 1
         this.$modal
           .confirm("确认通过样品申请单？一旦完成，此工单将无法继续修改")
           .then(function () {
@@ -491,6 +500,13 @@ export default {
           })
           .catch(() => {});
       },
+      yesNoFmt(row, column, cellValue){
+        if(cellValue==1){
+          return '是';
+        }else{
+          return '否';
+        }
+      },
     },
     // 生成制作单
     generate(row) {
@@ -498,5 +514,5 @@ export default {
       this.$router.push("/mes/proofing/apply");
       return;
     },
-};
+  };
 </script>

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

+<template>
+  <div class="form-page" v-loading="loading">
+    <PageTitle>
+      {{ 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>
+      </template>
+
+      <!-- 修改 按钮显示 -->
+      <template slot="buttons" v-if="mode == 'edit'">
+        <el-button size="mini" type="primary" @click="saveForm">提交</el-button>
+      </template>
+    </PageTitle>
+
+    <PageWrapper>
+      <el-form
+        :model="form"
+        ref="form"
+        size="small"
+        :inline="true"
+        label-width="8em"
+      >
+        <el-row>
+          <el-col :md="8" :xs="12">
+            <el-form-item label="申请单编码" prop="productionRequestCode">
+              <el-input
+                disabled
+                v-model="form.productionRequestCode"
+                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="factoryId">
+              <el-input
+                v-model="form.factoryName"
+                readonly
+                placeholder="请输入制造工厂"
+              >
+                <el-button
+                  slot="append"
+                  icon="el-icon-search"
+                  @click="$refs['FactorySelectRef'].showFlag = true"
+                ></el-button>
+              </el-input>
+              <FactorySelect
+                ref="FactorySelectRef"
+                @onSelected="onFactorySelect"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :md="8" :xs="12">
+            <el-form-item label="仓库" prop="warehouse">
+              <el-input
+                v-model="form.warehouse"
+                placeholder="请输入仓库"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :md="8" :xs="12">
+            <el-form-item label="尺码" prop="sizeGroup">
+              <el-input
+                v-model="form.sizeGroup"
+                placeholder="请输入尺码"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :md="8" :xs="12">
+            <el-form-item label="是否要鞋图" prop="isNeedShoeImg">
+              <el-select
+                v-model="form.isNeedShoeImg"
+                placeholder="请选择"
+              >
+                <el-option label="是" value="1"></el-option>
+                <el-option label="否" value="0"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :md="8" :xs="12">
+            <el-form-item label="是否附样品" prop="isNeedPrototype">
+              <el-select
+                v-model="form.isNeedPrototype"
+                placeholder="请选择"
+              >
+                <el-option label="是" value="1"></el-option>
+                <el-option label="否" value="0"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :md="8" :xs="12">
+            <el-form-item label="唯一码产品" prop="isUniqueCode">
+              <el-select
+                v-model="form.isUniqueCode"
+                placeholder="请选择"
+              >
+                <el-option label="是" value="1"></el-option>
+                <el-option label="否" value="0"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :md="8" :xs="12">
+            <el-form-item label="不考虑型体配色" prop="isConsiderColor">
+              <el-select
+                v-model="form.isConsiderColor"
+                placeholder="请选择"
+              >
+                <el-option label="是" value="1"></el-option>
+                <el-option label="否" value="0"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :md="8" :xs="12">
+            <el-form-item label="鞋图" prop="shoeImg">
+              <el-input
+                v-model="form.shoeImg"
+                placeholder="请选鞋图"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :md="8" :xs="12">
+            <el-form-item label="样品" prop="prototype">
+              <el-input
+                v-model="form.prototype"
+                placeholder="请选择样品"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :md="8" :xs="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input
+                type="textarea"
+                :rows="3"
+                v-model="form.remark"
+                placeholder="备注"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <el-tabs type="border-card" @tab-click="tabClick">
+        <el-tab-pane label="BOM">
+          <ProogingBom ref="ProogingBomRef" />
+        </el-tab-pane>
+        <el-tab-pane label="工艺">
+          <ProogingProcess ref="ProogingProcessRef" :bomList="bomList" />
+        </el-tab-pane>
+      </el-tabs>
+    </PageWrapper>
+  </div>
+</template>
+
+<script>
+  import { genCode } from "@/api/system/autocode/rule";
+  import ProogingBom from "./components/ProogingBom.vue";
+  import ProogingProcess from "./components/ProogingProcess.vue";
+  import ItemSelect from "@/components/itemSelect/single.vue";
+  import RoutesProcessSelect from "@/components/routesProcessSelect/index.vue";
+  import FactorySelect from "@/components/FactorySelect/index.vue";
+  import { listRouteprocess } from "@/api/mes/pro/routeprocess";
+  import tabPlugins from "@/plugins/tab";
+  import {
+    addProductionRequest,
+    getProductionRequest,
+    updateProductionRequest,
+  } from "@/api/mes/pro/productionRequest";
+
+  import {
+    getPrototypeMake
+  } from "@/api/mes/pro/prototypeMake";
+
+  export default {
+    components: { ProogingBom, ProogingProcess, ItemSelect, RoutesProcessSelect, FactorySelect },
+    dicts: [],
+    provide() {
+      return {
+        mode: this.mode,
+      };
+    },
+    data() {
+      return {
+        loading: false,
+        bomList: [],
+        // 表单参数
+        form: {
+          productionRequestCode: "",
+          itemId: "",
+          itemName: "",
+          unit: "",
+          routeId: "",
+          routeName: "",
+          factoryId:"",
+          factoryName:"",
+          type: "",
+          modality: "",
+          isNeedPrototype: "",
+          isNeedShoeImg: "",
+          isUniqueCode: "",
+          isDisabled:"",
+          shoeImg: "",
+          sizeGroup: "",
+          remark: "",
+          prototype:"",
+          warehouse: "",
+        },
+        rules: {},
+      };
+    },
+    computed: {
+      scrollHeight() {
+        return "calc(100vh - 73px - 83px)";
+      },
+      mode() {
+        return this.$route.path.split("/").at(-1);
+      },
+      pageTitle() {
+        const titles = {
+          edit: "量产单修改",
+          info: "量产单查看",
+          apply: "量产单申请",
+        };
+        return titles[this.mode];
+      },
+    },
+    created() {
+      this.getFormInfo();
+      this.gCode();
+    },
+    methods: {
+      /** 根据 id 获取页面数据 */
+      getFormInfo() {
+        if (this.mode == "apply" && this.$route.query.prototypeMakeId) {
+          const id = this.$route.query.prototypeMakeId;
+          this.loading = true;
+          getPrototypeMake(id)
+            .then(({ data }) => {
+              Object.assign(this.form, data);
+              this.bomList = data.bomList;
+              // 设置组件数据
+              this.$refs["ProogingBomRef"].tableData = data.bomList;
+              this.$refs["ProogingProcessRef"].tableData = data.processList;
+            })
+            .finally(() => {
+              this.loading = false;
+            });
+        }
+      },
+      /** 生成编码 */
+      gCode() {
+        genCode("PRODUCTION_REQUEST_CODE").then((response) => {
+          this.form.productionRequestCode = response;
+        });
+      },
+      /** 点击tab 获取bom的数据,将参数传递给后面的组件 */
+      tabClick(val) {
+        if (val.index != 0) {
+          this.bomList = this.$refs["ProogingBomRef"].getComData();
+        }
+      },
+      onItemSelect(row) {
+        if (row != undefined && row != null) {
+          this.form.itemId = row.itemId;
+          this.form.itemName = row.itemName;
+          this.form.unit = row.unitOfMeasure;
+        }
+      },
+      onRoutesProcessSelect(row) {
+        if (row != undefined && row != null) {
+          this.form.routeId = row.routeId;
+          this.form.routeName = row.routeName;
+
+          const params = {
+            pageNum: 1,
+            pageSize: 1000,
+            routeId: row.routeId,
+          };
+          listRouteprocess(params).then(({ rows }) => {
+            this.$refs["ProogingProcessRef"].setList(rows);
+          });
+        }
+      },
+      onFactorySelect(row) {
+        if (row != undefined && row != null) {
+          this.form.factoryId = row.factoryId;
+          this.form.factoryName = row.factoryName;
+        }
+      },
+
+      /**提交 */
+      saveForm() {
+        const bomList = this.$refs.ProogingBomRef.getComData();
+        const processList = this.$refs.ProogingProcessRef.getComData();
+        const params = {
+          ...this.form,
+          bomList,
+          processList,
+        };
+        this.loading = true;
+        if (this.mode == "apply") {
+          addProductionRequest(params)
+            .then((res) => {
+              this.loading = false;
+              this.$modal.msgSuccess("提交成功！");
+
+              // 关闭页签
+              tabPlugins.closeOpenPage();
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+        } else {
+          updateProductionRequest(params)
+            .then(() => {
+              this.loading = false;
+              this.$modal.msgSuccess("提交成功！");
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+        }
+      },
+      /**重置表单 */
+      resetForm() {
+        this.form = {
+          productionRequestCode: "",
+          itemId: "",
+          itemName: "",
+          unit: "",
+          routeId: "",
+          routeName: "",
+          factoryId:"",
+          factoryName:"",
+          type: "",
+          modality: "",
+          isNeedPrototype: "",
+          isNeedShoeImg: "",
+          isUniqueCode: "",
+          isDisabled:"",
+          shoeImg: "",
+          sizeGroup: "",
+          remark: "",
+          prototype:"",
+          warehouse: "",
+        };
+        this.$refs["ProogingBomRef"].resetState();
+        this.$refs["ProogingProcessRef"].resetState();
+        this.gCode();
+      },
+    },
+  };
+</script>
+
+<style lang="scss" scoped></style>

src/views/mes/pro/productiorequest/requestInfo.vue → src/views/mes/pro/productiorequest/requestInfoEdit.vue

@@ -24,7 +24,7 @@
       >
         <el-row>
           <el-col :md="8" :xs="12">
-            <el-form-item label="量产申请单编码" prop="productionRequestCode">
+            <el-form-item label="申请单编码" prop="productionRequestCode">
               <el-input
                 disabled
                 v-model="form.productionRequestCode"
@@ -70,88 +70,112 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :md="8" :xs="12">
-            <el-form-item label="简称" prop="abbreviation">
+          <el-col :md="8" :xs="12" style="height: 50.5px">
+            <el-form-item label="制造工厂" prop="factoryId">
               <el-input
-                v-model="form.abbreviation"
-                placeholder="请输入简称"
-              ></el-input>
+                v-model="form.factoryName"
+                readonly
+                placeholder="请选择工厂"
+              >
+                <el-button
+                  slot="append"
+                  icon="el-icon-search"
+                  @click="$refs['FactorySelectRef'].showFlag = true"
+                ></el-button>
+              </el-input>
+              <FactorySelect ref="FactorySelectRef" @onSelected="onFactorySelect" />
             </el-form-item>
           </el-col>
           <el-col :md="8" :xs="12">
-            <el-form-item label="样品英文名" prop="enName">
+            <el-form-item label="仓库" prop="warehouse">
               <el-input
-                v-model="form.enName"
-                placeholder="请输入样品英文名称"
+                v-model="form.warehouse"
+                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 label="尺码" prop="sizeGroup">
+              <el-input
+                v-model="form.sizeGroup"
+                placeholder="请输入尺码"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :md="8" :xs="12">
-            <el-form-item label="打样形式" prop="type">
-              <el-input
-                v-model="form.type"
-                placeholder="请选择打样形式"
-              ></el-input>
+            <el-form-item label="是否要鞋图" prop="isNeedShoeImg">
+              <el-select
+                v-model="form.isNeedShoeImg"
+                placeholder="请选择"
+              >
+                <el-option label="是" :value="1"></el-option>
+                <el-option label="否" :value="0"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :md="8" :xs="12">
-            <el-form-item label="分配方式" prop="modality">
-              <el-input
-                v-model="form.modality"
-                placeholder="请选择分配方式"
-              ></el-input>
+            <el-form-item label="是否附样品" prop="isNeedPrototype">
+              <el-select
+                v-model="form.isNeedPrototype"
+                placeholder="请选择"
+              >
+                <el-option label="是" :value="1"></el-option>
+                <el-option label="否" :value="0"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :md="8" :xs="12">
-            <el-form-item label="表面处理" prop="surfaceTreatment">
-              <el-input
-                v-model="form.surfaceTreatment"
-                placeholder="请输入表面处理"
-              ></el-input>
+            <el-form-item label="唯一码产品" prop="isUniqueCode">
+              <el-select
+                v-model="form.isUniqueCode"
+                placeholder="请选择"
+              >
+                <el-option label="是" :value="1"></el-option>
+                <el-option label="否" :value="0"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :md="8" :xs="12">
-            <el-form-item label="NG原因" prop="ngReason">
-              <el-input
-                v-model="form.ngReason"
-                placeholder="请输入NG原因"
-              ></el-input>
+            <el-form-item label="不考虑型体配色" prop="isConsiderColor">
+              <el-select
+                v-model="form.isConsiderColor"
+                placeholder="请选择"
+              >
+                <el-option label="是" :value="1"></el-option>
+                <el-option label="否" :value="0"></el-option>
+              </el-select>
             </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 label="是否禁用" prop="isDisabled">
+              <el-select
+                v-model="form.isDisabled"
+                placeholder="请选择"
+              >
+                <el-option label="是" :value="1"></el-option>
+                <el-option label="否" :value="0"></el-option>
+              </el-select>
             </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 label="鞋图" prop="shoeImg">
+              <el-input
+                v-model="form.shoeImg"
+                placeholder="请选鞋图"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :md="8" :xs="12">
-            <el-form-item label="测试标准" prop="testStandard">
+            <el-form-item label="样品" prop="prototype">
               <el-input
-                v-model="form.testStandard"
-                placeholder="测试标准"
+                v-model="form.prototype"
+                placeholder="请选择样品"
               ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
+
         <el-row>
           <el-col :md="8" :xs="12">
             <el-form-item label="备注" prop="remark">
@@ -183,17 +207,18 @@ import { genCode } from "@/api/system/autocode/rule";
 import ProogingBom from "./components/ProogingBom.vue";
 import ProogingProcess from "./components/ProogingProcess.vue";
 import ItemSelect from "@/components/itemSelect/single.vue";
+import FactorySelect from "@/components/FactorySelect/index.vue";
 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";
+  addProductionRequest,
+  getProductionRequest,
+  updateProductionRequest,
+} from "@/api/mes/pro/productionRequest";
 
 export default {
-  components: { ProogingBom, ProogingProcess, ItemSelect, RoutesProcessSelect },
+  components: { ProogingBom, ProogingProcess, ItemSelect, RoutesProcessSelect, FactorySelect },
   dicts: [],
   provide() {
     return {
@@ -207,17 +232,24 @@ export default {
       // 表单参数
       form: {
         productionRequestCode: "",
-        routeId: "",
         itemId: "",
-        factoryId: "",
-        isNeedShoeImg: "",
+        itemName: "",
+        unit: "",
+        routeId: "",
+        routeName: "",
+        factoryId:"",
+        factoryName:"",
+        type: "",
+        modality: "",
         isNeedPrototype: "",
+        isNeedShoeImg: "",
         isUniqueCode: "",
-        isConsiderColor: "",
-        isDisabled: "",
+        isDisabled:"",
         shoeImg: "",
-        prototype: "",
+        sizeGroup: "",
         remark: "",
+        prototype:"",
+        warehouse: "",
       },
       rules: {},
     };
@@ -231,24 +263,23 @@ export default {
     },
     pageTitle() {
       const titles = {
-        edit: "打样单修改",
-        info: "打样单查看",
-        apply: "打样单申请",
+        edit: "量产单修改",
+        info: "量产单查看",
+        apply: "量产单申请",
       };
       return titles[this.mode];
     },
   },
   created() {
     this.getFormInfo();
-    this.gCode();
   },
   methods: {
     /** 根据 id 获取页面数据 */
     getFormInfo() {
       if (this.mode != "apply") {
-        const id = this.$route.query.prototypeRequestId;
+        const id = this.$route.query.productionRequestId;
         this.loading = true;
-        getPrototypeRequest(id)
+        getProductionRequest(id)
           .then(({ data }) => {
             Object.assign(this.form, data);
             this.bomList = data.bomList;
@@ -264,7 +295,7 @@ export default {
     /** 生成编码 */
     gCode() {
       genCode("PROTOTYPE_REQUEST_CODE").then((response) => {
-        this.form.prototypeRequestCode = response;
+        this.form.productionRequestCode = response;
       });
     },
     /** 点击tab 获取bom的数据,将参数传递给后面的组件 */
@@ -280,6 +311,12 @@ export default {
         this.form.unit = row.unitOfMeasure;
       }
     },
+    onFactorySelect(row) {
+      if (row != undefined && row != null) {
+        this.form.factoryId = row.factoryId;
+        this.form.factoryName = row.factoryName;
+      }
+    },
     onRoutesProcessSelect(row) {
       if (row != undefined && row != null) {
         this.form.routeId = row.routeId;
@@ -306,7 +343,7 @@ export default {
       };
       this.loading = true;
       if (this.mode == "apply") {
-        addPrototypeRequest(params)
+        addProductionRequest(params)
           .then((res) => {
             this.loading = false;
             this.$modal.msgSuccess("提交成功！");
@@ -318,7 +355,7 @@ export default {
             this.loading = false;
           });
       } else {
-        updatePrototypeRequest(params)
+        updateProductionRequest(params)
           .then(() => {
             this.loading = false;
             this.$modal.msgSuccess("提交成功！");
@@ -331,22 +368,28 @@ export default {
     /**重置表单 */
     resetForm() {
       this.form = {
-        prototypeRequestCode: "",
-        routeId: "",
+        productionRequestCode: "",
         itemId: "",
-        factoryId: "",
-        isNeedShoeImg: "",
+        itemName: "",
+        unit: "",
+        routeId: "",
+        routeName: "",
+        factoryId:"",
+        factoryName:"",
+        type: "",
+        modality: "",
         isNeedPrototype: "",
+        isNeedShoeImg: "",
         isUniqueCode: "",
-        isConsiderColor: "",
-        isDisabled: "",
+        isDisabled:"",
         shoeImg: "",
-        prototype: "",
+        sizeGroup: "",
         remark: "",
+        prototype:"",
+        warehouse: "",
       };
       this.$refs["ProogingBomRef"].resetState();
       this.$refs["ProogingProcessRef"].resetState();
-      this.gCode();
     },
   },
 };