Merge branch 'newprotect' of http://gitlab.91isoft.com:90/yangshuo/template_vue into newprotect

src/styles/index.scss

@@ -12,8 +12,10 @@ body {
   -webkit-font-smoothing: antialiased;
   text-rendering: optimizeLegibility;
   font-family:  Microsoft YaHei, Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Arial, sans-serif;
+
 }
 
+
 label {
   font-weight: 700;
 }

src/views/processManagement/basicProcessManagement/index.vue

@@ -265,7 +265,14 @@ export default {
     // 表单重置
     reset() {
       // TODO: 将模拟数据的空对象赋值给表单对象，达成清空填写表单的效果
-      this.form = this.formReset
+      this.form = {
+        processName: '',
+        workshop: '',
+        flag: '1',
+        createTime: new Date(),
+        updataTime: new Date(),
+        createBy: ''
+      }
     },
     /** TODO: 查询按钮操作 */
     handleQuery() {
@@ -279,7 +286,7 @@ export default {
     /** TODO: 新增按钮操作 */
     handleAdd() {
       // TODO: 初始化新增对话框的状态
-      this.form = this.formReset
+      this.reset()
       this.title = '添加工序'
       this.open = !this.open
     },

src/views/production/data/index.vue

@@ -12,7 +12,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
+      
       <el-form-item>
         <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
       </el-form-item>
@@ -26,7 +26,7 @@
           <!--          >新增</el-button>-->
 
           <!-- <coolbutton style="padding: 8px 7px;" :type="typePrimary" :name="addName" :size="smallSize" :icon="addIcon" :haspermi="addHaspermi" @btn-click="handleAdd" /> -->
-
+          
           <!--          <el-button-->
           <!--            v-hasPermi="['sys:role:export']"-->
           <!--            style="padding: 8px 7px;"-->
@@ -50,41 +50,48 @@
       <el-table v-loading="loading" border :data="roleList" @selection-change="handleSelectionChange">
         <!-- <el-table-column type="index" label="序号" width="380" /> -->
 
-        <el-table-column label="xxx" prop="xxx" :show-overflow-tooltip="true" width="250">
+        
+        <el-table-column label="名称" prop="2222" :show-overflow-tooltip="true" width="222">
           <template slot-scope="scope">
             {{ scope.row.xxx || '-' }}
-          </template>
+          </template>                       
         </el-table-column>
 
-        <el-table-column label="xxx" prop="xxx" :show-overflow-tooltip="true" width="250">
+        <el-table-column label="编码" prop="2222" :show-overflow-tooltip="true" width="222">
           <template slot-scope="scope">
             {{ scope.row.xxx || '-' }}
-          </template>
+          </template>                       
         </el-table-column>
 
-        <el-table-column label="xxx" prop="xxx" :show-overflow-tooltip="true" width="250">
+        <el-table-column label="lot" prop="xxx" :show-overflow-tooltip="true" width="222">
           <template slot-scope="scope">
             {{ scope.row.xxx || '-' }}
           </template>
         </el-table-column>
-
-        <el-table-column label="xxx" prop="xxx" :show-overflow-tooltip="true" width="250">
+        
+        <el-table-column label="位置" prop="xxx" :show-overflow-tooltip="true" width="222">
           <template slot-scope="scope">
             {{ scope.row.xxx || '-' }}
           </template>
         </el-table-column>
 
-        <el-table-column label="xxx" prop="xxx" :show-overflow-tooltip="true" width="250">
+        <el-table-column label="厚度" prop="xxx" :show-overflow-tooltip="true" width="222">
           <template slot-scope="scope">
             {{ scope.row.xxx || '-' }}
           </template>
         </el-table-column>
 
-        <el-table-column label="xxx" prop="xxx" :show-overflow-tooltip="true" width="250">
+        <el-table-column label="创建人" prop="xxx" :show-overflow-tooltip="true" width="222">
           <template slot-scope="scope">
             {{ scope.row.xxx || '-' }}
           </template>
         </el-table-column>
+
+        <!-- <el-table-column label="创建时间" prop="xxx" :show-overflow-tooltip="true" width="222">
+          <template slot-scope="scope">
+            {{ scope.row.xxx || '-' }}
+          </template>
+        </el-table-column> -->
         <!-- <el-table-column label="状态" align="center" width="380">
           <template slot-scope="scope">
             <el-switch
@@ -95,12 +102,12 @@
             />
           </template>
         </el-table-column> -->
-        <!-- <el-table-column label="创建时间" :show-overflow-tooltip="true" align="center" prop="createTime" width="380">
+        <el-table-column label="创建时间" :show-overflow-tooltip="true" align="center" prop="createTime" width="222">
           <template slot-scope="scope">
             <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
           </template>
-        </el-table-column> -->
-
+        </el-table-column>
+        
       </el-table>
     </div>
     <pagination