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

src/components/TmTool/index.vue

@@ -102,7 +102,7 @@
           >
         </template>
       </el-table-column>
-            <el-table-column label="物料编号" align="center" prop="toolCode" >
+            <el-table-column label="SN编码" align="center" prop="toolCode" >
       </el-table-column>
       <el-table-column label="名称" align="center" prop="toolName" :show-overflow-tooltip="true">
         <template slot-scope="scope">

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

@@ -180,10 +180,12 @@
                             </el-input>
                         </el-form-item>
                     </el-col>
+                </el-row>  
                     <BrandSelect ref="brSelect" :arrangeCode="form.arrangeCode" @onSelected="onBrandSelected">
                     </BrandSelect>
                     <arangeSelect ref="arangeSelect" :arrangeCode="form.arrangeCode" @onSelected="onBrandSelected">
                     </arangeSelect>
+                 <el-row>  
                     <el-col :span="12">
                         <el-form-item label="编排单号" prop="arrangeCode">
                             <el-input v-model="form.arrangeCode" placeholder="请输入编排单号">

src/views/mes/tm/tool/index.vue

@@ -229,7 +229,7 @@
         <el-row>
            <el-col :span="12">
             <el-form-item label="刀模版具名称" prop="toolName">
-              <el-input v-model="form.toolName" readonly />
+              <el-input v-model="form.toolName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -246,7 +246,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="型号" prop="spec">
-              <el-input v-model="form.spec" readonly />
+              <el-input v-model="form.spec" disabled />
             </el-form-item>
           </el-col>
         </el-row>
@@ -258,9 +258,8 @@
              <el-form-item prop="toolCode">
               <template slot="label"> SN码 </template>
               <el-input
-                disabled
                 v-model="form.toolCode"
-                placeholder="自动生成"
+                placeholder="请输入SN"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -624,11 +623,11 @@ export default {
 
 
     //自动生成编码
-     gCode() {
-      genCode("TOOL_CODE").then((response) => {
-        this.form.toolCode = response;
-      });
-    },
+    //  gCode() {
+    //   genCode("TOOL_CODE").then((response) => {
+    //     this.form.toolCode = response;
+    //   });
+    // },
     handleBrandSelect(){
       this.$refs.brSelect.showFlag = true;
     },

src/views/mes/tm/toolrequest/index.vue

@@ -63,8 +63,8 @@
           placeholder="请输入编排单号"
           clearable
           @keyup.enter.native="handleQuery"
-        /> -->
-      </el-form-item>
+        /> 
+      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -122,20 +122,19 @@
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <!-- <el-table-column label="主键id" align="center" prop="toolRequestId" /> -->
       <el-table-column label="申请单编码" align="center" prop="toolRequestCode" />
-        </el-table-column>
       <el-table-column label="工序" align="center" prop="processName" />
       <el-table-column label="作业单元" align="center" prop="workunitName" />
-      <el-table-column label="申请时间" align="center" prop="requestDate" width="180">
+      <!-- <el-table-column label="申请时间" align="center" prop="requestDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.requestDate, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
-      <el-table-column label="预计开始时间" align="center" prop="startTime" width="180">
+      </el-table-column> -->
+      <el-table-column label="任务开始时间" align="center" prop="startTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="预计结束时间" align="center" prop="endTime" width="180">
+      <el-table-column label="任务结束时间" align="center" prop="endTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endTime) }}</span>
         </template>
@@ -484,7 +483,8 @@ export default {
       this.form.endTime = row.endTime
       this.form.quantity = row.quantity
       this.form.arrangeCode = row.arrangeCode
-      this.form.workunitName = row.workunitName
+      this.form.workunitName = row.workunitNamet
+      this.form.workunitId=row.workunitId
     },
     handleSumNum() {
       // this.form.requestNum

src/views/mes/tm/toolrequest/selectTask.vue

@@ -128,11 +128,7 @@
         width="180"
         :show-overflow-tooltip="true"
       >
-        <template slot-scope="scope">
-          <span>{{
-            parseTime(scope.row.startTime, "{y}-{m}-{d}:{h}-{m}-{s}")
-          }}</span>
-        </template>
+      
       </el-table-column>
       <el-table-column
         label="结束生产时间"
@@ -141,11 +137,6 @@
         width="180"
         :show-overflow-tooltip="true"
       >
-        <template slot-scope="scope">
-          <span>{{
-            parseTime(scope.row.endTime, "{y}-{m}-{d}:{h}-{m}-{s}")
-          }}</span>
-        </template>
       </el-table-column>
       <el-table-column :show-overflow-tooltip="true" width="100" label="状态" align="center" prop="statusName" />
       <el-table-column :show-overflow-tooltip="true" width="100" label="工作单元名称" align="center" prop="workunitName" />