修改主数据德一些单位名称

src/components/itemSelect/single.vue

@@ -307,7 +307,6 @@ export default {
     },
     // 单选选中数据
     handleRowChange(row) {
-      debugger;
       if (row) {
         this.selectedRows = row;
       }

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

@@ -34,7 +34,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -62,7 +62,7 @@
           :disabled="multiple"
           @click="handleDelete"
         >删除</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -76,8 +76,16 @@
     </el-row>
 
     <el-table v-loading="loading" :data="factoryList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
 <!--      <el-table-column label="工厂id" align="center" prop="factoryId" />-->
+        <el-table-column label="工厂编码" align="center" prop="factoryCode" >
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            @click="handleView(scope.row)"
+          >{{scope.row.factoryCode}}</el-button>
+        </template>
+      </el-table-column>
       <el-table-column label="工厂编码" align="center" prop="factoryCode" />
       <el-table-column label="工厂名称" align="center" prop="factoryName" />
       <el-table-column label="是否启用" align="center" prop="enableFlag" >
@@ -86,7 +94,7 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
-      <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"
@@ -101,7 +109,7 @@
             @click="handleDelete(scope.row)"
           >删除</el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination
@@ -142,7 +150,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm" v-if="optType!='view'">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -159,6 +167,8 @@ export default {
     return {
       // 遮罩层
       loading: true,
+
+      optType: undefined,
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -243,6 +253,17 @@ export default {
         this.title = "修改工厂";
       });
     },
+    handleView(row){
+      this.reset();
+      const factoryId = row.factoryId || this.ids
+      getFactory(factoryId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "查看详情";
+        this.optType = "view";
+      });
+    },
+
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {

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

@@ -233,7 +233,6 @@ export default {
     getList() {
       this.loading = true;
       listItemType(this.queryParams).then(response => {
-        debugger;
         var types = this.handleTree(response.data, "itemTypeId","parentTypeId");
         this.itemTypeList = types;
         this.loading = false;

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

@@ -23,7 +23,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -57,10 +57,10 @@
         >删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="workshopList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="车间编码" align="center" prop="workshopCode" >
         <template slot-scope="scope">
           <el-button
@@ -79,7 +79,7 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>
-      <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"
@@ -96,7 +96,7 @@
             v-hasPermi="['mes:md:workshop:remove']"
           >删除</el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination
@@ -140,7 +140,9 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="面积" prop="area">
-              <el-input-number :min="0" :percision="2" :step="1" v-model="form.area" placeholder="请输入面积" />
+              <el-input v-model="form.area" placeholder="请输入车间名称" >
+              <i slot="suffix" style="font-style:normal;margin-right: 10px; line-height: 30px; color: #1e1e1e">M²</i>
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>

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

@@ -314,7 +314,9 @@
               <el-input
                 v-model="form.stdWorkingTime"
                 placeholder="请输入标准工时"
-              />
+              >
+              <i slot="suffix" style="font-style:normal;margin-right: 10px; line-height: 30px; color: #1e1e1e">MIN</i>
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -774,7 +776,7 @@ export default {
       getWorkstation(workstationId).then((response) => {
         this.form = response.data;
         this.open = true;
-        this.title = "查看车间信息";
+        this.title = "查看工作中心信息";
         this.optType = "view";
       });
     },

src/views/mes/pro/productionSolution/components/ProogingBom.vue

@@ -58,7 +58,7 @@
         </template>
       </el-table-column>
       <el-table-column label="组件数量" align="center" prop="quantity" />
-      <el-table-column label="计量单位" align="center" prop="unitOfMeasure" />
+      <el-table-column label="计量单位" align="center" prop="measureName" />
       <el-table-column
         label="成本核算"
         align="center"
@@ -208,9 +208,9 @@
             </el-form-item>
           </el-col>
           <el-col :lg="6" :md="8" :sm="12" :xs="12">
-            <el-form-item label="计量单位" prop="unitOfMeasure">
+            <el-form-item label="计量单位" prop="measureName">
               <el-input
-                v-model="form.unitOfMeasure"
+                v-model="form.measureName"
                 placeholder="请输入计量单位"
               ></el-input>
             </el-form-item>
@@ -419,6 +419,7 @@ export default {
         bomItemRemark: "",
         itemRemark: "",
         isFixed: "",
+        measureName: "",
       },
       currentRowIdx: undefined,
     };

src/views/mes/pro/productionSolution/components/ProogingProcess.vue

@@ -8,7 +8,7 @@
       <el-table-column label="换型时间" prop="lineBreakTime" align="center" />
       <el-table-column
         label="工时单位"
-        prop="stdWorkingTimeUom"
+        prop="stdWorkingTimeName"
         align="center"
       />
       <el-table-column
@@ -26,7 +26,7 @@
       </el-table-column>
       <el-table-column label="基本数量" prop="quantity" align="center" />
       <el-table-column label="固化时间" prop="solidifyTime" align="center" />
-      <el-table-column label="计量单位" prop="unitOfMeasure" align="center" />
+      <el-table-column label="计量单位" prop="measureName" align="center" />
       <el-table-column label="雇员数量" prop="employeesNum" align="center" />
       <el-table-column label="工艺要求" prop="remark" align="center" />
       <el-table-column label="关键工序" prop="keyFlag" align="center">
@@ -251,9 +251,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="工时单位" prop="stdWorkingTimeUom">
+            <el-form-item label="工时单位" prop="stdWorkingTimeName">
               <el-select
-                v-model="form.stdWorkingTimeUom"
+                v-model="form.stdWorkingTimeName"
                 clearable
                 placeholder="请选择工时单位"
               >
@@ -277,9 +277,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="工序计量单位" prop="unitOfMeasure">
+            <el-form-item label="工序计量单位" prop="measureName">
               <el-input
-                v-model="form.unitOfMeasure"
+                v-model="form.measureName"
                 placeholder="请输入工序计量单位"
               ></el-input>
             </el-form-item>

src/views/mes/pro/request/components/arangeSelect.vue

@@ -238,7 +238,6 @@
         },
         // 单选选中数据
         handleRowChange(row) {
-          debugger;
           if(row){
             this.selectedRow = row;
           }

src/views/mes/pro/request/components/taskSelect.vue

@@ -259,7 +259,6 @@
       },
       // 单选选中数据
       handleRowChange(row) {
-        debugger;
         if(row){
           this.selectedRow = row;
         }

src/views/mes/pro/request/index.vue

@@ -466,6 +466,9 @@ export default {
                 createTime: [
                     { required: true, message: "编排单号称不能为空", trigger: "blur" }
                 ],
+                workorderCode: [
+                    { required: true, message: "任务单号称不能为空", trigger: "blur" }
+                ],
             
       }
     };