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

src/components/SapPropertyData/index.vue

@@ -2,6 +2,7 @@
   <div class="base-info">
     <el-form :model="sapData" ref="form" label-width="120px" size="mini">
       <el-row class="form-wrap" :gutter="gutter">
+        <div>
           <template v-for="(sapProperties, key) in sapPropertyMap">
             <div class="separator">{{ getViewTypeName(key) }}</div>
             <template v-for="item in sapProperties">
@@ -13,6 +14,7 @@
               </el-col>
             </template>
           </template>
+        </div>
       </el-row>
 
       <div class="footer">

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

@@ -52,17 +52,16 @@
 
     <el-table v-loading="loading" :data="contactList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="跟单员" align="center" prop="id"/>
-      <el-table-column label="客户id" align="center" prop="clientId"/>
-      <el-table-column label="品牌ID" align="center" prop="brandId"/>
-      <el-table-column label="职位" align="center" prop="position"/>
-      <el-table-column label="联系人" align="center" prop="contact"/>
-      <el-table-column label="电话号码" align="center" prop="tel"/>
-      <el-table-column label="email" align="center" prop="email"/>
-      <el-table-column label="经营类型" align="center" prop="businessType"/>
-      <el-table-column label="工厂代号" align="center" prop="factoryCode"/>
-      <el-table-column label="跟单员" align="center" prop="merchandiser"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <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="position" width="100"/>
+      <el-table-column label="联系人" align="center" prop="contact" width="100"/>
+      <el-table-column label="电话号码" align="center" prop="tel" width="150"/>
+      <el-table-column label="email" align="center" prop="email" width="200"/>
+      <el-table-column label="经营类型" align="center" prop="businessType" width="100"/>
+      <el-table-column label="工厂代号" align="center" prop="factoryCode" width="100"/>
+      <el-table-column label="跟单员" align="center" prop="merchandiser" width="100"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200px">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -91,13 +90,51 @@
       :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="品牌ID" prop="brandId" label-width="120px">
