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

src/api/mes/md/clientItem.js

+import request from '@/utils/request'
+
+// 查询客户产品对照列表
+export function listItem(query) {
+  return request({
+    url: '/md/clientItem/list',
+    method: 'post',
+    data: query
+  })
+}
+
+// 查询客户产品对照详细
+export function getItem(id) {
+  return request({
+    url: '/md/clientItem/' + id,
+    method: 'get'
+  })
+}
+
+// 新增客户产品对照
+export function addItem(data) {
+  return request({
+    url: '/md/clientItem',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改客户产品对照
+export function updateItem(data) {
+  return request({
+    url: '/md/clientItem',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除客户产品对照
+export function delItem(id) {
+  return request({
+    url: '/md/clientItem/' + id,
+    method: 'delete'
+  })
+}

src/components/SapPropertyData/index.vue

@@ -97,8 +97,12 @@ export default {
     },
 
     getViewTypeName(viewType) {
-      let viewTypeDict = this.dict.type.sap_property_view.find(item => item.value == this.form.type && item.raw.cssClass === viewType)
-      return viewTypeDict.label
+      for (let item of this.dict.type.sap_property_view) {
+        if (item.value == this.form.type && item.raw.cssClass === viewType) {
+          return item.label
+        }
+      }
+      return viewType
     },
 
     setData(data, sapData, sapPropertyMap) {

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

+<template>
+  <div class="app-container">
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          :disabled="!queryParams.clientId"
+          v-hasPermi="['md:clientItem: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:clientItem: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:clientItem:remove']"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="itemList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" />
+      <el-table-column label="产品" prop="itemName" />
+      <el-table-column label="客户产品名称" prop="clientItemName" />
+      <el-table-column label="客户产品编码" prop="clientItemCode" />
+      <el-table-column label="操作" 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:clientItem:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['md:clientItem: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="120px">
+        <el-form-item label="产品名称" prop="itemId">
+          <el-input v-model="form.itemName" readonly placeholder="请选择产品">
+            <el-button slot="append" icon="el-icon-search" @click="$refs['ItemSelectRef'].showFlag = true"></el-button>
+          </el-input>
+          <ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect"/>
+        </el-form-item>
+        <el-form-item label="客户产品称" prop="clientItemName">
+          <el-input v-model="form.clientItemName" placeholder="请输入客户产品名称" />
+        </el-form-item>
+        <el-form-item label="客户产品编码" prop="clientItemCode">
+          <el-input v-model="form.clientItemCode" 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 { addItem, delItem, getItem, listItem, updateItem } from '@/api/mes/md/clientItem'
+import { listClient } from '@/api/mes/md/client'
+import ItemSelect from '@/components/itemSelect/single.vue'
+
+export default {
+  components: {
+    ItemSelect
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 客户产品对照表格数据
+      itemList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        clientId: null, itemId: null, clientItemName: null, clientItemCode: null,},
+      // 表单参数
+      form: {},
+      clientList: [],
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  methods: {
+    /** 查询客户产品对照列表 */
+    getList() {
+      this.loading = true;
+      listItem(this.queryParams).then(response => {
+        this.itemList = response.data.records;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        clientId: null,
+        itemId: null,
+        clientItemName: null,
+        clientItemCode: 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
+    },
+
+    onItemSelect(row) {
+      console.log(row)
+      if (row != undefined) {
+        this.form.itemId = row.itemId;
+        this.form.itemName = row.itemName;
+        this.$forceUpdate()
+      }
+    },
+
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.form.clientId = this.queryParams.clientId || 0
+      if (!this.form.clientId) return
+      this.open = true;
+      this.title = "添加客户产品对照";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getItem(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) {
+            updateItem(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addItem(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 delItem(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+
+    init(form) {
+      this.queryParams.clientId = form.clientId || 0
+      console.log(form)
+      this.getList();
+    },
+  }
+};
+</script>

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

@@ -245,6 +245,9 @@
           <el-tab-pane label="客户联系人" name="ClientContact">
             <ClientContact ref="ClientContact" :clientId="form.clientId"/>
           </el-tab-pane>
+          <el-tab-pane label="产品对照" name="ClientItem">
+            <ClientItem ref="ClientItem"/>
+          </el-tab-pane>
           <el-tab-pane label="催货款通知邮箱" name="UrgeEmail">
             <UrgeEmail ref="UrgeEmail" :clientId="form.clientId"/>
           </el-tab-pane>
@@ -272,6 +275,7 @@ import BaseInfo from '@/views/mes/md/client/components/BaseInfo'
 import UrgeEmail from '@/views/mes/md/client/components/UrgeEmail'
 import AddrInfo from '@/views/mes/md/client/components/AddrInfo'
 import ClientContact from '@/views/mes/md/client/components/ClientContact'
+import ClientItem from '@/views/mes/md/client/components/ClientItem'
 import DeliveryInfo from '@/views/mes/md/client/components/DeliveryInfo'
 import FinanceInfo from '@/views/mes/md/client/components/FinanceInfo'
 import PaymentRelation from '@/views/mes/md/client/components/PaymentRelation'
@@ -281,7 +285,7 @@ export default {
   name: "Client",
   dicts: ['mes_client_type','sys_yes_no'],
   components: {
-    AddrInfo, BaseInfo, DeliveryInfo, FinanceInfo, UrgeEmail, PaymentRelation, ClientContact
+    AddrInfo, BaseInfo, DeliveryInfo, FinanceInfo, UrgeEmail, PaymentRelation, ClientContact, ClientItem
   },
   data() {
     return {
@@ -539,8 +543,12 @@ export default {
       }
     },
     onTabClick() {
-      if (this.activeName === 'SapProperty') this.$refs.SapProperty.init(1, this.form.clientId, this.form)
-      else this.$refs[this.activeName].init && this.$refs[this.activeName].init(this.form)
+      if (this.activeName === 'SapProperty') {
+        this.$refs.SapProperty.init(1, null, this.form.clientId, this.form)
+      }
+      else {
+        this.$refs[this.activeName].init && this.$refs[this.activeName].init(this.form)
+      }
     }
   }
 };

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

@@ -77,27 +77,9 @@
       <el-table-column label="来源文件" prop="source" />
       <el-table-column label="操作" class-name="small-padding fixed-width" width="200">
         <template slot-scope="{row}">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-search"
-            @click="onShowDetail(row)"
-            v-hasPermi="['md:order:query']"
-          >查看</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="toSalesEdit(row)"
-            v-hasPermi="['md:order:edit']"
-          >生成订单</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(row)"
-            v-hasPermi="['md:order:remove']"
-          >删除</el-button>
+          <el-button v-hasPermi="['md:order:query']" size="mini" type="text" icon="el-icon-search" @click="onShowDetail(row)">查看</el-button>
+          <el-button v-hasPermi="['md:order:edit']" size="mini" type="text" icon="el-icon-edit" @click="toSalesEdit(row)">生成订单</el-button>
+          <el-button v-hasPermi="['md:order:remove']" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -109,11 +91,75 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+
+    <el-dialog :visible.sync="showDetail" title="采订单详情" width="1200px">
+      <el-table :data="detailList" max-height="600" size="mini">
+        <el-table-column label="客户单号" prop="poOrderNo" show-overflow-tooltip/>
+        <el-table-column label="客户产品代码" prop="poProductName" show-overflow-tooltip/>
+        <el-table-column label="客户产品名称" prop="poProductNo" show-overflow-tooltip/>
+        <el-table-column label="宝绅内部品名" prop="productName" show-overflow-tooltip/>
+        <el-table-column label="客户单位" prop="customerUnit" show-overflow-tooltip/>
+        <el-table-column label="指令号" prop="cmdNo" show-overflow-tooltip/>
+        <el-table-column label="型体号" prop="featureNo" show-overflow-tooltip/>
+        <el-table-column label="配色号" prop="poColorNo" show-overflow-tooltip/>
+        <el-table-column label="客户颜色" prop="poColor" show-overflow-tooltip/>
+        <el-table-column label="客户单重" prop="poKg" show-overflow-tooltip/>
+        <el-table-column label="销线" prop="salePath" show-overflow-tooltip/>
+        <el-table-column label="段别" prop="segment" show-overflow-tooltip/>
+        <el-table-column label="版面" prop="layout" show-overflow-tooltip/>
+        <el-table-column label="季度" prop="quarter" show-overflow-tooltip/>
+        <el-table-column label="整/半码" prop="wholeYard" show-overflow-tooltip/>
+        <el-table-column label="特殊SIZE" prop="specialSize" show-overflow-tooltip/>
+        <el-table-column label="PO号" prop="poNo" show-overflow-tooltip/>
+        <el-table-column label="WIP号" prop="wipNo" show-overflow-tooltip/>
+        <el-table-column label="装箱数" prop="packingNum" show-overflow-tooltip/>
+        <el-table-column label="产地" prop="region" show-overflow-tooltip/>
+        <el-table-column label="周期" prop="cycle" show-overflow-tooltip/>
+        <el-table-column label="SK编号" prop="skNo" show-overflow-tooltip/>
+        <el-table-column label="专利号" prop="patentNo" show-overflow-tooltip/>
+        <el-table-column label="材质描述" prop="materialDesc" show-overflow-tooltip/>
+        <el-table-column label="签收人" prop="" show-overflow-tooltip/>
+        <el-table-column label="shipToId" prop="shipToId" show-overflow-tooltip/>
+        <el-table-column label="交货日期" prop="deliveryDate" show-overflow-tooltip/>
+        <el-table-column label="备注" prop="remark" show-overflow-tooltip/>
+        <el-table-column label="尺码组" prop="sizeGroup" show-overflow-tooltip/>
+        <el-table-column label="尺码" prop="size" show-overflow-tooltip/>
+        <el-table-column label="订单量" prop="orderNum" show-overflow-tooltip/>
+        <el-table-column label="条码" prop="barCode" show-overflow-tooltip/>
+        <el-table-column label="印刷方向" prop="printingDirection" show-overflow-tooltip/>
+        <el-table-column label="产品规格" prop="productSize" show-overflow-tooltip/>
+        <el-table-column label="操作">
+          <template slot-scope="{row}">
+            <el-button type="text" @click="onShowSpec(row)">特性值</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer">
+        <el-button @click="showDetail = false">取消</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :visible="showSpec" title="采购详情产品特性值" width="650px">
+      <el-form label-width="100px">
+        <el-row :gutter="10">
+          <el-col :span="12" v-for="spec in specList" :key="spec.specKey">
+            <el-form-item :label="spec.specKey">
+              <el-input v-model="spec.specVal" readonly/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div slot="footer">
+        <el-button @click="showSpec = false">取消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { delOrder, listOrder } from '@/api/mes/od/purchaseOrder'
+import { listDetail } from '@/api/mes/od/purchaseOrderDetail'
 import { listClient } from '@/api/mes/md/client'
 
 export default {
@@ -136,8 +182,11 @@ export default {
       // 客户采购订单表格数据
       orderList: [],
       clientList: [],
+      detailList: [],
+      specList: [],
       // 是否显示弹出层
-      open: false,
+      showDetail: false,
+      showSpec: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -185,7 +234,12 @@ export default {
     },
     onShowDetail(row) {
       let id = row ? row.id : this.ids[0]
-      this.$router.push('/order/purchaseEdit?id=' + id)
+      this.showDetail = true
+      listDetail({orderId: id}).then(res => this.detailList = res.rows)
+    },
+    onShowSpec(row) {
+      this.showSpec = true
+      this.specList = JSON.parse(row.specJson)
     },
     /** 删除按钮操作 */
     handleDelete(row) {

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

@@ -112,10 +112,10 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-search"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['od:salesOrder:edit']"
-          >修改
+          >查看
           </el-button>
           <el-button
             size="mini"

src/views/mes/qt/factoryQuote/index.vue

@@ -160,7 +160,7 @@
           <ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect"/>
         </el-form-item>
         <el-form-item v-if="form.state === '2'" label="价格" prop="price">
-          <el-input v-model.number="form.price" placeholder="请输入价格"/>
+          <el-input v-model.trim="form.price" type="number" placeholder="请输入价格"/>
         </el-form-item>
         <el-form-item label="有效期起" prop="validFrom" :disabled="form.state === '2'">
           <el-date-picker