Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/api/mes/md/brand.js

@@ -10,10 +10,21 @@ export function listBrand(query) {
 }
 
 // 查询所有品牌
-export function listAllBrand() {
+export function listAllBrand(query) {
   return request({
     url: '/mes/md/brand/listAll',
-    method: 'get'
+    method: 'get' ,
+    params: query
+  })
+}
+
+
+// 根据条件查询查询品牌列表
+export function listBrandByCondition(query) {
+  return request({
+    url: '/mes/md/brand/listBrandByCondition',
+    method: 'get',
+    params: query
   })
 }
 

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/client/components/ClientContact.vue

@@ -52,8 +52,8 @@
 
     <el-table v-loading="loading" :data="contactList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="客户id" align="center" prop="clientId" width="100"/>
-      <el-table-column label="品牌ID" align="center" prop="brandId" width="150"/>
+      <el-table-column label="品牌名称" align="center" prop="brandName" width="150"/>
+      <el-table-column label="部门" align="center" prop="department" width="100"/>
       <el-table-column label="职位" align="center" prop="position" width="100"/>
       <el-table-column label="联系人" align="center" prop="contact" width="100"/>
       <el-table-column label="电话号码" align="center" prop="tel" width="150"/>
@@ -95,9 +95,27 @@
     <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="品牌ID" prop="brandId" label-width="120px">
-          <el-input v-model="form.brandId" placeholder="请输入品牌ID"/>
+        <el-form-item label="品牌名称" prop="brandName" label-width="120px">
+          <el-select
+            v-model="form.brandName"
+            filterable
+            remote
+            placeholder="请输入品牌名称"
+            :remote-method="remoteMethod"
+            :loading="loadingOptions">
+            <el-option
+              v-for="item in options"
+              :key="item.brandId"
+              :label="item.brandName"
+              :value="item.brandName">
+            </el-option>
+          </el-select>
         </el-form-item>
+
+        <el-form-item label="部门" prop="department" label-width="120px">
+          <el-input v-model="form.department" placeholder="请输入部门"/>
+        </el-form-item>
+
         <el-form-item label="职位" prop="position" label-width="120px">
           <el-input v-model="form.position" placeholder="请输入职位"/>
         </el-form-item>
@@ -130,6 +148,8 @@
 
 <script>
 import {listContact, addContact, updateContact, getContact, delContact} from '@/api/mes/md/clientContact'
+import {listBrandByCondition} from '@/api/mes/md/brand'
+
 
 export default {
   props: {
@@ -137,6 +157,17 @@ export default {
   },
   data() {
     return {
+      //远程搜索获取到的列表
+      brandList: [],
+      //远程搜索加载选项
+      loadingOptions: false,
+      //远程搜索选项
+      options: [],
+      //远程搜索参数
+      remoteQuery: {
+        brandName: null,
+        enableFlag: "Y"
+      },
       // 遮罩层
       loading: false,
       // 选中数组
@@ -165,24 +196,21 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        brandId: [
-          {required: true, trigger: 'blur'}
-        ],
-        position: [
-          {required: true, trigger: 'blur'}
-        ],
-        contact: [
-          {required: true, trigger: 'blur'}
-        ],
-        tel: [
-          {required: true, trigger: 'blur'}
-        ],
+        // position: [
+        //   {required: true, trigger: 'blur'}
+        // ],
+        // contact: [
+        //   {required: true, trigger: 'blur'}
+        // ],
+        // tel: [
+        //   {required: true, trigger: 'blur'}
+        // ],
         businessType: [
           {required: true, trigger: 'blur'}
         ],
-        merchandiser: [
-          {required: true, trigger: 'blur'}
-        ]
+        // merchandiser: [
+        //   {required: true, trigger: 'blur'}
+        // ]
 
       }
     }
@@ -193,6 +221,7 @@ export default {
       this.loading = true
       this.queryParams.clientId = this.clientId
       listContact(this.queryParams).then(response => {
+        console.log(response, 111)
         this.contactList = response.rows
         this.total = response.total
       }).finally(() => this.loading = false)
@@ -207,7 +236,8 @@ export default {
       this.form = {
         id: null,
         clientId: this.clientId,
-        brandId: null,
+
+        brandName: null,
         position: null,
         contact: null,
         tel: null,
@@ -259,12 +289,11 @@ export default {
       this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-
-            updateContact(this.form).then(response => {
-              this.$modal.msgSuccess('修改成功')
-              this.open = false
-              this.getList()
-            })
+              updateContact(this.form).then(response => {
+                this.$modal.msgSuccess('修改成功')
+                this.open = false
+                this.getList()
+              })
           } else {
             this.form.clientId = this.clientId
             addContact(this.form).then(response => {
@@ -298,6 +327,23 @@ export default {
       this.queryParams.clientId = form.clientId
       this.getList()
     },
+    /** 远程搜索 */
+    remoteMethod(query) {
+      // 如果用户输入内容了，就发请求拿数据，远程搜索模糊查询
+      if (query !== "") {
+        this.remoteQuery.brandName = query;
+        this.loadingOptions = true; // 开始拿数据喽
+        // 这里模拟发请求，res就当成发请求返回来的数据吧。
+        listBrandByCondition(this.remoteQuery).then(response => {
+          if (response.code == 200) {
+            this.options = response.data
+          }
+          this.loadingOptions = false // 拿到数据喽
+        })
+      } else {
+        this.options = [];
+      }
+    }
   }
 }
 </script>

src/views/mes/md/client/components/DeliveryInfo.vue

@@ -54,11 +54,6 @@
             <el-input v-model="form.path" placeholder="请输入线路"/>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="线路" prop="path" :label-width="labelWidth">
-            <el-input v-model="form.path" placeholder="请输入线路"/>
-          </el-form-item>
-        </el-col>
         <el-col :span="12">
           <el-form-item label="送货单打印默认设置" prop="billPrintSetting" :label-width="labelWidth">
             <el-input v-model="form.billPrintSetting" placeholder="请输入送货单打印默认设置"/>

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/product/index.vue

@@ -912,15 +912,15 @@ export default {
             publishedConfData.itemId = this.form.itemId;
 
             //销售单位转换保存
-            const saleUnit = await this.$refs["SaleUnit"].getSaleUnitFormData();
-            saleUnit.itemId = this.form.itemId;
+            //const saleUnit = await this.$refs["SaleUnit"].getSaleUnitFormData();
+            //saleUnit.itemId = this.form.itemId;
 
             const params = {
               ...this.form,
               baseInfo: baseInfoData,
               look: lookData,
               publishedConf: publishedConfData,
-              saleUnit: saleUnit
+              //saleUnit: saleUnit
             };
             updateMdItem(params).then((response) => {
               this.$modal.msgSuccess("修改成功");

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/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;
         }
       });
     },