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

src/assets/styles/index.scss

@@ -4,6 +4,7 @@
 @import './element-ui.scss';
 @import './sidebar.scss';
 @import './btn.scss';
+@import './page-form.scss';
 
 body {
   height: 100%;

src/assets/styles/page-form.scss

+.page-form.el-form--inline {
+  .el-form-item {
+    display: flex;
+    .el-form-item__content {
+      flex: 1;
+      .el-date-editor {
+        width: 100%;
+      }
+    }
+  }
+}

src/components/TipLabel/index.vue

+<template>
+  <el-tooltip :content="tip || title">
+    <div class="form-label-tip">{{ title }}</div>
+  </el-tooltip>
+</template>
+
+<script>
+export default {
+  props: {
+    title: String,
+    tip: String,
+  },
+  data() {
+    return {};
+  }
+};
+</script>
+
+<style scoped>
+.form-label-tip {
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+</style>

src/main.js

@@ -21,6 +21,7 @@ import { getConfigKey } from "@/api/system/config";
 import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree, formatMoney } from "@/utils/ruoyi";
 
 
+import TipLabel from '@/components/TipLabel/index.vue'
 import PageTitle from '@/components/Page/PageTitle.vue'
 import PageWrapper from '@/components/Page/PageWrapper.vue'
 // 分页组件
@@ -75,6 +76,7 @@ Vue.component('SapPropertyData', SapPropertyData)
 Vue.component('FileUpload', FileUpload)
 Vue.component('ImageUpload', ImageUpload)
 Vue.component('ImagePreview', ImagePreview)
+Vue.component('TipLabel', TipLabel)
 
 Vue.use(directive)
 Vue.use(plugins)

src/views/mes/pro/workorder/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/pro/workorder/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/pro/workorder/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/pro/workorder/index.vue → src/views/mes/pro/workorder/indexApply.vue

@@ -239,7 +239,7 @@
               </el-switch>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="工单名称" prop="workorderName">
               <el-input v-model="form.workorderName" placeholder="请输入工单名称" />
             </el-form-item>
@@ -612,47 +612,65 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd(row) {
-      this.reset();
       this.getTreeselect();
-      if (row != null && row.workorderId) {
-        this.form.parentId = row.workorderId;
-        this.form.orderSource = row.orderSource;
-        this.form.sourceCode = row.sourceCode;
-        this.form.clientId = row.clientId;
-        this.form.clientCode = row.clientCode;
-        this.form.clientName = row.clientName;
-      } else {
-        this.form.parentId = 0;
-      }
-      this.open = true;
-      this.title = "添加生产工单";
-      this.optType="add";
+       // 跳转到申请单界
+       this.$router.push("/mes/pro/workorder/apply");
+      return;
+      //  this.reset();
+      // this.getTreeselect();
+      // if (row != null && row.workorderId) {
+      //   this.form.parentId = row.workorderId;
+      //   this.form.orderSource = row.orderSource;
+      //   this.form.sourceCode = row.sourceCode;
+      //   this.form.clientId = row.clientId;
+      //   this.form.clientCode = row.clientCode;
+      //   this.form.clientName = row.clientName;
+      // } else {
+      //   this.form.parentId = 0;
+      // }
+      // this.open = true;
+      // this.title = "添加生产工单";
+      // this.optType="add";
     },
     // 查询明细按钮操作
     handleView(row){
       this.reset();
       this.getTreeselect();
-      const workorderId = row.workorderId || this.ids;
-      getWorkorder(workorderId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "查看工单信息";
-        this.optType = "view";
-      });
+    
+      this.$router.push(
+        "/mes/pro/workorder/info?workorderId=" + workorderId
+      );
+      // this.reset();
+      // this.getTreeselect();
+      // const workorderId = row.workorderId || this.ids;
+      // getWorkorder(workorderId).then(response => {
+      //   this.form = response.data;
+      //   this.open = true;
+      //   this.title = "查看工单信息";
+      //   this.optType = "view";
+      // });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      this.getTreeselect();
-      if (row != null) {
-        this.form.parentId = row.workorderId;
-      }
-      getWorkorder(row.workorderId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改生产工单";
-        this.optType="edit";
-      });
+      
+      const workorderId = row.workorderId || this.ids;
+      this.$router.push(
+        "/mes/pro/workorder/edit?workorderId=" + workorderId
+      );
+
+
+      // this.reset();
+      // this.getTreeselect();
+      // if (row != null) {
+      //   this.form.parentId = row.workorderId;
+      // }
+      // getWorkorder(row.workorderId).then(response => {
+      //   this.form = response.data;
+      //   this.open = true;
+      //   this.title = "修改生产工单";
+      //   this.optType="edit";
+      // });
     },
     /** 提交按钮 */
     submitForm() {
@@ -713,16 +731,16 @@ export default {
         this.$modal.msgSuccess("更改成功");
       }).catch(() => {});
     },
