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

src/api/mes/dv/brandquotation.js

+import request from '@/utils/request'
+
+// 查询品牌报价列表
+export function listBrandQuotation(query) {
+  return request({
+    url: '/dv/brandQuotation/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询品牌报价详细
+export function getBrandQuotation(brandQuantityId) {
+  return request({
+    url: '/dv/brandQuotation/' + brandQuantityId,
+    method: 'get'
+  })
+}
+
+// 新增品牌报价
+export function addBrandQuotation(data) {
+  return request({
+    url: '/dv/brandQuotation',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改品牌报价
+export function updateBrandQuotation(data) {
+  return request({
+    url: '/dv/brandQuotation',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除品牌报价
+export function delBrandQuotation(brandQuantityId) {
+  return request({
+    url: '/dv/brandQuotation/' + brandQuantityId,
+    method: 'delete'
+  })
+}

src/api/mes/md/sapdata.js

+import request from '@/utils/request'
+
+// 查询客户SAP特性信息列表
+export function listSapdata(query) {
+  return request({
+    url: '/md/sapPropertyData/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询客户SAP特性信息详细
+export function getSapdata(id) {
+  return request({
+    url: '/md/sapPropertyData/' + id,
+    method: 'get'
+  })
+}
+
+// 新增客户SAP特性信息
+export function addSapdata(data) {
+  return request({
+    url: '/md/sapPropertyData',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改客户SAP特性信息
+export function updateSapdata(data) {
+  return request({
+    url: '/md/sapPropertyData',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除客户SAP特性信息
+export function delSapdata(id) {
+  return request({
+    url: '/md/sapPropertyData/' + id,
+    method: 'delete'
+  })
+}
+
+//上传给sap
+export function uploadSapdata(id) {
+  return request({
+    url: '/md/sapPropertyData/uploadSapdata/' +id,
+    method: 'get'
+  })
+}

src/components/SapPropertyData/index.vue

@@ -118,13 +118,13 @@ export default {
       console.log(sapPropertyMap)
     },
 
-    init(type, relationId, data = {}) {
+    init(type, viewType, relationId, data = {}) {
       this.$refs.form && this.$refs.form.resetFields()
       this.form.type = type
       this.form.relationId = relationId
       let sapData = {}
       // 获取sap特性列表
-      listByType({type}).then(res => {
+      listByType({type, viewType}).then(res => {
         let sapProperties = res.data || []
         let sapPropertyMap = sapProperties.reduce((sapPropertyMap, item) => {
           if (!sapPropertyMap[item.viewType]) sapPropertyMap[item.viewType] = []
@@ -133,7 +133,7 @@ export default {
         }, {})
         if (relationId) {
           // 获取sap特性值
-          listData({type, relationId}).then(resp => {
+          listData({type, viewType, relationId}).then(resp => {
             let row = resp.rows[0] || {sapData: '{}'}
             this.form.id = row.id
             sapData = JSON.parse(row.sapData)

src/layout/components/Sidebar/SidebarItem.vue

 <template>
   <div v-if="!item.hidden">
-    <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
-      <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path, onlyOneChild.query)">
-        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
-          <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />
+    <template
+      v-if="
+        hasOneShowingChild(item.children, item) &&
+        (!onlyOneChild.children || onlyOneChild.noShowingChildren) &&
+        !item.alwaysShow
+      "
+    >
+      <app-link
+        v-if="onlyOneChild.meta"
+        :to="resolvePath(onlyOneChild.path, onlyOneChild.query)"
+      >
+        <el-menu-item
+          :index="resolvePath(onlyOneChild.path)"
+          :class="{ 'submenu-title-noDropdown': !isNest }"
+        >
+          <item
+            :icon="onlyOneChild.meta.icon || (item.meta && item.meta.icon)"
+            :title="onlyOneChild.meta.title"
+          />
         </el-menu-item>
       </app-link>
     </template>
 
-    <el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
+    <el-submenu
+      v-else
+      ref="subMenu"
+      :index="resolvePath(item.path)"
+      popper-append-to-body
+    >
       <template slot="title">
-        <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
+        <item
+          v-if="item.meta"
+          :icon="item.meta && item.meta.icon"
+          :title="item.meta.title"
+        />
       </template>
       <sidebar-item
         v-for="child in item.children"
@@ -25,76 +49,84 @@
 </template>
 
 <script>
-import path from 'path'
-import { isExternal } from '@/utils/validate'
-import Item from './Item'
-import AppLink from './Link'
-import FixiOSBug from './FixiOSBug'
+import path from "path";
+import { isExternal } from "@/utils/validate";
+import Item from "./Item";
+import AppLink from "./Link";
+import FixiOSBug from "./FixiOSBug";
+import { mapGetters } from "vuex";
 
 export default {
-  name: 'SidebarItem',
+  name: "SidebarItem",
   components: { Item, AppLink },
   mixins: [FixiOSBug],
   props: {
     // route object
     item: {
       type: Object,
-      required: true
+      required: true,
     },
     isNest: {
       type: Boolean,
-      default: false
+      default: false,
     },
     basePath: {
       type: String,
-      default: ''
-    }
+      default: "",
+    },
+  },
+  computed: {
+    ...mapGetters(["userId", 'sidebar']),
   },
   data() {
-    this.onlyOneChild = null
-    return {}
+    this.onlyOneChild = null;
+    return {};
   },
   methods: {
     hasOneShowingChild(children = [], parent) {
       if (!children) {
         children = [];
       }
-      const showingChildren = children.filter(item => {
+      const showingChildren = children.filter((item) => {
         if (item.hidden) {
-          return false
+          return false;
         } else {
           // Temp set(will be used if only has one showing child)
-          this.onlyOneChild = item
-          return true
+          this.onlyOneChild = item;
+          return true;
         }
-      })
+      });
 
       // When there is only one child router, the child router is displayed by default
       if (showingChildren.length === 1) {
-        return true
+        return true;
       }
 
       // Show parent if there are no child router to display
       if (showingChildren.length === 0) {
-        this.onlyOneChild = { ... parent, path: '', noShowingChildren: true }
-        return true
+        this.onlyOneChild = { ...parent, path: "", noShowingChildren: true };
+        return true;
       }
 
-      return false
+      return false;
     },
     resolvePath(routePath, routeQuery) {
       if (isExternal(routePath)) {
-        return routePath
+        return routePath;
       }
       if (isExternal(this.basePath)) {
-        return this.basePath
+        if (routeQuery?.endsWith("#{userid}")) {
+          return this.basePath + "?userId=" + this.userId;
+        }
+        return this.basePath;
       }
       if (routeQuery) {
         let query = JSON.parse(routeQuery);
-        return { path: path.resolve(this.basePath, routePath), query: query }
-      }
-      return path.resolve(this.basePath, routePath)
-    }
+
+        return { path: path.resolve(this.basePath, routePath), query: query };
       }
-}
+      return path.resolve(this.basePath, routePath);
+    },
+  },
+};
 </script>

src/store/getters.js

 const getters = {
-  sidebar: state => state.app.sidebar,
-  size: state => state.app.size,
-  device: state => state.app.device,
-  visitedViews: state => state.tagsView.visitedViews,
-  cachedViews: state => state.tagsView.cachedViews,
-  token: state => state.user.token,
-  avatar: state => state.user.avatar,
-  name: state => state.user.name,
-  introduction: state => state.user.introduction,
-  roles: state => state.user.roles,
-  permissions: state => state.user.permissions,
-  permission_routes: state => state.permission.routes,
-  topbarRouters:state => state.permission.topbarRouters,
-  defaultRoutes:state => state.permission.defaultRoutes,
-  sidebarRouters:state => state.permission.sidebarRouters,
-}
-export default getters
+  sidebar: (state) => state.app.sidebar,
+  size: (state) => state.app.size,
+  device: (state) => state.app.device,
+  visitedViews: (state) => state.tagsView.visitedViews,
+  cachedViews: (state) => state.tagsView.cachedViews,
+  token: (state) => state.user.token,
+  avatar: (state) => state.user.avatar,
+  userId: (state) => state.user.userId,
+  name: (state) => state.user.name,
+  introduction: (state) => state.user.introduction,
+  roles: (state) => state.user.roles,
+  permissions: (state) => state.user.permissions,
+  permission_routes: (state) => state.permission.routes,
+  topbarRouters: (state) => state.permission.topbarRouters,
+  defaultRoutes: (state) => state.permission.defaultRoutes,
+  sidebarRouters: (state) => state.permission.sidebarRouters,
+};
+export default getters;

src/store/modules/user.js

@@ -7,6 +7,7 @@ const user = {
     name: '',
     avatar: '',
     roles: [],
+    userId: '',
     permissions: []
   },
 
@@ -14,6 +15,9 @@ const user = {
     SET_TOKEN: (state, token) => {
       state.token = token
     },
+    SET_USERID: (state, userId) => {
+      state.userId = userId
+    },
     SET_NAME: (state, name) => {
       state.name = name
     },
@@ -60,6 +64,7 @@ const user = {
           }
           commit('SET_NAME', user.userName)
           commit('SET_AVATAR', avatar)
+          commit('SET_USERID', user.userId)
           resolve(res)
         }).catch(error => {
           reject(error)

src/views/mes/dv/brandquotation/components/ProcessProd.vue

+<template>
+  <div class="process-prod">
+    <!-- 设置物料弹窗 -->
+    <el-dialog
+      :visible.sync="showProcessProd"
+      width="800px"
+      :before-close="beforeClose"
+      append-to-body
+      title="设置物料"
+    >
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+            >新增</el-button
+          >
+        </el-col>
+      </el-row>
+      <el-table :data="tableData">
+        <el-table-column label="物料名称" prop="itemName" align="center" />
+        <el-table-column label="单位" prop="unitOfMeasure" align="center" />
+        <el-table-column label="数量" prop="quantity" align="center" />
+        <el-table-column label="备注" prop="remark" align="center" />
+        <el-table-column label="操作" align="center" width="150">
+          <template slot-scope="{ row, $index }">
+            <el-button
+              type="text"
+              icon="el-icon-edit"
+              size="small"
+              @click="updateRow(row, $index)"
+              >修改</el-button
+            >
+            <el-button
+              type="text"
+              icon="el-icon-delete"
+              size="small"
+              @click="deleteRow($index)"
+              >删除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div slot="footer">
+        <el-button type="primary" size="small" @click="cancleConnect"
+          >关闭</el-button
+        >
+      </div>
+    </el-dialog>
+
+    <!-- 选择Bom物料 -->
+    <el-dialog
+      :visible.sync="showFlag"
+      title="选择Bom物料"
+      width="800px"
+      append-to-body
+    >
+      <el-table
+        :data="bomList"
+        @current-change="handleRowChange"
+        @row-dblclick="handleRowDbClick"
+      >
+        <el-table-column width="50" align="center">
+          <template v-slot="scope">
+            <el-radio
+              v-model="selectedItemId"
+              :label="scope.row.itemId"
+              @change="handleRowChange(scope.row)"
+              >{{ "" }}</el-radio
+            >
+          </template>
+        </el-table-column>
+        <el-table-column label="物料名称" prop="itemName" />
+        <el-table-column label="单位" prop="unitOfMeasure" />
+        <el-table-column label="用料比例" prop="quantity" />
+      </el-table>
+      <div slot="footer">
+        <el-button @click="configmSelect">确认</el-button>
+        <el-button @click="showFlag = false">取消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 编辑物料关联信息 -->
+    <el-dialog
+      :visible.sync="editConnectVisible"
+      width="400px"
+      title="编辑物料关联信息"
+    >
+      <el-form :model="form" inline size="small" label-width="80px">
+        <el-form-item label="物料名称">
+          <el-input disabled v-model="form.itemName"></el-input>
+        </el-form-item>
+        <el-form-item label="单位">
+          <el-input disabled v-model="form.unitOfMeasure"></el-input>
+        </el-form-item>
+        <el-form-item label="数量">
+          <el-input type="number" v-model="form.quantity"></el-input>
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input v-model="form.remark" type="textarea" :rows="3"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer">
+        <el-button type="primary" size="small" @click="submitEditConnect"
+          >确认</el-button
+        >
+        <el-button size="small" @click="editConnectVisible = false"
+          >取消</el-button
+        >
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    bomList: {
+      type: Array,
+      default: () => [],
+    },
+    process: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  data() {
+    return {
+      form: {
+        itemName: "",
+        unitOfMeasure: "",
+        quantity: "",
+        remark: "",
+      },
+      currentRowIdx: undefined,
+      tableData: [],
+      selectedItemId: undefined,
+      selectedRows: null,
+      showFlag: false,
+      showProcessProd: false,
+      editConnectVisible: false,
+    };
+  },
+  computed: {
+    title() {
+      return "设置" + this.process.itemName + "物料";
+    },
+  },
+  watch: {
+    process: {
+      handler(val) {
+        this.tableData = val.processItemList;
+      },
+      deep: true,
+    },
+  },
+  methods: {
+    handleRowChange(row) {
+      if (row) {
+        this.selectedRows = row;
+      }
+    },
+    handleRowDbClick(row) {
+      if (row) {
+        this.selectedRows = row;
+        this.tableData.unshift(this.selectedRows);
+        this.showFlag = false;
+      }
+    },
+    /**新增按钮 */
+    handleAdd() {
+      this.showFlag = true;
+    },
+    /**确认选择关联的Bom */
+    configmSelect() {
+      if (this.selectedItemId == null || this.selectedItemId == 0) {
+        return;
+      }
+      this.tableData.unshift({
+        ...this.selectedRows,
+        processId: this.process.processId,
+      });
+      this.showFlag = false;
+    },
+    /**编辑 */
+    updateRow(row, idx) {
+      this.resetForm();
+      Object.assign(this.form, row);
+      this.currentRowIdx = idx;
+      this.editConnectVisible = true;
+    },
+    deleteRow(index) {
+      this.tableData.splice(index, 1);
+    },
+    cancleConnect() {
+      this.$emit("updateItem", this.tableData);
+      this.showProcessProd = false;
+    },
+    beforeClose(done) {
+      // 更新父组件的processItemList
+      this.$emit("updateItem", this.tableData);
+      done();
+    },
+    /**重置表单 */
+    resetForm() {
+      this.form = {
+        itemName: "",
+        unitOfMeasure: "",
+        quantity: "",
+        remark: "",
+      };
+    },
+    /** 提交编辑关联信息 */
+    submitEditConnect() {
+      this.tableData.splice(this.currentRowIdx, 1, {
+        ...this.form,
+      });
+      this.editConnectVisible = false;
+    },
+  },
+};
+</script>
+
+<style>
+.process-prod {
+  padding: 0 20px;
+}
+</style>

src/views/mes/dv/brandquotation/components/ProogingBom.vue

+<template>
+  <div>
+    <el-row :gutter="10" class="mb8" v-if="mode != 'info'">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          @click="handleDelete"
+          >删除</el-button
+        >
+      </el-col>
+    </el-row>
+
+    <el-table :data="tableData" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="物料名称"
+        align="center"
+        prop="itemName"
+        width="120"
+      />
+      <el-table-column
+        label="组件数量"
+        align="center"
+        prop="quantity"
+        width="120"
+      />
+      <el-table-column
+        label="计量单位"
+        align="center"
+        prop="unitOfMeasure"
+        width="120"
+      />
+      <el-table-column
+        label="报废百分比"
+        align="center"
+        prop="scrapPercentage"
+        width="120"
+      />
+      <el-table-column
+        label="替代组"
+        align="center"
+        prop="alternativeGroup"
+        width="120"
+      />
+      <el-table-column
+        label="替代优先级"
+        align="center"
+        prop="alternativePriorities"
+        width="120"
+      />
+      <el-table-column
+        label="策略"
+        align="center"
+        prop="alternativeStrategy"
+        width="120"
+      />
+      <el-table-column
+        label="使用概率"
+        align="center"
+        prop="alternativeProbability"
+        width="120"
+      />
+      <el-table-column
+        label="BOM行备注"
+        align="center"
+        prop="bomItemRemark"
+        min-width="120"
+      />
+      <el-table-column
+        label="物料备注"
+        align="center"
+        prop="itemRemark"
+        min-width="120"
+      />
+      <el-table-column
+        v-if="mode != 'info'"
+        label="操作"
+        align="center"
+        width="120"
+      >
+        <template slot-scope="{ row, $index }">
+          <el-button
+            type="text"
+            icon="el-icon-edit"
+            size="small"
+            @click="updateRow(row, $index)"
+            >修改</el-button
+          >
+          <el-button
+            type="text"
+            icon="el-icon-delete"
+            size="small"
+            @click="deleteRow($index)"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-dialog :visible.sync="showFlag" width="700px" title="添加BOM">
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        inline
+        label-width="100px"
+        size="small"
+      >
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="物料" prop="itemId">
+              <el-input
+                v-model="form.itemName"
+                readonly
+                placeholder="请选择物料"
+              >
+                <el-button
+                  slot="append"
+                  icon="el-icon-search"
+                  @click="$refs['ItemSelectRef'].showFlag = true"
+                ></el-button>
+              </el-input>
+              <ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <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-input
+                v-model="form.bomItemRemark"
+                placeholder="请输入BOM行备注"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="物料备注" prop="itemRemark">
+              <el-input
+                v-model="form.itemRemark"
+                placeholder="请输入物料备注"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer">
+        <el-button type="primary" @click="submitForm">确定</el-button>
+        <el-button type="default" @click="showFlag = false">取消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import ItemBomSelect from "@/components/itemBomSelect/single.vue";
+import ItemSelect from "@/components/itemSelect/single.vue";
+export default {
+  components: { ItemBomSelect, ItemSelect },
+  inject: ["mode"],
+  data() {
+    return {
+      /**弹窗状态 */
+      showFlag: false,
+      /**表格数据 */
+      tableData: [],
+      /**表单规则 */
+      rules: {},
+      /**多选 */
+      selection: [],
+      optType: "add",
+      /**表单初始化数据 */
+      form: {
+        quantity: "",
+        itemName: "",
+        itemId: "",
+        unitOfMeasure: "",
+        scrapPercentage: "",
+        alternativeGroup: "",
+        alternativePriorities: "",
+        alternativeStrategy: "",
+        alternativeProbability: "",
+        bomItemRemark: "",
+        itemRemark: "",
+      },
+      currentRowIdx: undefined,
+    };
+  },
+  created() {},
+  methods: {
+    /**多选 */
+    handleSelectionChange(val) {
+      this.selection = val;
+    },
+    /**删除操作 */
+    handleDelete() {},
+    /**添加操作 */
+    handleAdd() {
+      this.resetForm();
+      this.showFlag = true;
+      this.optType = "add";
+    },
+    /**更新行 */
+    updateRow(row, idx) {
+      Object.assign(this.form, row);
+      this.currentRowIdx = idx;
+      this.optType = "edit";
+      this.showFlag = true;
+    },
+    /**删除行 */
+    deleteRow(index) {
+      this.tableData.splice(index, 1);
+    },
+    onItemBomSelect(row) {
+      // if (row != undefined && row != null) {
+      //   this.tableData.unshift({...row})
+      // }
+    },
+    onItemSelect(row) {
+      if (row != undefined && row != null) {
+        this.form.itemId = row.itemId;
+        this.form.itemName = row.itemName;
+        this.form.unitOfMeasure = row.unitOfMeasure;
+        this.form.itemRemark = row.remark;
+      }
+    },
+    /**表单提交 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.optType == "add") {
+            this.tableData.unshift({ ...this.form });
+          } else {
+            this.tableData.splice(this.currentRowIdx, 1, this.form);
+          }
+          this.showFlag = false;
+        }
+      });
+    },
+    /**重置表单 */
+    resetForm() {
+      this.form = {
+        itemName: "",
+        itemId: "",
+        quantity: "",
+        unitOfMeasure: "",
+        scrapPercentage: "",
+        alternativeGroup: "",
+        alternativePriorities: "",
+        alternativeStrategy: "",
+        alternativeProbability: "",
+        bomItemRemark: "",
+        itemRemark: "",
+      };
+    },
+    /**重置组件状态 */
+    resetState() {
+      this.resetForm();
+      this.tableData = [];
+    },
+    /**获取组件数据 */
+    getComData() {
+      return this.tableData;
+    },
+  },
+};
+</script>
+
+<style></style>

src/views/mes/dv/brandquotation/components/ProogingProcess.vue

+<template>
+  <div>
+    <el-table :data="tableData">
+      <el-table-column label="工序名称" prop="processName" align="center" />
+      <el-table-column label="工序编码" prop="processCode" align="center" />
+      <el-table-column
+        label="与下一道工序关系"
+        prop="linkType"
+        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"
+      >
+        <template slot-scope="{ row, $index }">
+          <el-button
+            type="text"
+            icon="el-icon-edit"
+            size="small"
+            @click="openSetProd(row, $index)"
+          >
+            设置物料
+          </el-button>
+          <el-button
+            type="text"
+            icon="el-icon-edit"
+            size="small"
+            @click="updateRow(row, $index)"
+            >修改</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <ProcessProd
+      :process="currentRow"
+      :bomList="bomList"
+      ref="ProcessProdRef"
+      @updateItem="updateItem"
+    />
+
+    <el-dialog
+      v-dialogDrag
+      :visible.sync="showFlag"
+      width="800px"
+      title="工序修改"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        inline
+        label-width="100px"
+        size="small"
+      >
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="工作站" prop="workstationId">
+              <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="stdWorkingTime">
+              <el-input
+                type="number"
+                v-model="form.stdWorkingTime"
+                placeholder="请输入标准工时"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer">
+        <el-button type="primary" @click="submitForm">确定</el-button>
+        <el-button type="default" @click="showFlag = false">取消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<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, WorkstationSelect },
+  inject: ["mode"],
+  props: {
+    bomList: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  data() {
+    return {
+      /**弹窗状态 */
+      showFlag: false,
+      /**表格数据 */
+      tableData: [],
+      /**表单规则 */
+      rules: {},
+      /**表单初始化数据 */
+      form: {
+        stdWorkingTime: "",
+        workstationId: "",
+        workstationName: "",
+      },
+      currentRow: {},
+      currentRowIndex: undefined,
+    };
+  },
+  methods: {
+    setList(rows) {
+      this.tableData = rows.map((item) => {
+        item.processItemList = [];
+        return item;
+      });
+    },
+    /** 更新工序的物料信息 */
+    updateItem(items) {
+      this.tableData[this.currentRowIndex].processItemList = items;
+    },
+    openSetProd(row, idx) {
+      this.currentRow = row;
+      this.currentRowIndex = idx;
+      this.$refs["ProcessProdRef"].showProcessProd = true;
+    },
+    /**更新行 */
+    updateRow(row, idx) {
+      Object.assign(this.form, row);
+      this.currentRowIndex = idx;
+      this.showFlag = true;
+    },
+    /**表单提交 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          this.showFlag = false;
+          this.tableData.splice(this.currentRowIndex, 1, {
+            ...this.currentRow,
+            ...this.form,
+          });
+        }
+      });
+    },
+    getComData() {
+      return this.tableData;
+    },
+    /**重置表单 */
+    resetForm() {
+      this.form = {
+        stdWorkingTime: "",
+        workstationId: "",
+        workstationName: "",
+      };
+    },
+    /**重置组件状态 */
+    resetState() {
+      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>
+
+<style></style>

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

@@ -56,7 +56,8 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="送货单打印默认设置" prop="billPrintSetting" :label-width="labelWidth">
-            <el-input v-model="form.billPrintSetting" placeholder="请输入送货单打印默认设置"/>
+            <el-input type="textarea" maxlength="100"
+                      show-word-limit v-model="form.billPrintSetting" placeholder="请输入送货单打印默认设置"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">

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

@@ -559,6 +559,9 @@
         <el-tab-pane label="客户loss" name="CustomerLoss">
           <CustomerLoss ref="CustomerLoss" :optType="optType" :itemId="form.itemId"></CustomerLoss>
         </el-tab-pane>
+        <el-tab-pane label="SAP基本信息" name="SapBaseInfoProperty">
+          <SapPropertyData ref="SapBaseInfoProperty"/>
+        </el-tab-pane>
         <el-tab-pane label="SAP销售特性" name="SapSaleProperty">
           <SapPropertyData ref="SapSaleProperty"/>
         </el-tab-pane>
@@ -1028,18 +1031,20 @@ export default {
       }
     },
     onTabClick() {
-      if (this.activeName === 'SapSaleProperty') {
-        this.$refs.SapSaleProperty.init(5, this.form.itemId, this.form)
+      if (this.activeName === 'SapBaseInfoProperty') {
+        this.$refs.SapBaseInfoProperty.init(2,"sapBaseInfo", this.form.itemId, this.form)
+      } else if (this.activeName === 'SapSaleProperty') {
+        this.$refs.SapSaleProperty.init(2,"sapSale", this.form.itemId, this.form)
       } else if (this.activeName === 'SapPurchaseProperty') {
-        this.$refs.SapPurchaseProperty.init(6, this.form.itemId, this.form)
+        this.$refs.SapPurchaseProperty.init(2,'sapPurchase', this.form.itemId, this.form)
       } else if (this.activeName === 'SapPMCProperty'){
-        this.$refs.SapPMCProperty.init(7, this.form.itemId, this.form)
+        this.$refs.SapPMCProperty.init(2,'sapPMC', this.form.itemId, this.form)
       } else if (this.activeName === 'SapStorageProperty') {
-        this.$refs.SapStorageProperty.init(8, this.form.itemId, this.form)
+        this.$refs.SapStorageProperty.init(2,'sapStorage', this.form.itemId, this.form)
       } else if (this.activeName === 'SapQAProperty') {
-        this.$refs.SapQAProperty.init(9, this.form.itemId, this.form)
+        this.$refs.SapQAProperty.init(2,'sapQA', this.form.itemId, this.form)
       } else if (this.activeName === 'SapFinanceProperty') {
-        this.$refs.SapFinanceProperty.init(10, this.form.itemId, this.form)
+        this.$refs.SapFinanceProperty.init(2,'sapQA', this.form.itemId, this.form)
       } //else this.$refs[this.activeName].init && this.$refs[this.activeName].init(this.form)
     }
   },