+            <el-input v-model="form.brandId" placeholder="请输入品牌ID" />
+          </el-form-item>
+          <el-form-item label="职位" prop="position" label-width="120px">
+            <el-input v-model="form.position" placeholder="请输入职位" />
+          </el-form-item>
+          <el-form-item label="联系人" prop="contact" label-width="120px">
+            <el-input v-model="form.contact" placeholder="请输入联系人" />
+          </el-form-item>
+          <el-form-item label="电话号码" prop="tel" label-width="120px">
+            <el-input v-model="form.tel" placeholder="请输入电话号码" />
+          </el-form-item>
+          <el-form-item label="email" prop="email" label-width="120px">
+            <el-input v-model="form.email" placeholder="请输入email" />
+          </el-form-item>
+          <el-form-item label="经营类型" prop="businessType" label-width="120px">
+            <el-input v-model="form.businessType" placeholder="请输入经营类型" />
+          </el-form-item>
+          <el-form-item label="工厂代号" prop="spefactoryCodec" label-width="120px">
+            <el-input v-model="form.factoryCode" placeholder="请输入产工厂代码" />
+          </el-form-item>
+          <el-form-item label="跟单员" prop="merchandiser" label-width="120px">
+            <el-input v-model="form.merchandiser" placeholder="请输入跟单员" />
+          </el-form-item>
+        </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 { listContact } from '@/api/mes/md/clientContact'
+import { listContact,addContact,updateContact,getContact,delContact } from '@/api/mes/md/clientContact'
 
 export default {
+  props: {
+    clientId: { type: Number | undefined, default:undefined  },
+  },
   data() {
     return {
       // 遮罩层
@@ -112,7 +149,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 客户系人表格数据
+      // 客户联系人表格数据
       contactList: [],
       // 弹出层标题
       title: '',
@@ -127,13 +164,34 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {}
+      rules: {
+        brandId: [
+          { 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' }
+        ]
+
+      }
     }
   },
   methods: {
-    /** 查询客户系人列表 */
+    /** 查询客户联系人列表 */
     getList() {
       this.loading = true
+      this.queryParams.clientId=this.clientId
       listContact(this.queryParams).then(response => {
         this.contactList = response.rows
         this.total = response.total
@@ -148,7 +206,7 @@ export default {
     reset() {
       this.form = {
         id: null,
-        clientId: null,
+        clientId: this.clientId,
         brandId: null,
         position: null,
         contact: null,
@@ -184,7 +242,7 @@ export default {
     handleAdd() {
       this.reset()
       this.open = true
-      this.title = '添加客户系人'
+      this.title = '添加客户联系人'
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -193,7 +251,7 @@ export default {
       getContact(id).then(response => {
         this.form = response.data
         this.open = true
-        this.title = '修改客户系人'
+        this.title = '修改客户联系人'
       })
     },
     /** 提交按钮 */
@@ -201,12 +259,14 @@ 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()
             })
           } else {
+            this.form.clientId = this.clientId
             addContact(this.form).then(response => {
               this.$modal.msgSuccess('新增成功')
               this.open = false
@@ -219,7 +279,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids
-      this.$modal.confirm('是否确认删除客户系人编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除？').then(function() {
         return delContact(ids)
       }).then(() => {
         this.getList()

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

@@ -48,9 +48,11 @@
 
     <el-table v-loading="loading" :data="relationList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="支付方客户ID" align="center" prop="id" />
       <el-table-column label="客户id" align="center" prop="clientId" />
       <el-table-column label="支付方客户ID" align="center" prop="relatedClientId" />
+      <el-table-column label="创建人" align="center" prop="createBy" />
+      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="修改时间" align="center" prop="updateTime" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -82,10 +84,7 @@
     <!-- 添加或修改客户付款信息关联对话框 -->
     <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="clientId">
-          <el-input v-model="form.clientId" placeholder="请输入客户id" />
-        </el-form-item>
-        <el-form-item label="支付方客户ID" prop="relatedClientId">
+        <el-form-item label="支付方客户ID" prop="relatedClientId" label-width="8em">
           <el-input v-model="form.relatedClientId" placeholder="请输入支付方客户ID" />
         </el-form-item>
       </el-form>
@@ -102,6 +101,9 @@ import { listRelation, getRelation, delRelation, addRelation, updateRelation } f
 
 export default {
   name: "Relation",
+  props: {
+    clientId: { type: Number | undefined, default:undefined  },
+  },
   data() {
     return {
       // 遮罩层
@@ -133,6 +135,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        relatedClientId: [{
+          required: true, trigger: 'blur'
+        }]
       }
     };
   },
@@ -143,6 +148,7 @@ export default {
     /** 查询客户付款信息关联列表 */
     getList() {
       this.loading = true;
+      this.queryParams.clientId=this.clientId
       listRelation(this.queryParams).then(response => {
         this.relationList = response.rows;
         this.total = response.total;
@@ -157,7 +163,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        id: null,        clientId: null,        relatedClientId: null,        createBy: null,        createTime: null,        updateBy: null,        updateTime: null      };
+        id: null,        clientId: this.clientId,        relatedClientId: null,        createBy: null,        createTime: null,        updateBy: null,        updateTime: null      };
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -203,6 +209,7 @@ export default {
               this.getList();
             });
           } else {
+            this.form.clientId= this.clientId
             addRelation(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;

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

@@ -53,11 +53,14 @@
 
     <el-table v-loading="loading" :data="emailList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="是否开启" align="center" prop="id"/>
       <el-table-column label="客户id" align="center" prop="clientId"/>
       <el-table-column label="邮箱" align="center" prop="email"/>
       <el-table-column label="联系人" align="center" prop="contact"/>
-      <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
@@ -90,17 +93,21 @@
     <!-- 添加或修改催货款通知邮箱对话框 -->
     <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="clientId">
-          <el-input v-model="form.clientId" placeholder="请输入客户id"/>
-        </el-form-item>
         <el-form-item label="邮箱" prop="email">
           <el-input v-model="form.email" placeholder="请输入邮箱"/>
         </el-form-item>
         <el-form-item label="联系人" prop="contact">
           <el-input v-model="form.contact" placeholder="请输入联系人"/>
         </el-form-item>
-        <el-form-item label="是否开启" prop="enableFlag">
-          <el-input v-model="form.enableFlag" placeholder="请输入是否开启"/>
+        <el-form-item label="是否启用" prop="enableFlag">
+          <el-select v-model="form.enableFlag" 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-form>
       <div slot="footer" class="dialog-footer">
@@ -116,6 +123,10 @@ import { addEmail, delEmail, getEmail, listEmail, updateEmail } from '@/api/mes/
 
 export default {
   name: 'Email',
+  dicts:['sys_yes_no'],
+  props: {
+    clientId: { type: Number | undefined, default:undefined  },
+  },
   data() {
     return {
       // 遮罩层
@@ -140,18 +151,33 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        clientId: null, email: null, contact: null, enableFlag: null
+        clientId: null, 
+        email: null, contact: null, enableFlag: null
       },
       // 表单参数
       form: {},
       // 表单校验
-      rules: {}
+      rules: {
+        email: [
+          { required: true, trigger: 'blur' }
+        ],
+        contact: [
+          { required: true, trigger: 'blur' }
+        ],
+        contact: [
+          { required: true, trigger: 'blur' }
+        ],
+        enableFlag: [
+          { required: true, trigger: 'blur' }
+        ]
+      }
     }
   },
   methods: {
     /** 查询催货款通知邮箱列表 */
     getList() {
       this.loading = true
+      this.queryParams.clientId=this.clientId
       listEmail(this.queryParams).then(response => {
         this.emailList = response.rows
         this.total = response.total
@@ -167,7 +193,7 @@ export default {
     reset() {
       this.form = {
         id: null,
-        clientId: null,
+        clientId: this.clientId,
         email: null,
         contact: null,
         enableFlag: null,
@@ -221,6 +247,7 @@ export default {
               this.getList()
             })
           } else {
+            this.form.clientId = this.clientId
             addEmail(this.form).then(response => {
               this.$modal.msgSuccess('新增成功')
               this.open = false

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

@@ -243,13 +243,13 @@
             <FinanceInfo ref="FinanceInfo" :form="form"/>
           </el-tab-pane>
           <el-tab-pane label="客户联系人" name="ClientContact">
-            <ClientContact ref="ClientContact"/>
+            <ClientContact ref="ClientContact" :clientId="form.clientId"/>
           </el-tab-pane>
           <el-tab-pane label="催货款通知邮箱" name="UrgeEmail">
-            <UrgeEmail ref="UrgeEmail"/>
+            <UrgeEmail ref="UrgeEmail" :clientId="form.clientId"/>
           </el-tab-pane>
           <el-tab-pane label="客户付款信息" name="PaymentRelation">
-            <PaymentRelation ref="PaymentRelation"/>
+            <PaymentRelation ref="PaymentRelation" :clientId="form.clientId"/>
           </el-tab-pane>
           <el-tab-pane label="SAP特性" name="SapProperty">
             <SapPropertyData ref="SapProperty"/>

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

 <template>
   <div class="app-container">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-        
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="产品特性名称" prop="spec" label-width="7em">
         <el-input
           v-model="queryParams.spec"
           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-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>
 
@@ -26,7 +39,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['md:spec:add']"
-          >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -37,7 +51,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['md:spec:edit']"
-          >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -48,7 +63,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['md:spec:remove']"
-          >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -58,17 +74,28 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['md:spec:export']"
-          >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-      <el-table v-loading="loading" :data="specList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="specList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
 
-        
       <el-table-column label="产品特性名称" align="center" prop="spec" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -76,20 +103,22 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['md:spec:edit']"
-            >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['md:spec:remove']"
-            >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-        v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -99,7 +128,6 @@
     <!-- 添加或修改产品特性名称对话框 -->
     <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="spec" label-width="120px">
           <el-input v-model="form.spec" placeholder="请输入产品特性名称" />
         </el-form-item>
@@ -110,16 +138,21 @@
       </div>
     </el-dialog>
   </div>
-  </template>
+</template>
 
-  <script>
-  import { listSpec, getSpec, delSpec, addSpec, updateSpec } from "@/api/mes/md/spec";
+<script>
+import {
+  listSpec,
+  getSpec,
+  delSpec,
+  addSpec,
+  updateSpec,
+} from "@/api/mes/md/spec";
 
-  export default {
+export default {
   name: "Spec",
   props: {
-        itemId:{type:Number,
-        default:''}
+    itemId: { type: Number, default: "" },
   },
   data() {
     return {
@@ -145,15 +178,21 @@
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-          itemId: '',
-            spec: null      },
+        itemId: "",
+        spec: null,
+      },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         spec: [
-            { required: true, message: "产品特性名称不能为空！", trigger: "blur" }
-          ],      }
+          {
+            required: true,
+            message: "产品特性名称不能为空！",
+            trigger: "blur",
+          },
+        ],
+      },
     };
   },
   created() {
@@ -164,7 +203,7 @@
     getList() {
       this.loading = true;
       this.queryParams.itemId = this.itemId;
-        listSpec(this.queryParams).then(response => {
+      listSpec(this.queryParams).then((response) => {
         this.specList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -178,7 +217,10 @@
     // 表单重置
     reset() {
       this.form = {
-          itemSpecId: null,        itemId: this.itemId,        spec: null      };
+        itemSpecId: null,
+        itemId: this.itemId,
+        spec: null,
+      };
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -193,9 +235,9 @@
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.itemSpecId)
-        this.single = selection.length!==1
-        this.multiple = !selection.length
+      this.ids = selection.map((item) => item.itemSpecId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -206,8 +248,8 @@
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-        const itemSpecId = row.itemSpecId || this.ids
-        getSpec(itemSpecId).then(response => {
+      const itemSpecId = row.itemSpecId || this.ids;
+      getSpec(itemSpecId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改产品特性名称";
@@ -215,18 +257,17 @@
     },
     /** 提交按钮 */
     submitForm() {
-        this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.itemSpecId != null) {
-              updateSpec(this.form).then(response => {
+            updateSpec(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             this.form.itemId = this.itemId;
-              addSpec(this.form).then(response => {
-                
+            addSpec(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -239,20 +280,27 @@
     handleDelete(row) {
       const itemSpecIds = row.itemSpecId || this.ids;
 
-        this.$modal.confirm('是否确认删除？').then(function() {
+      this.$modal
+        .confirm("是否确认删除？")
+        .then(function () {
           return delSpec(itemSpecIds);
-        }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-        this.download('md/spec/export', {
-          ...this.queryParams
-        }, `spec_${new Date().getTime()}.xlsx`)
-      }
-    }
-  };
-  </script>
-  
+      this.download(
+        "md/spec/export",
+        {
+          ...this.queryParams,
+        },
+        `spec_${new Date().getTime()}.xlsx`
+      );
+    },
\ No newline at end of file
+  },
+};
+</script>

src/views/mes/order/sales/index.vue

@@ -3,7 +3,7 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="订单编号" prop="orderNo">
         <el-input
-          v-model="queryParams.orderNo"
+          v-model.trim="queryParams.orderNo"
           placeholder="请输入订单编号"
           clearable
           @keyup.enter.native="handleQuery"
@@ -11,7 +11,7 @@
       </el-form-item>
       <el-form-item label="客户编号" prop="clientCode">
         <el-input
-          v-model="queryParams.clientCode"
+          v-model.trim="queryParams.clientCode"
           placeholder="请输入客户编号"
           clearable
           @keyup.enter.native="handleQuery"
@@ -28,20 +28,14 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item label="跟单人" prop="merchandiser">
-        <el-input
-          v-model="queryParams.merchandiser"
-          placeholder="请输入跟单人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.merchandiser" clearable filterable remote :remote-method="getUserList" placeholder="请选择跟单人">
+          <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"/>
+        </el-select>
       </el-form-item>
       <el-form-item label="订单状态" prop="state">
-        <el-input
-          v-model="queryParams.state"
-          placeholder="请输入订单状态"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.state" clearable placeholder="请选择订单状态">
+          <el-option v-for="item in dict.type.sales_order_state" :key="item.value" :label="item.label" :value="item.value"/>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -99,35 +93,20 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange" @expand-change="onShowDetail">
+    <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55"/>
-      <el-table-column type="expand">
-        <template slot-scope="{row}">
-          <el-row v-loading="row.detailLoading" class="order-detail">
-            <el-row v-for="item in row.detailList" :key="item.id">
-              <el-col :span="4">{{ item.productName }}</el-col>
-              <el-col :span="4">{{ item.num }}</el-col>
-              <el-col :span="4">{{ formatMoney(item.amount) }}</el-col>
-              <el-col :span="4">{{ item.state }}</el-col>
-              <el-col :span="4"></el-col>
-              <el-col :span="4"></el-col>
-              <el-col :span="4"></el-col>
-            </el-row>
-          </el-row>
-        </template>
-      </el-table-column>
       <el-table-column label="订单编号" prop="orderNo"/>
       <el-table-column label="客户编号" prop="mdClient.clientCode"/>
-      <el-table-column label="交货期" prop="deliveryDate" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.deliveryDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="交货期" prop="deliveryDate" width="180"/>
       <el-table-column label="总金额" prop="amount" :formatter="r => this.formatMoney(r.amount)"/>
       <el-table-column label="跟单人" prop="merchandiser"
                        :formatter="r => (this.userList.find(item => item.userId == r.merchandiser) || {}).nickName"/>
       <el-table-column label="备注" prop="remark"/>
-      <el-table-column label="订单状态" prop="state"/>
+      <el-table-column label="订单状态" prop="state">
+        <template slot-scope="{row}">
+          {{ dict.type.sales_order_state.find(item => item.value == row.state).label }}
+        </template>
+      </el-table-column>
       <el-table-column label="操作" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -158,70 +137,15 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改销售订单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="960px">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row :gutter="10">
-          <el-col :span="12">
-            <el-form-item label="订单编号" prop="orderNo">
-              <el-input v-model="form.orderNo" placeholder="请输入订单编号"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="客户编号" prop="clientCode">
-              <el-input v-model="form.clientCode" placeholder="请输入客户编号"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="交货期" prop="deliveryDate">
-              <el-date-picker
-                clearable
-                v-model="form.deliveryDate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="请选择交货期"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="总金额" prop="amount">
-              <el-input v-model="form.amount" placeholder="请输入总金额"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="跟单人" prop="merchandiser">
-              <el-select v-model="form.merchandiser" placeholder="请输入跟单人" filterable clearable>
-                <el-option v-for="item in userList" :key="item.userId" :value="item.userId" :label="item.nickName"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" placeholder="请输入备注"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="订单状态" prop="state">
-              <el-input v-model="form.state" placeholder="请输入订单状态"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </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 { addOrder, delOrder, getOrder, listOrder, updateOrder } from '@/api/mes/od/salesOrder'
-import { listDetail } from '@/api/mes/od/salesOrderDetail'
+import { delOrder, listOrder } from '@/api/mes/od/salesOrder'
 import { listUser } from '@/api/system/user'
 
 export default {
-  name: 'Order',
+  dicts: ['mes_client_type','sys_yes_no', 'sales_order_state'],
   data() {
     return {
       // 遮罩层
@@ -238,10 +162,6 @@ export default {
       total: 0,
       // 销售订单表格数据
       orderList: [],
-      // 弹出层标题
-      title: '',
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -249,11 +169,7 @@ export default {
         orderNo: null, clientCode: null, deliveryDate: null, amount: null, merchandiser: null, state: null,
         mdClient: {clientName: null}
       },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {},
-      userList: []
+      userList: [],
     }
   },
   created() {
@@ -264,51 +180,13 @@ export default {
     /** 查询销售订单列表 */
     getList() {
       this.loading = true
-      console.log(this.queryParams)
       listOrder(this.queryParams).then(response => {
-        response.rows.forEach(item => {
-          item.detailLoading = false
-          item.detailList = []
-        })
         this.orderList = response.rows
         this.total = response.total
-        this.loading = false
-      })
-    },
-    getUserList() {
-      if (this.userList.length) return
-      listUser().then(res => this.userList = res.rows)
+      }).finally(() => this.loading = false)
     },
-    onShowDetail(row) {
-      if (!row.detailList.length) {
-        row.detailLoading = true
-        listDetail({ orderId: row.id }).then(res => {
-          row.detailList = res.rows
-        }).finally(() => row.detailLoading = false)
-      }
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        orderNo: null,
-        clientCode: null,
-        deliveryDate: null,
-        amount: null,
-        merchandiser: null,
-        remark: null,
-        state: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null
-      }
-      this.resetForm('form')
+    getUserList(nickName) {
+      listUser({nickName, pageNum: 1, pageSize: 100}).then(res => this.userList = res.rows)
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -328,41 +206,11 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset()
-      this.open = true
-      this.title = '添加销售订单'
-      this.getUserList()
+      this.$router.push('/order/sales/detail')
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset()
-      this.getUserList()
-      const id = row.id || this.ids
-      getOrder(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) {
-            updateOrder(this.form).then(response => {
-              this.$modal.msgSuccess('修改成功')
-              this.open = false
-              this.getList()
-            })
-          } else {
-            addOrder(this.form).then(response => {
-              this.$modal.msgSuccess('新增成功')
-              this.open = false
-              this.getList()
-            })
-          }
-        }
-      })
+      this.$router.push('/order/sales/detail?id=' + row.id)
     },
     /** 删除按钮操作 */
     handleDelete(row) {

src/views/mes/order/salesdetail/index.vue

+<template>
+  <div class="form-page">
+    <div class="page-head">
+      <div class="page-title">{{ form.id ? '编辑销售订单' : '新增销售订单' }}</div>
+      <div class="head-btn">
+        <el-button size="mini" @click="onGoBack">返回</el-button>
+        <el-button type="primary" size="mini" :loading="loading" @click="onEdit">提交</el-button>
+      </div>
+    </div>
+    <div class="page-body">
+      <el-form :model="form" ref="form" :rules="rules" label-width="100px">
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item label="订单编号" prop="orderNo">
+              <el-input v-model="form.orderNo" placeholder="请输入 订单编号" clearable style="width: calc(100% - 100px);"/>
+              <el-button @click="onGenCode" style="width: 80px; margin-left: 20px" :disabled="!!form.id">生成</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="客户名称" prop="clientId">
+              <el-select v-model="form.clientId" placeholder="请选择 客户" clearable filterable remote :remote-method="getClientList">
+                <el-option v-for="item in clientList" :key="item.clientId" :value="item.clientId" :label="item.clientName"/>
+              </el-select>
+
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="交货日期" prop="deliveryDate">
+              <el-date-picker v-model="form.deliveryDate" type="date" value-format="yyyy-MM-dd 23:59:59" placeholder="选择交货日期" clearable/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="总金额" prop="amount">
+              <el-input-money v-model="form.amount" placeholder="请输入 总金额" clearable/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="跟单人" prop="merchandiser" clearable filterable remote :remote-method="getUserList">
+              <el-select v-model="form.merchandiser" placeholder="请选择 跟单人" filterable clearable>
+                <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="订单状态" prop="state">
+              <el-select v-model="form.state" clearable placeholder="请选择订单状态">
+                <el-option v-for="item in dict.type.sales_order_state" :key="item.value" :label="item.label" :value="item.value"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :offset="16" :span="8">
+            <el-form-item label="备注" prop="remark">
+              <el-input type="textarea" v-model="form.remark" placeholder="请输入 备注" show-word-limit maxlength="120" :rows="3"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+
+    <div class="page-item">
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="onShowEditDetail(null)"
+            v-hasPermi="['mes:md:client:add']"
+          >新增
+          </el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="danger"
+            plain
+            icon="el-icon-delete"
+            size="mini"
+            :disabled="multiple"
+            @click="onDeleteDetail"
+            v-hasPermi="['mes:md:client:remove']"
+          >删除
+          </el-button>
+        </el-col>
+      </el-row>
+
+      <el-dialog :visible="showEditDetail" :title="itemForm.id ? '修改订单产品' : '新增订单产品'" width="960px">
+        <el-form :model="itemForm" ref="itemForm" :rules="itemRules" label-width="100px">
+          <el-row :gutter="10">
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="itemName">
+                <el-input v-model="itemForm.itemName" readonly placeholder="请选择产品" clearable>
+                  <el-button slot="append" icon="el-icon-search" @click="$refs['ItemSelectRef'].showFlag = true"/>
+                </el-input>
+                <ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品编码" prop="itemName">
+                <el-input v-model="itemForm.itemCode" placeholder="请输入 产品编码" readonly/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="数量" prop="num">
+                <el-input v-model.number="itemForm.num" placeholder="请输入 数量" clearable/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="金额" prop="amount">
+                <el-input-money v-model="itemForm.amount" placeholder="请输入 金额" clearable/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="状态" prop="state">
+                <el-select v-model="itemForm.state" clearable placeholder="请选择订单状态">
+                  <el-option v-for="item in dict.type.sales_order_state" :key="item.value" :label="item.label" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <template v-if="itemForm.specList">
+              <el-col v-for="(spec, i) in itemForm.specList" :span="12" :key="spec.specId">
+                <el-form-item :label="spec.specKey" :prop="'specList.' + i + '.specVal'" :rules="{required: true, message: '特性值不能为空', trigger: 'blur'}">
+                  <el-input v-model="spec.specVal" clearable/>
+                </el-form-item>
+              </el-col>
+            </template>
+          </el-row>
+        </el-form>
+        <div slot="footer">
+          <el-button @click="showEditDetail = false">取消</el-button>
+          <el-button type="primary" @click="onEditDetail">确认</el-button>
+        </div>
+      </el-dialog>
+
+      <el-table :data="form.detailList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55"/>
+        <el-table-column label="产品名称" prop="itemName" width="200" show-overflow-tooltip/>
+        <el-table-column label="产品编码" prop="itemCode" width="200"/>
+        <el-table-column label="数量" prop="num" width="100"/>
+        <el-table-column label="金额" :formatter="r => this.formatMoney(r.amount)" width="150"/>
+        <el-table-column label="订单状态" prop="state" width="150">
+          <template slot-scope="{row}">
+            {{ dict.type.sales_order_state.find(item => item.value == row.state).label }}
+          </template>
+        </el-table-column>
+        <el-table-column label="其它特性">
+          <el-row v-if="row.specList" slot-scope="{row}">
+            <el-col class="spec-item" :span="12" v-for="spec in row.specList" :key="spec.id">
+              <span class="spec-key">{{ spec.specKey }}：</span>
+              <span class="spec-val">{{spec.specVal }}；</span>
+            </el-col>
+          </el-row>
+        </el-table-column>
+        <el-table-column label="操作" width="120">
+          <template slot-scope="{row}">
+            <el-button
+              v-hasPermi="['od:salesOrder:edit']"
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="onShowEditDetail(row)"
+            >修改
+            </el-button>
+            <el-button
+              v-hasPermi="['od:salesOrder:remove']"
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="onDeleteDetail(row)"
+            >删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import { addOrder, getOrder, updateOrder } from '@/api/mes/od/salesOrder'
+import { listUser } from '@/api/system/user'
+import { listClient } from '@/api/mes/md/client'
+import { listSpec } from '@/api/mes/md/spec.js'
+import ItemSelect from '@/components/itemSelect/single.vue'
+import {genCode} from "@/api/system/autocode/rule"
+import store from '@/store'
+import router from '@/router'
+
+export default {
+  components: {
+    ItemSelect
+  },
+  dicts: ['sales_order_state'],
+  data() {
+    return {
+      form: {
+        id: null,
+        remark: null,
+        orderNo: null,
+        clientId: null,
+        deliveryDate: null,
+        amount: null,
+        merchandiser: null,
+        state: null,
+        detailList: []
+      },
+      itemForm: {
+        itemId: null,
+        itemName: null,
+        itemCode: null,
+        num: null,
+        amount: null,
+        state: null,
+        specList: []
+      },
+      rules: {
+        orderNo: { required: true, message: '请输入订单编号', trigger: ['change'] },
+        clientId: { required: true, message: '请选择客户', trigger: ['change'] },
+        deliveryDate: { required: true, message: '请选择交货日期', trigger: ['change'] },
+        amount: { required: true, message: '请输入订单总金额', trigger: ['blur'] },
+        merchandiser: { required: true, message: '请选择更进入', trigger: ['change'] },
+        state: { required: true, message: '请选择订单状态', trigger: ['change'] }
+      },
+      itemRules: {
+        itemName: { required: true, message: '请选择产品名称', trigger: ['change'] },
+        itemCode: { required: true, message: '请选择产品编码', trigger: ['change'] },
+        num: { required: true, message: '请输入产品数量', trigger: ['blur'] },
+        amount: { required: true, message: '请输入产品金额', trigger: ['blur'] },
+        state: { required: true, message: '请选择产品状态', trigger: ['change'] }
+      },
+      ids: {},
+      clientList: [],
+      userList: [],
+      showEditDetail: false,
+      loading: false,
+      multiple: false
+    }
+  },
+  methods: {
+    onEdit() {
+      if (this.loading) return
+      this.loading = true
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          let editOrder = this.form.id ? updateOrder : addOrder
+          editOrder(this.form).then(() => {
+            this.$message.success('操作成功')
+            this.$store.dispatch("tagsView/delView", this.$router.currentRoute)
+            this.onGoBack()
+          }).finally(() => this.loading = false)
+        } else {
+          this.loading = false
+        }
+      })
+    },
+
+    onEditDetail() {
+      this.showEditDetail = false
+      this.$refs.itemForm.validate(valid => {
+        if (valid) {
+          let index = this.form.detailList.indexOf(item => item.id === this.itemForm.id)
+          if (index != -1) {
+            this.form.detailList[index] = this.itemForm
+          } else {
+            this.form.detailList.push(this.itemForm)
+          }
+        }
+      })
+    },
+
+    onItemSelect(row) {
+      if (row != null) {
+        this.itemForm.itemId = row.itemId
+        this.itemForm.itemName = row.itemName
+        this.itemForm.itemCode = row.itemCode
+        listSpec({ itemId: row.itemId }).then(res => {
+          for (let itemSpec of res.rows) {
+            const itemSize = { specId: itemSpec.itemSpecId, specKey: itemSpec.spec, specVal: null }
+            this.itemForm.specList.push(itemSize)
+          }
+
+        }).finally(() => this.$forceUpdate())
+
+      }
+    },
+
+    onShowEditDetail(item) {
+      console.log(item)
+      this.showEditDetail = true
+      this.$refs.itemForm && this.$refs.itemForm.resetFields()
+      this.itemForm = item || { itemName: null, itemCode: null, num: null, amount: null, state: null, specList: [] }
+    },
+
+    onDeleteDetail(row) {
+      let { form } = this
+      this.$modal.confirm('是否确认删除？').then(() => {
+        let ids = row.itemId || this.ids
+        ids = (ids instanceof Array) ? ids : [ids]
+        for (let id of ids) {
+          let index = form.detailList.findIndex(item => item.itemId == id)
+          if (index != -1) {
+            form.detailList.splice(index, 1)
+          }
+        }
+      })
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    onGenCode() {
+      genCode('SALES_ORDER_CODE').then(response => {
+        this.form.orderNo = response;
+      });
+    },
+
+    onGoBack() {
+      this.$store.dispatch("tagsView/delView", this.$router.currentRoute)
+      this.$router.back()
+    },
+
+    getClientList(key) {
+      listClient({ clientName: key, pageNum: 1, pageSize: 100 }).then(res => this.clientList = res.rows)
+    },
+
+    getUserList(key) {
+      listUser({ nickName: key, pageNum: 1, pageSize: 100 }).then(res => this.userList = res.rows)
+    },
+    getDetail() {
+      let orderId = this.$route.query.id
+      if (orderId) {
+        getOrder(orderId).then(res => {
+          this.form = res.data
+          this.form.detailList = this.form.detailList || []
+        })
+      }
+    }
+  },
+  created() {
+    this.getDetail()
+    this.getUserList()
+    this.getClientList()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.page-head {
+  border-bottom: 1px solid #dddddd;
+  box-shadow: 0 2px 2px #dddddd;
+}
+
+.page-title {
+  line-height: 80px;
+  text-align: center;
+  font-size: 18px;
+  font-weight: bold;
+}
+
+.head-btn {
+  margin: 0 20px 20px;
+}
+
+.page-body {
+  margin: 20px 40px;
+}
+
+.page-item {
+  margin: 20px 40px;
+}
+
+.spec-item {
+  line-height: 18px;
+  font-size: 12px;
+}
+
+.spec-key {
+  color: #99a9bf;
+}
+
+</style>

src/views/mes/proofing/components/ProogingProcess.vue

@@ -8,9 +8,15 @@
         prop="linkType"
         align="center"
       />
-      <el-table-column label="工作站" prop="workstationId" align="center" />
+      <el-table-column label="工作站" prop="workstationName" align="center" />
+      <el-table-column label="标准工时" prop="stdWorkingTime" align="center" />
       <el-table-column label="甘特图显示颜色" prop="colorCode" align="center" />
-      <el-table-column v-if="mode != 'info'" label="操作" align="center" width="150">
+      <el-table-column
+        v-if="mode != 'info'"
+        label="操作"
+        align="center"
+        width="150"
+      >
         <template slot-scope="{ row, $index }">
           <el-button
             type="text"
@@ -42,7 +48,7 @@
       v-dialogDrag
       :visible.sync="showFlag"
       width="800px"
-      title="添加工序"
+      title="工序修改"
     >
       <el-form
         ref="form"
@@ -54,75 +60,31 @@
       >
         <el-row>
           <el-col :span="12">
-            <el-form-item label="组件数量" prop="quantity">
-              <el-input
-                type="number"
-                v-model="form.quantity"
-                placeholder="请输入组件数量"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="计量单位" prop="unitOfMeasure">
-              <el-input
-                v-model="form.unitOfMeasure"
-                placeholder="请输入计量单位"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="报废百分比" prop="scrapPercentage">
-              <el-input
-                v-model="form.scrapPercentage"
-                placeholder="请输入报废百分比"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="替代组" prop="alternativeGroup">
-              <el-input
-                v-model="form.alternativeGroup"
-                placeholder="请输入替代组"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="替代优先级" prop="alternativePriorities">
-              <el-input
-                v-model="form.alternativePriorities"
-                placeholder="请输入替代优先级"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="策略" prop="alternativeStrategy">
-              <el-input
-                v-model="form.alternativeStrategy"
-                placeholder="请输入策略"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="使用概率" prop="alternativeProbability">
-              <el-input
-                v-model="form.alternativeProbability"
-                placeholder="请输入使用概率"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="BOM行备注" prop="bomItemRemark">
+            <el-form-item label="工作站" prop="workstationId">
               <el-input
-                v-model="form.bomItemRemark"
-                placeholder="请输入BOM行备注"
-              ></el-input>
+                v-model="form.workstationName"
+                disabled
+                placeholder="请选择工作站信息"
+              >
+                <el-button
+                  slot="append"
+                  icon="el-icon-search"
+                  @click="handleWorkstationSelect"
+                ></el-button>
+              </el-input>
+              <WorkstationSelect
+                ref="WorkstationSelect"
+                :processId="form.processId"
+                @onSelected="onWorkstationSelected"
+              ></WorkstationSelect>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="物料备注" prop="itemRemark">
+            <el-form-item label="标准工时" prop="quantity">
               <el-input
-                v-model="form.itemRemark"
-                placeholder="请输入物料备注"
+                type="number"
+                v-model="form.quantity"
+                placeholder="请输入标准工时"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -139,9 +101,10 @@
 <script>
 import ItemBomSelect from "@/components/itemBomSelect/single.vue";
 import ProcessProd from "./ProcessProd.vue";
+import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue";
 export default {
-  components: { ItemBomSelect, ProcessProd },
-  inject: ['mode'],
+  components: { ItemBomSelect, ProcessProd, WorkstationSelect },
+  inject: ["mode"],
   props: {
     bomList: {
       type: Array,
@@ -158,15 +121,9 @@ export default {
       rules: {},
       /**表单初始化数据 */
       form: {
-        quantity: "",
-        unitOfMeasure: "",
-        scrapPercentage: "",
-        alternativeGroup: "",
-        alternativePriorities: "",
-        alternativeStrategy: "",
-        alternativeProbability: "",
-        bomItemRemark: "",
-        itemRemark: "",
+        stdWorkingTime: "",
+        workstationId: "",
+        workstationName: "",
       },
       currentRow: {},
       currentRowIndex: undefined,
@@ -174,9 +131,9 @@ export default {
   },
   methods: {
     setList(rows) {
-      this.tableData = rows.map(item => {
-        item.processItemList = []
-        return item
+      this.tableData = rows.map((item) => {
+        item.processItemList = [];
+        return item;
       });
     },
     /** 更新工序的物料信息 */
@@ -199,6 +156,8 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           this.showFlag = false;
+          Object.assign(this.currentRow, this.form);
+          this.tableData.splice(this.currentRowIndex, 1, this.currentRow);
         }
       });
     },
@@ -208,23 +167,28 @@ export default {
     /**重置表单 */
     resetForm() {
       this.form = {
-        quantity: "",
-        unitOfMeasure: "",
-        scrapPercentage: "",
-        alternativeGroup: "",
-        alternativePriorities: "",
-        alternativeStrategy: "",
-        alternativeProbability: "",
-        bomItemRemark: "",
-        itemRemark: "",
+        stdWorkingTime: "",
+        workstationId: "",
+        workstationName: "",
       };
     },
     /**重置组件状态 */
     resetState() {
-      this.resetForm()
-      this.tableData = []
+      this.resetForm();
+      this.tableData = [];
+    },
+    // 查询工作站信息
+    handleWorkstationSelect() {
+      this.$refs.WorkstationSelect.showFlag = true;
+    },
+    onWorkstationSelected(row) {
+      if (row != undefined && row != null) {
+        this.form.workstationId = row.workstationId;
+        this.form.workstationName = row.workstationName;
+        this.form.stdWorkingTime = row.stdWorkingTime;
       }
     },
+  },
 };
 </script>
 

src/views/mes/proofing/proofingInfo.vue

@@ -259,7 +259,7 @@ export default {
             this.bomList = data.bomList;
             // 设置组件数据
             this.$refs["ProogingBomRef"].tableData = data.bomList;
-            this.$refs["ProogingProcess"].tableData = data.processList;
+            this.$refs["ProogingProcessRef"].tableData = data.processList;
           })
           .finally(() => {
             this.loading = false;