-    //物料选择弹出框
-    onItemSelected(obj){
-        if(obj != undefined && obj != null){
-          this.form.productId = obj.itemId;
-          this.form.productCode = obj.itemCode;
-          this.form.productName = obj.itemName;
-          this.form.productSpc = obj.specification;
-          this.form.unitOfMeasure = obj.unitOfMeasure;  
-        }
-    },
+    // //物料选择弹出框
+    // onItemSelected(obj){
+    //     if(obj != undefined && obj != null){
+    //       this.form.productId = obj.itemId;
+    //       this.form.productCode = obj.itemCode;
+    //       this.form.productName = obj.itemName;
+    //       this.form.productSpc = obj.specification;
+    //       this.form.unitOfMeasure = obj.unitOfMeasure;  
+    //     }
+    // },
     //客户选择弹出框
     onClientSelected(obj){
         if(obj != undefined && obj != null){

src/views/mes/proofing/proofingInfo.vue

@@ -16,15 +16,17 @@
 
     <PageWrapper>
       <el-form
+        class="page-form"
         :model="form"
         ref="form"
         size="small"
         :inline="true"
-        label-width="8em"
+        label-width="100px"
       >
         <el-row>
-          <el-col :md="8" :xs="12">
-            <el-form-item label="申请单编码" prop="prototypeRequestCode">
+          <el-col :md="6" :sm="12" :xs="12">
+            <el-form-item prop="prototypeRequestCode">
+              <template slot="label"> 申请单编码 </template>
               <el-input
                 disabled
                 v-model="form.prototypeRequestCode"
@@ -33,7 +35,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :md="8" :xs="12" style="height: 50.5px">
+          <el-col :md="6" :sm="12" :xs="12">
             <el-form-item label="产品" prop="itemId">
               <el-input
                 v-model="form.itemName"
@@ -49,7 +51,7 @@
               <ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />
             </el-form-item>
           </el-col>
-          <el-col :md="8" :xs="12" style="height: 50.5px">
+          <el-col :md="6" :sm="12" :xs="12">
             <el-form-item label="工艺路线" prop="routeId">
               <el-input
                 v-model="form.routeName"
@@ -68,9 +70,7 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="8" :xs="12">
+          <el-col :md="6" :sm="12" :xs="12">
             <el-form-item label="简称" prop="abbreviation">
               <el-input
                 v-model="form.abbreviation"
@@ -78,7 +78,9 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :md="8" :xs="12">
+        </el-row>
+        <el-row>
+          <el-col :md="6" :sm="12" :xs="12">
             <el-form-item label="样品英文名" prop="enName">
               <el-input
                 v-model="form.enName"
@@ -86,14 +88,14 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :md="8" :xs="12">
+          <el-col :md="6" :sm="12" :xs="12">
             <el-form-item label="样品数量" prop="num">
               <el-input v-model="form.num" placeholder="请输入样品数量">
                 <template slot="suffix">{{ form.unit }}</template>
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :md="8" :xs="12">
+          <el-col :md="6" :sm="12" :xs="12">
             <el-form-item label="打样形式" prop="type">
               <el-input
                 v-model="form.type"
@@ -101,7 +103,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :md="8" :xs="12">
+          <el-col :md="6" :sm="12" :xs="12">
             <el-form-item label="分配方式" prop="modality">
               <el-input
                 v-model="form.modality"
@@ -109,7 +111,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :md="8" :xs="12">
+          <el-col :md="6" :sm="12" :xs="12">
             <el-form-item label="表面处理" prop="surfaceTreatment">
               <el-input
                 v-model="form.surfaceTreatment"
@@ -117,7 +119,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :md="8" :xs="12">
+          <el-col :md="6" :sm="12" :xs="12">
             <el-form-item label="NG原因" prop="ngReason">
               <el-input
                 v-model="form.ngReason"
@@ -125,8 +127,11 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :md="8" :xs="12">
-            <el-form-item label="计划完成日期" prop="plannedFinishDate">
+          <el-col :md="6" :sm="12" :xs="12">
+            <el-form-item prop="plannedFinishDate">
+              <template slot="label">
+                <TipLabel title="完成日期" tip="计划完成日期" />
+              </template>
               <el-date-picker
                 value-format="yyyy-MM-dd"
                 v-model="form.plannedFinishDate"
@@ -134,8 +139,11 @@
               ></el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :md="8" :xs="12">
-            <el-form-item label="版面需求时间" prop="plannedLayoutDate">
+          <el-col :md="6" :sm="12" :xs="12">
+            <el-form-item prop="plannedLayoutDate">
+              <template slot="label">
+                <TipLabel title="版面时间" tip="版面需求时间" />
+              </template>
               <el-date-picker
                 value-format="yyyy-MM-dd"
                 v-model="form.plannedLayoutDate"
@@ -143,7 +151,7 @@
               ></el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :md="8" :xs="12">
+          <el-col :md="6" :sm="12" :xs="12">
             <el-form-item label="测试标准" prop="testStandard">
               <el-input
                 v-model="form.testStandard"
@@ -153,7 +161,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :md="24" :xs="12">
+          <el-col :md="6" :sm="12" :xs="12">
             <el-form-item label="备注" prop="remark">
               <el-input
                 type="textarea"
@@ -362,4 +370,4 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss"></style>