commit 20221020

src/api/ipAddress.js

@@ -1,6 +1,3 @@
-// export const ip = 'http://localhost:8103' // 刘路加
+export const ip = 'http://localhost:8051'
-export const ip = 'http://localhost:8051' // 姜福壮的
+// export const ip = 'http://124.220.15.242:8153' // 福田
-// export const ip = 'http://123.56.95.229:8102' // 云的
-// export const ip = 'http://192.168.8.124:8001' // 大柴现场的的
-// export const ip = 'http://127.0.0.1:8004' // 大柴现场的
 

src/views/BasicDataMaintenance/AlarmVariableMaintenance/index.vue

@@ -19,6 +19,7 @@
         <!--            :value="item.value"/>-->
         <!--        </el-select>-->
         <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 5px" @click="pageSize=100;pageCurrent=1;searchTable()">查询</el-button>
+        <el-button type="success" plain icon="el-icon-document-copy" size="small" @click="copyData('form4')">复制</el-button>
       </div>
       <el-table
         v-loading="loading"
@@ -29,12 +30,16 @@
         height="740"
         center
         style="width: 100%">
-        <el-table-column type="index" width="60" label="序号" align="center"/>
+        <el-table-column width="60" label="序号" align="center">
-        <el-table-column label="TagID" align="center">
           <template slot-scope="scope">
-            {{ scope.row.TagID }}
+            {{ scope.row.序号 }}
           </template>
         </el-table-column>
+        <!--        <el-table-column label="TagID" align="center">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.TagID }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
         <el-table-column label="TagName" width="200px" align="center">
           <template slot-scope="scope">
             {{ scope.row.TagName }}
@@ -45,14 +50,19 @@
             {{ scope.row.工位号 }}
           </template>
         </el-table-column>
-        <el-table-column label="测量位置" align="center">
+        <el-table-column label="地址" align="center">
           <template slot-scope="scope">
-            {{ scope.row.测量位置 }}
+            {{ scope.row.变量类型 }} {{ scope.row.变量地址 }}
           </template>
         </el-table-column>
+        <!--        <el-table-column label="测量位置" align="center">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.测量位置 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
         <el-table-column label="测量项目" align="center">
           <template slot-scope="scope">
-            {{ scope.row.测量项目 }}
+            {{ scope.row.报警类型 }}
           </template>
         </el-table-column>
         <el-table-column label="变量类型名称" width="300px" align="center">
@@ -86,11 +96,13 @@
     <el-dialog :visible.sync="dialogFormVisible" :title="title" center style="min-height: 200px;" width="400px">
       <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="110px">
         <el-form-item label="测量项目" prop="measurementItems" style="display: inline-block">
-          <el-input
+          <el-select v-model="form.measurementItems" placeholder="IP" clearable size="small">
-            v-model="form.measurementItems"
+            <el-option
-            clearable
+              v-for="item in alarmType"
-            size="small"
+              :key="item.value"
-            placeholder="测量项目"/>
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
         </el-form-item>
         <el-form-item label="变量类型名称" prop="valueName" style="display: inline-block">
           <el-input
@@ -105,6 +117,24 @@
         <el-button type="primary" size="small" @click="submitAdd1('form')">确定</el-button>
       </div>
     </el-dialog>
+    <el-dialog :visible.sync="dialogFormVisible4" title="数据复制" center style="min-height: 200px" width="400px">
+      <el-form ref="form1" :model="form4" :rules="rules4" label-position="right" label-width="110px">
+        <el-form-item label="工位号" prop="engineTypeValue" style="display: inline-block">
+          <el-select v-model="form4.engineTypeValue" placeholder="请选择工位号" size="small">
+            <el-option
+              v-for="item in dataType"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+              size="mini"/>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button size="small" @click="callOff4()">取消</el-button>
+        <el-button type="primary" size="small" @click="submitAdd4()">确定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -130,7 +160,16 @@ export default {
         }
       ],
       valueTypeValue: '9',
+      alarmType: [],
+      alarmTypeValue: '',
       dialogFormVisible: false,
+      dialogFormVisible4: false,
+      form4: {
+        engineTypeValue: ''
+      },
+      rules4: { // 订单下发验证
+        engineTypeValue: [{ required: true, message: '请选择', trigger: 'blur' }]
+      },
       title: '',
       form: {
         tagID: '',
@@ -148,7 +187,7 @@ export default {
   },
   created() {
     this.getNumber()
-    this.searchTable()
+    this.getAlarmType()
   },
   methods: {
     // 初始化获取产品型号
@@ -163,6 +202,7 @@ export default {
         }
       }).then(response => {
         if (response.data.length) {
+          this.dataTypeValue = response.data[0].工位号
           for (let i = 0; i < response.data.length; i++) {
             this.dataType.push({
               label: response.data[i].工位号,
@@ -170,6 +210,29 @@ export default {
             })
           }
         }
+      }).then(() => {
+        this.searchTable()
+      })
+    }, // 初始化获取报警类型
+    getAlarmType() {
+      this.alarmType = []
+      request({
+        url: '',
+        method: 'post',
+        data: {
+          type: '3',
+          name: `SELECT [ID], [报警类型] FROM [dbo].[MES_基本变量_报警类型]`
+        }
+      }).then(response => {
+        if (response.data.length) {
+          // console.log(response.data, 'response.data')
+          for (let i = 0; i < response.data.length; i++) {
+            this.alarmType.push({
+              label: response.data[i].报警类型,
+              value: response.data[i].ID
+            })
+          }
+        }
       })
     },
     searchTable() {
@@ -238,6 +301,42 @@ export default {
     callOff() {
       this.dialogFormVisible = false
     },
+    copyData(formName) {
+      if (this.tableData.length) {
+        if (this.$refs[formName] !== undefined) {
+          this.$refs[formName].resetFields()
+        }
+        this.dialogFormVisible4 = true
+      } else {
+        this.$message({
+          message: '暂无可复制的数据！',
+          type: 'error'
+        })
+      }
+    },
+    callOff4() {
+      this.dialogFormVisible4 = false
+    },
+    submitAdd4() {
+      var param = []
+      param[0] = ['原始工位号', this.dataTypeValue]
+      param[1] = ['复制工位号', this.form4.engineTypeValue]
+      var Data = this.CreateData('12', '基础数据_报警变量维护_复制', param)
+      this.ExecDatabase(Data).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message({
+            message: '修改成功',
+            type: 'success'
+          })
+          this.dataTypeValue = this.form4.engineTypeValue
+          this.searchTable()
+          this.dialogFormVisible4 = false
+        } else {
+          this.$message.error('修改失败！')
+        }
+      })
+      this.dialogFormVisible = false
+    },
     // 分页
     handleSizeChange(val) {
       this.pageCurrent = 1

src/views/EquipmentOperationAnalysis/EquipmentMaintenanceContent/index.vue

@@ -11,15 +11,15 @@
             :value="item.value"
             size="mini"/>
         </el-select>
-        <span style="margin-left: 10px">保养类型：</span>
+        <!--        <span style="margin-left: 10px">保养类型：</span>-->
-        <el-select v-model="maintenanceTypeValue" placeholder="请选择保养类型" size="small" style="width: 150px">
+        <!--        <el-select v-model="maintenanceTypeValue" placeholder="请选择保养类型" size="small" style="width: 150px">-->
-          <el-option
+        <!--          <el-option-->
-            v-for="item in maintenanceType"
+        <!--            v-for="item in maintenanceType"-->
-            :key="item.value"
+        <!--            :key="item.value"-->
-            :label="item.label"
+        <!--            :label="item.label"-->
-            :value="item.value"
+        <!--            :value="item.value"-->
-            size="mini"/>
+        <!--            size="mini"/>-->
-        </el-select>
+        <!--        </el-select>-->
         <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchOrder();searchTable()">查询</el-button>
         <el-button type="distribution" size="small" icon="el-icon-circle-plus" @click="creatOrder('form')">增加</el-button>
         <el-button type="danger" plain size="small" icon="el-icon-upload2" @click="uploadPictures()">图片</el-button>
@@ -40,7 +40,11 @@
           style="width: 100%;max-height: 700px"
           border
           size="mini">
-          <el-table-column width="60" type="index" label="序号" align="center"/>
+          <el-table-column width="60" label="序号" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.序号 }}
+            </template>
+          </el-table-column>
           <el-table-column align="center" label="设备编号">
             <template slot-scope="scope">
               {{ scope.row.设备编号 }}
@@ -48,12 +52,12 @@
           </el-table-column>
           <el-table-column align="center" label="设备名称">
             <template slot-scope="scope">
-              {{ scope.row.设备名称 }}
+              {{ scope.row.机床名称 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="保养类型">
+          <el-table-column align="center" label="保养内容">
             <template slot-scope="scope">
-              {{ scope.row.点检表类型名称 }}
+              {{ scope.row.设备维护内容 }}
             </template>
           </el-table-column>
           <el-table-column align="center" label="操作" width="150">
@@ -80,7 +84,7 @@
     </el-card>
     <el-dialog :visible.sync="dialogFormVisible" :title="title" center style="min-height: 200px;" width="450px">
       <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="110px">
-        <el-form-item label="工位号" prop="stationNumberValue" style="display: inline-block">
+        <el-form-item v-show="title === '编辑'" label="工位号" prop="serialNumber" style="display: inline-block">
           <el-select v-model="form.stationNumberValue" placeholder="请选择工位号" size="small">
             <el-option
               v-for="item in stationNumber"
@@ -90,7 +94,7 @@
               size="mini"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="保养类型" prop="maintenanceTypeValue" style="display: inline-block">
+        <el-form-item v-show="title === '编辑'" label="保养类型" prop="serialNumber" style="display: inline-block">
           <el-select v-model="form.maintenanceTypeValue" placeholder="请选择保养类型" size="small">
             <el-option
               v-for="item in maintenanceType"
@@ -100,6 +104,13 @@
               size="mini"/>
           </el-select>
         </el-form-item>
+        <el-form-item label="序号" prop="serialNumber" style="display: inline-block">
+          <el-input
+            v-model="form.serialNumber"
+            clearable
+            size="small"
+            placeholder="序号"/>
+        </el-form-item>
         <el-form-item label="设备编号" prop="orderNumber" style="display: inline-block">
           <el-input
             v-model="form.orderNumber"
@@ -117,6 +128,16 @@
             size="small"
             placeholder="设备名称"/>
         </el-form-item>
+        <el-form-item label="保养内容" prop="maintenanceContents" style="display: inline-block">
+          <el-input
+            v-model="form.maintenanceContents"
+            :row="2"
+            type="textarea"
+            clearable
+            size="small"
+            style="width: 200px;"
+            placeholder="保养内容"/>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button size="small" @click="callOff('form')">取消</el-button>
@@ -315,6 +336,7 @@ export default {
     selectable(selection, row) {
       return true
     },
+    // 初始化获取订单号
     getStationNumber() {
       this.stationNumber = []
       var param = []
@@ -337,15 +359,15 @@ export default {
     getMaintenanceType() {
       this.maintenanceType = []
       var param = []
-      var Data = this.CreateData('11', '设备管理_保养类型_查询新', param)
+      var Data = this.CreateData('11', '设备管理_保养类型_查询', param)
       this.ExecDatabase(Data).then(response => {
         for (let i = 0; i < response.data.length; i++) {
           if (response.data.length) {
-            this.maintenanceTypeValue = response.data[0].点检表类型流水号
+            this.maintenanceTypeValue = response.data[0].保养类型代码
           }
           this.maintenanceType.push({
-            label: response.data[i].点检表类型名称,
+            label: response.data[i].保养类型名称,
-            value: response.data[i].点检表类型流水号
+            value: response.data[i].保养类型代码
           })
         }
       })
@@ -356,7 +378,7 @@ export default {
       var param = []
       param[0] = ['工位号', this.stationNumberValue]
       param[1] = ['保养类型代码', this.maintenanceTypeValue]
-      var Data = this.CreateData('11', '设备管理_设备维护内容_查询新', param)
+      var Data = this.CreateData('11', '设备管理_设备维护内容_查询', param)
       this.ExecDatabase(Data).then(response => {
         console.log(response, 66)
         if (response.data.length !== 0) {
@@ -433,8 +455,7 @@ export default {
       this.form.partName = ''
       this.form.orderNumber = ''
       this.form.serialNumber = ''
-      this.form.stationNumberValue = ''
+      this.maintenanceContents = ''
-      this.form.maintenanceTypeValue = ''
       this.dialogFormVisible = true
     },
     // 提交新增订单
@@ -442,12 +463,13 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           var param = []
-          param[0] = ['工位号', this.form.stationNumberValue]
+          param[0] = ['工位号', this.stationNumberValue]
-          param[1] = ['保养类型代码', this.form.maintenanceTypeValue]
+          param[1] = ['保养类型代码', this.maintenanceTypeValue]
-          param[2] = ['设备名称', this.form.partName]
+          param[2] = ['序号', this.form.serialNumber]
           param[3] = ['设备编号', this.form.orderNumber]
+          param[4] = ['设备维护内容', this.form.maintenanceContents]
           // console.log(param, 'param')
-          var Data = this.CreateData('12', '设备管理_设备维护内容_增加新', param)
+          var Data = this.CreateData('12', '设备管理_设备维护内容_增加', param)
           this.ExecDatabase(Data).then(response => {
             if (response.data[0].result === '1') {
               this.$message({
@@ -479,8 +501,8 @@ export default {
         type: 'warning'
       }).then(() => {
         var param = []
-        param[0] = ['ID', row.ID]
+        param[0] = ['维护计划流水号', row.维护计划流水号]
-        var Data = this.CreateData('12', '设备管理_设备维护内容_删除新', param)
+        var Data = this.CreateData('12', '设备管理_设备维护内容_删除', param)
         this.ExecDatabase(Data).then(response => {
           if (response.data[0].result === '1') {
             this.$message({
@@ -505,11 +527,13 @@ export default {
         this.$refs['form'].resetFields()
       }
       this.title = '编辑'
-      this.form.partName = row.设备名称
+      this.form.partName = row.机床名称
       this.form.orderNumber = row.设备编号
       this.form.stationNumberValue = row.工位号
-      this.form.maintenanceTypeValue = Number(row.点检表类型)
+      this.form.maintenanceTypeValue = Number(row.保养类型代码)
-      this.form.ID = row.ID
+      this.form.serialNumber = Number(row.序号) // 序号
+      this.form.maintenanceContents = row.设备维护内容 // 维修内容
+      this.form.ID = row.维护计划流水号
       // this.form.MID = row.设备流水号
       this.dialogFormVisible = true
     },
@@ -518,12 +542,13 @@ export default {
       this.$refs['form'].validate((valid) => {
         if (valid) {
           var param = []
-          param[0] = ['ID', this.form.ID]
+          param[0] = ['维护计划流水号', this.form.ID]
           param[1] = ['工位号', this.form.stationNumberValue]
           param[2] = ['保养类型代码', this.form.maintenanceTypeValue]
-          param[3] = ['设备编号', this.form.orderNumber]
+          param[3] = ['序号', this.form.serialNumber]
-          param[4] = ['设备名称', this.form.partName]
+          param[4] = ['设备维护内容', this.form.maintenanceContents]
-          var Data = this.CreateData('12', '设备管理_设备维护内容_编辑新', param)
+          param[5] = ['设备编号', this.form.orderNumber]
+          var Data = this.CreateData('12', '设备管理_设备维护内容_编辑', param)
           this.ExecDatabase(Data).then(response => {
             if (response.data[0].result === '1') {
               this.$message({

src/views/EquipmentOperationAnalysis/RoutineCheckInformationMaintenance/index.vue

@@ -18,21 +18,21 @@
       </div>
       <el-table v-loading="loading1" :data="tableData1" stripe height="420" border>
         <el-table-column align="center" label="序号" type="index" width="50"/>
-        <el-table-column align="center" label="工位号" width="110">
+        <el-table-column align="center" label="工位号">
           <template slot-scope="scope">
             {{ scope.row.工位号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="设备名称" min-width="150">
+        <!--        <el-table-column align="center" label="设备名称" min-width="150">-->
-          <template slot-scope="scope">
+        <!--          <template slot-scope="scope">-->
-            {{ scope.row.设备名称 }}
+        <!--            {{ scope.row.设备名称 }}-->
-          </template>
+        <!--          </template>-->
-        </el-table-column>
+        <!--        </el-table-column>-->
-        <el-table-column align="center" label="设备编号" show-overflow-tooltip min-width="200">
+        <!--        <el-table-column align="center" label="设备编号" show-overflow-tooltip min-width="200">-->
-          <template slot-scope="scope">
+        <!--          <template slot-scope="scope">-->
-            {{ scope.row.设备编号 }}
+        <!--            {{ scope.row.设备编号 }}-->
-          </template>
+        <!--          </template>-->
-        </el-table-column>
+        <!--        </el-table-column>-->
         <el-table-column align="center" label="点检表类型" min-width="150">
           <template slot-scope="scope">
             <el-select v-model="tableData1[scope.$index].点检表类型流水号" filterable size="small" placeholder="点检表类型" style="margin:3px 10px;width: 150px" @change="editType(scope.row)">
@@ -44,6 +44,11 @@
             </el-select>
           </template>
         </el-table-column>
+        <el-table-column align="center" label="操作时间" show-overflow-tooltip min-width="200">
+          <template slot-scope="scope">
+            {{ scope.row.操作时间 }}
+          </template>
+        </el-table-column>
       </el-table>
     </el-card>
     <el-card>

src/views/QualityAssurance/AssemblyQualitydataQuery/index.vue

@@ -249,7 +249,7 @@ export default {
           value: 2
         }
       ], // 是否合格
-      isQualifiedValue: 1, // 是否合格
+      isQualifiedValue: '', // 是否合格
       dateTime: '', // 时间
       loading: false, // 时间
       tableData: [], // 时间
@@ -331,8 +331,10 @@ export default {
         isQualifiedValue = this.isQualifiedValue
       }
       var param = []
-      param[0] = ['开始时间', this.dateTime[0]]
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
-      param[1] = ['结束时间', this.dateTime[1]]
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      // param[0] = ['开始时间', this.dateTime[0]]
+      // param[1] = ['结束时间', this.dateTime[1]]
       param[2] = ['合格标志', isQualifiedValue]
       var Data = this.CreateData('11', '测量数据合格索引_订单号_查询 ', param)
       this.ExecDatabase(Data).then(response => {
@@ -352,8 +354,10 @@ export default {
       this.engineTypeValue ? engineTypeValue_check = 1 : engineTypeValue_check = 0
       this.stationNumberValue ? stationNumberValue_check = 1 : stationNumberValue_check = 0
       var param = []
-      param[0] = ['开始时间', this.dateTime[0]]
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
-      param[1] = ['结束时间', this.dateTime[1]]
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      // param[0] = ['开始时间', this.dateTime[0]]
+      // param[1] = ['结束时间', this.dateTime[1]]
       param[2] = ['发动机型号_ischeck', engineTypeValue_check]
       param[3] = ['发动机型号', this.engineTypeValue]
       param[4] = ['工位号_ischeck', stationNumberValue_check]
@@ -377,8 +381,10 @@ export default {
       this.engineTypeValue ? engineTypeValue_check = 1 : engineTypeValue_check = 0
       this.stationNumberValue ? stationNumberValue_check = 1 : stationNumberValue_check = 0
       var param = []
-      param[0] = ['开始时间', this.dateTime[0]]
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
-      param[1] = ['结束时间', this.dateTime[1]]
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      // param[0] = ['开始时间', this.dateTime[0]]
+      // param[1] = ['结束时间', this.dateTime[1]]
       param[2] = ['发动机型号_ischeck', engineTypeValue_check]
       param[3] = ['发动机型号', this.engineTypeValue]
       param[4] = ['工位号_ischeck', stationNumberValue_check]
@@ -398,8 +404,10 @@ export default {
     getBatchBarcode() {
       this.batchBarcode = []
       var param = []
-      param[0] = ['开始时间', this.dateTime[0]]
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
-      param[1] = ['结束时间', this.dateTime[1]]
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      // param[0] = ['开始时间', this.dateTime[0]]
+      // param[1] = ['结束时间', this.dateTime[1]]
       param[2] = ['工位号', this.stationNumberValue]
       var Data = this.CreateData('11', '物料数据_视图_物料条码批次号_查询 ', param)
       this.ExecDatabase(Data).then(response => {
@@ -498,8 +506,10 @@ export default {
         this.traceabilityCode ? traceabilityCode_check = 1 : (traceabilityCode_check = 0, this.traceabilityCode = '')
         this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '')
         var param = []
-        param[0] = ['开始时间', this.dateTime[0]]
+        param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
-        param[1] = ['结束时间', this.dateTime[1]]
+        param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+        // param[0] = ['开始时间', this.dateTime[0]]
+        // param[1] = ['结束时间', this.dateTime[1]]
         param[2] = ['发动机型号_ischeck', engineTypeValue_check]
         param[3] = ['发动机型号', this.engineTypeValue]
         param[4] = ['发动机号_ischeck', assemblyNumberValue_check]

src/views/QualityAssurance/InquiryTransitInformation/index.vue

@@ -252,8 +252,10 @@ export default {
     getOrderNumber() {
       this.orderNumber = []
       var param = []
-      param[0] = ['开始时间', this.dateTime[0]]
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
-      param[1] = ['结束时间', this.dateTime[1]]
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      // param[0] = ['开始时间', this.dateTime[0]]
+      // param[1] = ['结束时间', this.dateTime[1]]
       var Data = this.CreateData('11', '测量数据发动机在线状态_订单号_查询 ', param)
       this.ExecDatabase(Data).then(response => {
         if (response.data.length) { this.orderNumberValue = response.data[0].订单号 }
@@ -270,8 +272,10 @@ export default {
       var orderNumberValue_check
       this.orderNumberValue ? orderNumberValue_check = 1 : orderNumberValue_check = 0
       var param = []
-      param[0] = ['开始时间', this.dateTime[0]]
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
-      param[1] = ['结束时间', this.dateTime[1]]
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      // param[0] = ['开始时间', this.dateTime[0]]
+      // param[1] = ['结束时间', this.dateTime[1]]
       param[2] = ['订单号_ischeck', orderNumberValue_check]
       param[3] = ['订单号', this.orderNumberValue]
       var Data = this.CreateData('11', '测量数据发动机在线状态_发动机号_查询 ', param)
@@ -294,8 +298,10 @@ export default {
       this.stationNumberValueN ? stationNumberValueN_check = 1 : (stationNumberValueN_check = 0, this.stationNumberValueN = '')
       this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '')
       var param = []
-      param[0] = ['开始时间', this.dateTime[0]]
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
-      param[1] = ['结束时间', this.dateTime[1]]
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      // param[0] = ['开始时间', this.dateTime[0]]
+      // param[1] = ['结束时间', this.dateTime[1]]
       param[2] = ['工位号N_ischeck', stationNumberValueN_check]
       param[3] = ['工位号N', this.stationNumberValueN]
       param[4] = ['发动机号_ischeck', assemblyNumberValue_check]
@@ -326,8 +332,10 @@ export default {
         this.stationNumberValueN ? stationNumberValueN_check = 1 : (stationNumberValueN_check = 0, this.stationNumberValueN = '')
         this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '')
         var param = []
-        param[0] = ['开始时间', this.dateTime[0]]
+        param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
-        param[1] = ['结束时间', this.dateTime[1]]
+        param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+        // param[0] = ['开始时间', this.dateTime[0]]
+        // param[1] = ['结束时间', this.dateTime[1]]
         param[2] = ['工位号N_ischeck', stationNumberValueN_check]
         param[3] = ['工位号N', this.stationNumberValueN]
         param[4] = ['发动机号_check', assemblyNumberValue_check]

src/views/QualityAssurance/LineItemQuery/index.vue

@@ -317,8 +317,10 @@ export default {
       this.engineTypeValue ? engineTypeValue_check = 1 : engineTypeValue_check = 0
       this.stationNumberValue ? stationNumberValue_check = 1 : stationNumberValue_check = 0
       var param = []
-      param[0] = ['开始时间', this.dateTime[0]]
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
-      param[1] = ['结束时间', this.dateTime[1]]
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      // param[0] = ['开始时间', this.dateTime[0]]
+      // param[1] = ['结束时间', this.dateTime[1]]
       param[2] = ['发动机型号_ischeck', engineTypeValue_check]
       param[3] = ['发动机型号', this.engineTypeValue]
       param[4] = ['工位号_ischeck', stationNumberValue_check]
@@ -365,8 +367,10 @@ export default {
     getBatchBarcode() {
       this.batchBarcode = []
       var param = []
-      param[0] = ['开始时间', this.dateTime[0]]
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
-      param[1] = ['结束时间', this.dateTime[1]]
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      // param[0] = ['开始时间', this.dateTime[0]]
+      // param[1] = ['结束时间', this.dateTime[1]]
       param[2] = ['工位号', this.stationNumberValue]
       console.log(param, 'param')
       var Data = this.CreateData('11', '物料数据分线_视图_物料条码批次号_查询 ', param)
@@ -406,8 +410,10 @@ export default {
       this.traceabilityCode ? traceabilityCode_check = 1 : (traceabilityCode_check = 0, this.traceabilityCode = '')
       this.batchBarcodeValue ? batchBarcodeValue_check = 1 : (batchBarcodeValue_check = 0, this.batchBarcodeValue = '')
       var param = []
-      param[0] = ['开始时间', this.dateTime[0]]
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
-      param[1] = ['结束时间', this.dateTime[1]]
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      // param[0] = ['开始时间', this.dateTime[0]]
+      // param[1] = ['结束时间', this.dateTime[1]]
       param[2] = ['发动机型号_ischeck', engineTypeValue_check]
       param[3] = ['发动机型号', this.engineTypeValue]
       param[4] = ['发动机号_ischeck', assemblyNumberValue_check]
@@ -444,8 +450,10 @@ export default {
         this.traceabilityCode ? traceabilityCode_check = 1 : (traceabilityCode_check = 0, this.traceabilityCode = '')
         this.batchBarcodeValue ? batchBarcodeValue_check = 1 : (batchBarcodeValue_check = 0, this.batchBarcodeValue = '')
         var param = []
-        param[0] = ['开始时间', this.dateTime[0]]
+        param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
-        param[1] = ['结束时间', this.dateTime[1]]
+        param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+        // param[0] = ['开始时间', this.dateTime[0]]
+        // param[1] = ['结束时间', this.dateTime[1]]
         param[2] = ['发动机型号_ischeck', engineTypeValue_check]
         param[3] = ['发动机型号', this.engineTypeValue]
         param[4] = ['发动机号_ischeck', assemblyNumberValue_check]

src/views/QualityAssurance/LineQualityQuery/index.vue

@@ -325,8 +325,10 @@ export default {
     getOrderNumber() {
       this.orderNumber = []
       var param = []
-      param[0] = ['开始时间', this.dateTime[0]]
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
-      param[1] = ['结束时间', this.dateTime[1]]
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      // param[0] = ['开始时间', this.dateTime[0]]
+      // param[1] = ['结束时间', this.dateTime[1]]
       var Data = this.CreateData('11', '测量数据发动机在线状态_订单号_查询 ', param)
       this.ExecDatabase(Data).then(response => {
         if (response.data.length) { this.orderNumberValue = response.data[0].订单号 }
@@ -345,8 +347,10 @@ export default {
       this.engineTypeValue ? engineTypeValue_check = 1 : engineTypeValue_check = 0
       this.stationNumberValue ? stationNumberValue_check = 1 : stationNumberValue_check = 0
       var param = []
-      param[0] = ['开始时间', this.dateTime[0]]
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
-      param[1] = ['结束时间', this.dateTime[1]]
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      // param[0] = ['开始时间', this.dateTime[0]]
+      // param[1] = ['结束时间', this.dateTime[1]]
       param[2] = ['发动机型号_ischeck', engineTypeValue_check]
       param[3] = ['发动机型号', this.engineTypeValue]
       param[4] = ['工位号_ischeck', stationNumberValue_check]
@@ -370,8 +374,10 @@ export default {
       this.engineTypeValue ? engineTypeValue_check = 1 : engineTypeValue_check = 0
       this.stationNumberValue ? stationNumberValue_check = 1 : stationNumberValue_check = 0
       var param = []
-      param[0] = ['开始时间', this.dateTime[0]]
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
-      param[1] = ['结束时间', this.dateTime[1]]
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      // param[0] = ['开始时间', this.dateTime[0]]
+      // param[1] = ['结束时间', this.dateTime[1]]
       param[2] = ['发动机型号_ischeck', engineTypeValue_check]
       param[3] = ['发动机型号', this.engineTypeValue]
       param[4] = ['工位号_ischeck', stationNumberValue_check]
@@ -391,16 +397,18 @@ export default {
     getBatchBarcode() {
       this.batchBarcode = []
       var param = []
-      param[0] = ['开始时间', this.dateTime[0]]
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
-      param[1] = ['结束时间', this.dateTime[1]]
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      // param[0] = ['开始时间', this.dateTime[0]]
+      // param[1] = ['结束时间', this.dateTime[1]]
       param[2] = ['工位号', this.stationNumberValue]
       var Data = this.CreateData('11', '物料数据分线_视图_物料条码批次号_查询 ', param)
       this.ExecDatabase(Data).then(response => {
-        if (response.data.length) { this.batchBarcodeValue = response.data[0].物料条码 }
+        if (response.data.length) { this.batchBarcodeValue = response.data[0].物料条码批次 }
         for (let i = 0; i < response.data.length; i++) {
           this.batchBarcode.push({
-            label: response.data[i].物料条码,
+            label: response.data[i].物料条码批次,
-            value: response.data[i].物料条码
+            value: response.data[i].物料条码批次
           })
         }
       })
@@ -449,8 +457,10 @@ export default {
       this.traceabilityCode ? traceabilityCode_check = 1 : (traceabilityCode_check = 0, this.traceabilityCode = '')
       this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '')
       var param = []
-      param[0] = ['开始时间', this.dateTime[0]]
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
-      param[1] = ['结束时间', this.dateTime[1]]
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      // param[0] = ['开始时间', this.dateTime[0]]
+      // param[1] = ['结束时间', this.dateTime[1]]
       param[2] = ['发动机型号_ischeck', engineTypeValue_check]
       param[3] = ['发动机型号', this.engineTypeValue]
       param[4] = ['发动机号_ischeck', assemblyNumberValue_check]
@@ -491,8 +501,10 @@ export default {
         this.traceabilityCode ? traceabilityCode_check = 1 : (traceabilityCode_check = 0, this.traceabilityCode = '')
         this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '')
         var param = []
-        param[0] = ['开始时间', this.dateTime[0]]
+        param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
-        param[1] = ['结束时间', this.dateTime[1]]
+        param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+        // param[0] = ['开始时间', this.dateTime[0]]
+        // param[1] = ['结束时间', this.dateTime[1]]
         param[2] = ['发动机型号_ischeck', engineTypeValue_check]
         param[3] = ['发动机型号', this.engineTypeValue]
         param[4] = ['发动机号_ischeck', assemblyNumberValue_check]

src/views/QualityAssurance/MaterialDataQuery/index.vue

@@ -307,8 +307,10 @@ export default {
       this.engineTypeValue ? engineTypeValue_check = 1 : engineTypeValue_check = 0
       this.stationNumberValue ? stationNumberValue_check = 1 : stationNumberValue_check = 0
       var param = []
-      param[0] = ['开始时间', this.dateTime[0]]
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
-      param[1] = ['结束时间', this.dateTime[1]]
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      // param[0] = ['开始时间', this.dateTime[0]]
+      // param[1] = ['结束时间', this.dateTime[1]]
       param[2] = ['发动机型号_ischeck', engineTypeValue_check]
       param[3] = ['发动机型号', this.engineTypeValue]
       param[4] = ['工位号_ischeck', stationNumberValue_check]
@@ -332,8 +334,10 @@ export default {
       this.engineTypeValue ? engineTypeValue_check = 1 : engineTypeValue_check = 0
       this.stationNumberValue ? stationNumberValue_check = 1 : stationNumberValue_check = 0
       var param = []
-      param[0] = ['开始时间', this.dateTime[0]]
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
-      param[1] = ['结束时间', this.dateTime[1]]
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      // param[0] = ['开始时间', this.dateTime[0]]
+      // param[1] = ['结束时间', this.dateTime[1]]
       param[2] = ['发动机型号_ischeck', engineTypeValue_check]
       param[3] = ['发动机型号', this.engineTypeValue]
       param[4] = ['工位号_ischeck', stationNumberValue_check]
@@ -353,8 +357,10 @@ export default {
     getBatchBarcode() {
       this.batchBarcode = []
       var param = []
-      param[0] = ['开始时间', this.dateTime[0]]
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
-      param[1] = ['结束时间', this.dateTime[1]]
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      // param[0] = ['开始时间', this.dateTime[0]]
+      // param[1] = ['结束时间', this.dateTime[1]]
       param[2] = ['工位号', this.stationNumberValue]
       var Data = this.CreateData('11', '物料数据_视图_物料条码批次号_查询 ', param)
       this.ExecDatabase(Data).then(response => {
@@ -410,8 +416,10 @@ export default {
       this.traceabilityCode ? traceabilityCode_check = 1 : (traceabilityCode_check = 0, this.traceabilityCode = '')
       this.batchBarcodeValue ? batchBarcodeValue_check = 1 : (batchBarcodeValue_check = 0, this.batchBarcodeValue = '')
       var param = []
-      param[0] = ['开始时间', this.dateTime[0]]
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
-      param[1] = ['结束时间', this.dateTime[1]]
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      // param[0] = ['开始时间', this.dateTime[0]]
+      // param[1] = ['结束时间', this.dateTime[1]]
       param[2] = ['发动机型号_ischeck', engineTypeValue_check]
       param[3] = ['发动机型号', this.engineTypeValue]
       param[4] = ['发动机号_ischeck', assemblyNumberValue_check]
@@ -448,8 +456,10 @@ export default {
         this.traceabilityCode ? traceabilityCode_check = 1 : (traceabilityCode_check = 0, this.traceabilityCode = '')
         this.batchBarcodeValue ? batchBarcodeValue_check = 1 : (batchBarcodeValue_check = 0, this.batchBarcodeValue = '')
         var param = []
-        param[0] = ['开始时间', this.dateTime[0]]
+        param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
-        param[1] = ['结束时间', this.dateTime[1]]
+        param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+        // param[0] = ['开始时间', this.dateTime[0]]
+        // param[1] = ['结束时间', this.dateTime[1]]
         param[2] = ['发动机型号_ischeck', engineTypeValue_check]
         param[3] = ['发动机型号', this.engineTypeValue]
         param[4] = ['发动机号_ischeck', assemblyNumberValue_check]
@@ -462,7 +472,7 @@ export default {
         param[11] = ['二维码', this.traceabilityCode]
         param[12] = ['物料条码批次_ischeck', batchBarcodeValue_check]
         param[13] = ['物料条码批次', this.batchBarcodeValue]
-        var Data = this.CreateData('2001', '物料数据查询_报表新', param)
+        var Data = this.CreateData('2001', '物料数据查询_报表', param)
         this.exportExcel_NPOI(Data)
       } else {
         this.$message.warning('暂无数据')

src/views/RecipeManagement/ElectricalComponentParameters/index.vue

@@ -9,7 +9,7 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 15px" plain @click="pageSize=20;pageCurrent=1;searchTable()">查询</el-button>
+      <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 15px" plain @click="pageSize=20;pageCurrent=1;searchTable();searchTable1()">查询</el-button>
       <el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" @click="addShiftTable('form')">新增</el-button>
       <el-button type="info" plain size="small" icon="el-icon-upload2" @click="importOrder('form')">导入</el-button>
       <el-table
@@ -19,6 +19,11 @@
         height="750"
         center
         style="width: 100%">
+        <el-table-column label="配方标志" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.recipe_id }}
+          </template>
+        </el-table-column>
         <el-table-column label="名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.MachineName }}
@@ -83,6 +88,9 @@
               :value="item.value"/>
           </el-select>
         </el-form-item>
+        <el-form-item label="配方标志" prop="recipe_id" style="display: inline-block">
+          <el-input v-model="form.recipe_id" clearable size="small" placeholder="配方标志" @change="checkData(form.recipe_id)"/>
+        </el-form-item>
         <el-form-item label="编号" prop="value" style="display: inline-block">
           <el-input v-model="form.value" clearable size="small" placeholder="序号"/>
         </el-form-item>
@@ -147,6 +155,7 @@ export default {
       dataTypeValue: '',
       dataType: [],
       tableData: [],
+      tableData1: [],
       activeValue: '',
       active: [{
         label: '启用',
@@ -164,6 +173,7 @@ export default {
         comments: '',
         ID: '',
         active: '',
+        recipe_id: '',
         dataTypeValue: ''
       },
       rules: { // 表单验证规则
@@ -179,6 +189,7 @@ export default {
   created() {
     this.getNumber()
     this.searchTable()
+    this.searchTable1()
   },
   methods: {
     getNumber() {
@@ -231,6 +242,26 @@ export default {
         console.log(this.tableData, 'this.tableData')
       })
     },
+    searchTable1() {
+      this.tableData1 = []
+      var param = []
+      var Data = this.CreateData('11', 'Recipe_Machine_Query_NEW', param)
+      this.ExecDatabase(Data).then(response => {
+        console.log(response, 66)
+        if (response.data.length !== 0) {
+          this.tableData1 = response.data
+        }
+        console.log(this.tableData1, 'this.tableData1')
+      })
+    },
+    checkData(val) {
+      for (let i = 0; i < this.tableData1.length; i++) {
+        if (Number(this.tableData1[i].recipe_id) === Number(val)) {
+          this.$message.error('数据已存在，请不要输入重复数据！')
+          this.form.recipe_id = ''
+        }
+      }
+    },
     addShiftTable(formName) {
       if (this.$refs[formName] !== undefined) {
         this.$refs[formName].resetFields()
@@ -242,6 +273,7 @@ export default {
       this.form.comments = ''
       this.form.dataTypeValue = ''
       this.form.active = ''
+      this.form.recipe_id = ''
       this.dialogFormVisible = true
     },
     submitAdd(formName) {
@@ -253,6 +285,7 @@ export default {
           param[2] = ['num', this.form.value]
           param[3] = ['descript', this.form.descript]
           param[4] = ['comments', this.form.comments]
+          param[5] = ['recipe_id', this.form.recipe_id]
           var Data = this.CreateData('12', 'Recipe_Machine_Add', param)
           this.ExecDatabase(Data).then(response => {
             console.log(response)
@@ -263,6 +296,7 @@ export default {
               })
               this.dialogFormVisible = false
               this.searchTable()
+              this.searchTable1()
             } else {
               this.$message.error('增加失败！')
             }
@@ -289,6 +323,7 @@ export default {
       this.form.comments = row.Comments
       this.form.ID = row.id
       this.form.dataTypeValue = row.MachineNo
+      this.form.recipe_id = row.recipe_id
       this.title = '编辑'
       this.dialogFormVisible = true
     },
@@ -303,6 +338,7 @@ export default {
           param[4] = ['comments', this.form.comments]
           param[5] = ['id', this.form.ID]
           param[6] = ['active', this.form.active]
+          param[7] = ['recipe_id', this.form.recipe_id]
           var Data = this.CreateData('12', 'Recipe_Machine_Update_NEW', param)
           this.ExecDatabase(Data).then(response => {
             if (response.data[0].result === '1') {
@@ -311,6 +347,7 @@ export default {
                 type: 'success'
               })
               this.searchTable()
+              this.searchTable1()
             } else {
               this.$message.error('修改失败！')
             }
@@ -338,6 +375,7 @@ export default {
           if (response.data[0].result === '1') {
             this.$message.success('删除成功')
             this.searchTable()
+            this.searchTable1()
           } else {
             this.$message.error('删除失败')
           }
@@ -380,20 +418,22 @@ export default {
           let name,
             value,
             descript,
-            comments
+            comments,
+            recipe_id
           for (let i = 0; i < 999; i++) {
             const attr = i + 2
             name = this.worksheet[j][`A${attr}`] ? this.worksheet[j][`A${attr}`].v : ''
             value = this.worksheet[j][`B${attr}`] ? this.worksheet[j][`B${attr}`].v : ''
             descript = this.worksheet[j][`C${attr}`] ? this.worksheet[j][`C${attr}`].v : ''
             comments = this.worksheet[j][`D${attr}`] ? this.worksheet[j][`D${attr}`].v : ''
+            recipe_id = this.worksheet[j][`E${attr}`] ? this.worksheet[j][`E${attr}`].v : ''
             console.log(name, value, descript, comments)
             if (!name) {
               break
             } else {
               if (name) {
                 await sleep(50)
-                await this.insertToSQL(name, value, descript, comments)
+                await this.insertToSQL(name, value, descript, comments, recipe_id)
               } else {
                 this.loading = false
                 this.$notify.error(`请确认导入文件是否正确`)
@@ -407,6 +447,7 @@ export default {
         }
         this.loading = false
         this.searchTable()
+        this.searchTable1()
       } catch (e) {
         this.err++
         this.loading = false
@@ -414,13 +455,14 @@ export default {
         console.log(`导入数据错误${e}`)
       }
     },
-    async insertToSQL(name, value, descript, comments) {
+    async insertToSQL(name, value, descript, comments, recipe_id) {
       try {
         var param = []
         param[0] = ['name', name]
         param[1] = ['num', value]
         param[2] = ['descript', descript]
         param[3] = ['comments', comments]
+        param[4] = ['recipe_id', recipe_id]
         var Data = this.CreateData('12', 'Recipe_Machine_Excel', param)
         const response = await this.ExecDatabase(Data)
         if (response.data[0].result === '1') {

src/views/WorkOrderManagement/ReleaseOfProductionPlan/index.vue

@@ -79,15 +79,15 @@
             {{ scope.row.完成数量 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="状态">
+        <!--        <el-table-column align="center" label="状态">-->
-          <template slot-scope="scope">
+        <!--          <template slot-scope="scope">-->
-            <el-tag v-if="parseInt(scope.row.订单状态) === 0" effect="plain" style="width: 70px" type="info">已结束</el-tag>
+        <!--            <el-tag v-if="parseInt(scope.row.订单状态) === 0" effect="plain" style="width: 70px" type="info">已结束</el-tag>-->
-            <el-tag v-if="parseInt(scope.row.订单状态) === 1" effect="plain" style="width: 70px" type="success">生产中</el-tag>
+        <!--            <el-tag v-if="parseInt(scope.row.订单状态) === 1" effect="plain" style="width: 70px" type="success">生产中</el-tag>-->
-            <el-tag v-if="parseInt(scope.row.订单状态) === 2" effect="plain" style="width: 70px" type="text">未上线</el-tag>
+        <!--            <el-tag v-if="parseInt(scope.row.订单状态) === 2" effect="plain" style="width: 70px" type="text">未上线</el-tag>-->
-            <el-tag v-if="parseInt(scope.row.订单状态) === 3" effect="plain" style="width: 70px" type="warning">未完成</el-tag>
+        <!--            <el-tag v-if="parseInt(scope.row.订单状态) === 3" effect="plain" style="width: 70px" type="warning">未完成</el-tag>-->
-            <el-tag v-if="parseInt(scope.row.订单状态) === 4" effect="plain" style="width: 70px" type="danger">已超额</el-tag>
+        <!--            <el-tag v-if="parseInt(scope.row.订单状态) === 4" effect="plain" style="width: 70px" type="danger">已超额</el-tag>-->
-          </template>
+        <!--          </template>-->
-        </el-table-column>
+        <!--        </el-table-column>-->
         <el-table-column align="center" label="计划开始时间">
           <template slot-scope="scope">
             {{ scope.row.计划开始时间 }}
@@ -101,23 +101,29 @@
         <el-table-column align="center" label="操作" min-width="150">
           <template slot-scope="scope">
             <el-button
-              :disabled="parseInt(scope.row.订单状态) === 1 || parseInt(scope.row.订单状态) === 3 || parseInt(scope.row.订单状态) === 4"
+              :disabled="parseInt(scope.row.订单状态) !== 2"
               size="mini"
               type="text"
               icon="el-icon-edit"
               @click="handleEdit(scope.row)">修改</el-button>
             <el-button
-              :disabled="parseInt(scope.row.订单状态) !== ''"
+              :disabled="parseInt(scope.row.订单状态) !== 2"
               size="mini"
               type="text"
               icon="el-icon-delete"
               @click="deleteOrder(scope.row)">删除</el-button>
             <el-button
-              :disabled="parseInt(scope.row.订单状态) === 1 || parseInt(scope.row.订单状态) === 3 || parseInt(scope.row.订单状态) === 4"
+              :disabled="parseInt(scope.row.订单状态) !== 2 "
               size="mini"
               type="text"
               icon="el-icon-success"
               @click="ordersIssuedEditor(scope.row)">订单下发</el-button>
+            <el-button
+              :disabled="parseInt(scope.row.订单状态) !== 1 "
+              size="mini"
+              type="text"
+              icon="el-icon-success"
+              @click="ordersIssuedEditor1(scope.row)">取消下达</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -158,13 +164,6 @@
             size="small"
             placeholder="请输入计划数量"/>
         </el-form-item>
-        <el-form-item label="排序" prop="quantityCompletion" style="display: inline-block">
-          <el-input
-            v-model="form.quantityCompletion"
-            clearable
-            size="small"
-            placeholder="请输入排序"/>
-        </el-form-item>
         <el-form-item label="计划开始时间" prop="startPlanTime" style="display: inline-block">
           <el-date-picker
             v-model="form.startPlanTime"
@@ -213,13 +212,6 @@
             size="small"
             placeholder="请输入计划数量"/>
         </el-form-item>
-        <el-form-item label="排序" prop="quantityCompletion" style="display: inline-block">
-          <el-input
-            v-model="form1.rank"
-            clearable
-            size="small"
-            placeholder="请输入排序"/>
-        </el-form-item>
         <el-form-item label="计划开始时间" prop="startPlanTime" style="display: inline-block">
           <el-date-picker
             v-model="form1.startPlanTime"
@@ -634,6 +626,32 @@ export default {
         })
       })
     },
+    // 取消下发编辑
+    ordersIssuedEditor1(row) {
+      this.$confirm(`确定取消订单<p style="color: deepskyblue;display: inline-block"> ${row.订单号}</p> 吗？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+        dangerouslyUseHTMLString: true
+      }).then(() => {
+        var param = []
+        param[0] = ['MID', row.MID]
+        var Data = this.CreateData('12', 'MES_计划BOM_发动机订单计划_订单下发取消', param)
+        this.ExecDatabase(Data).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message({
+              message: '订单下发取消成功！',
+              type: 'success'
+            })
+            this.pageCurrent = 1
+            this.pageSize = 15
+            this.searchOrder()
+          } else {
+            this.$message.error('订单下发取消失败！')
+          }
+        })
+      })
+    },
     handleAdd() {
       if (this.tableData.length === 0) {
         this.$message.error('内容为空')

src/views/WorkOrderManagement/ScheduleStatusChange/index.vue

@@ -93,11 +93,7 @@
         </el-table-column>
         <el-table-column align="center" label="状态">
           <template slot-scope="scope">
-            <el-tag v-if="parseInt(scope.row.订单状态) === 0" effect="plain" style="width: 70px" type="info">已结束</el-tag>
+            {{ scope.row.订单状态名称 }}
-            <el-tag v-if="parseInt(scope.row.订单状态) === 1" effect="plain" style="width: 70px" type="success">生产中</el-tag>
-            <el-tag v-if="parseInt(scope.row.订单状态) === 2" effect="plain" style="width: 70px" type="text">未上线</el-tag>
-            <el-tag v-if="parseInt(scope.row.订单状态) === 3" effect="plain" style="width: 70px" type="warning">未完成</el-tag>
-            <el-tag v-if="parseInt(scope.row.订单状态) === 3" effect="plain" style="width: 70px" type="danger">已超额</el-tag>
           </template>
         </el-table-column>
         <el-table-column align="center" label="计划开始时间">
@@ -191,15 +187,6 @@ export default {
     this.searchOrder()
   },
   methods: {
-    // 表格颜色变化
-    tableRowClassName({ row, rowIndex }) {
-      // console.log(row, rowIndex)
-      if (rowIndex % 2 === 0) {
-        return 'black'
-      } else {
-        return 'red'
-      }
-    },
     // handleSelectionChange(val) {
     //   if (val.length > 0) {
     //     if (val.length > 1) {
@@ -398,6 +385,20 @@ export default {
         this.$message.warning('暂无数据')
       }
     },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.订单状态 === 2) {
+        return 'no-accept'
+      } else if (row.订单状态 === 1) {
+        return 'assembly'
+      } else if (row.订单状态 === 0) {
+        return 'complete'
+      } else if (row.订单状态 === 3) {
+        return 'suspend'
+      }
+      if (Number(row.订单状态) === 4) {
+        return 'is-group'
+      }
+    },
     // 分页
     handleSizeChange(val) {
       this.pageCurrent = 1
@@ -411,7 +412,23 @@ export default {
   }
 }
 </script>
-
+<style>
+  .el-table .no-accept {
+    background: #F2D1D6!important;
+  }
+  .el-table .is-group {
+    background: #FFF582!important;
+  }
+  .el-table .assembly {
+    background: #C4E1FF!important;
+  }
+  .el-table .complete {
+    background: #c6d7b3!important;
+  }
+  .el-table .suspend {
+    background: #FFD1A4!important;
+  }
+</style>
 <style scoped>
   .topCard{
     margin: 5px;

src/views/layout/components/Sidebar/index.vue

@@ -2,10 +2,10 @@
   <div>
     <el-scrollbar wrap-class="scrollbar-wrapper">
       <div v-show="isShow" class="img-wrapper">
-        <img :src="require('@/assets/img/MES.png')">
+        <img :src="require('@/assets/img/MESWORK.png')">
-        <span style="font-size: 18px; font-weight: bold; color: white;margin-top: 7px">迈思信息<br>
+        <!--        <span style="font-size: 18px; font-weight: bold; color: white;margin-top: 7px">迈思信息<br>-->
-          <span style="font-size: 13px; color: white;margin-top: 0px!important;">MESWORK</span>
+        <!--          <span style="font-size: 13px; color: white;margin-top: 0px!important;">MESWORK</span>-->
-        </span>
+        <!--        </span>-->
       </div>
       <el-menu
         :show-timeout="200"
@@ -21,7 +21,6 @@
       </el-menu>
     </el-scrollbar>
   </div>
-
 </template>
 
 <script>
@@ -32,7 +31,8 @@ export default {
   components: { SidebarItem },
   data() {
     return {
-      isShow: ''
+      isShow: '',
+      leftPic: ''
     }
   },
   computed: {
@@ -48,6 +48,13 @@ export default {
       return !this.sidebar.opened
     }
   },
+  // created() {
+  //   this.axios.get('../MESWORK.png', {
+  //     responseType: 'arraybuffer'
+  //   }).then(res => {
+  //     this.leftPic = 'data:image/jpeg;base64,' + btoa(new Uint8Array(res.data).reduce((data, byte) => data + String.fromCharCode(byte), ''))
+  //   })
+  // },
   methods: {
     showLogo() {
       if (this.sidebar.opened === true) {
@@ -64,7 +71,7 @@ export default {
     display: flex;
     background-color: #1576e8 !important;
     img{
-      width: 37px;
+      width: 137px;
       height: 38px;
       margin: 6px 10px 5px 45px;
     }

src/views/layout_HL/Layout.vue

@@ -0,0 +1,71 @@
+<template>
+  <div :class="classObj" class="app-wrapper">
+    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
+    <sidebar class="sidebar-container"/>
+    <div class="main-container">
+      <navbar/>
+      <tags-view/>
+      <app-main/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { Navbar, Sidebar, AppMain, TagsView } from './components'
+import ResizeMixin from './mixin/ResizeHandler'
+
+export default {
+  name: 'Layout',
+  components: {
+    Navbar,
+    Sidebar,
+    AppMain,
+    TagsView
+  },
+  mixins: [ResizeMixin],
+  computed: {
+    sidebar() {
+      return this.$store.state.app.sidebar
+    },
+    device() {
+      return this.$store.state.app.device
+    },
+    classObj() {
+      return {
+        hideSidebar: !this.sidebar.opened,
+        openSidebar: this.sidebar.opened,
+        withoutAnimation: this.sidebar.withoutAnimation,
+        mobile: this.device === 'mobile'
+      }
+    }
+  },
+  methods: {
+    handleClickOutside() {
+      this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  @import "src/styles/mixin.scss";
+  .app-wrapper {
+    @include clearfix;
+    position: relative;
+    height: 100%;
+    width: 100%;
+    &.mobile.openSidebar{
+      position: fixed;
+      top: 0;
+    }
+  }
+  .drawer-bg {
+    background: #000;
+    opacity: 0.3;
+    width: 100%;
+    top: 0;
+    height: 100%;
+    position: absolute;
+    z-index: 999;
+  }
+</style>

src/views/layout_HL/components/AppMain.vue

@@ -0,0 +1,30 @@
+<template>
+  <!--<section class="app-main">-->
+  <section id="app-main" class="app-main">
+    <transition name="fade-transform" mode="out-in">
+      <!-- or name="fade" -->
+      <!-- <router-view :key="key"></router-view> -->
+      <router-view/>
+    </transition>
+  </section>
+</template>
+
+<script>
+export default {
+  name: 'AppMain',
+  computed: {
+    // key() {
+    //   return this.$route.name !== undefined ? this.$route.name + +new Date() : this.$route + +new Date()
+    // }
+  }
+}
+</script>
+
+<style scoped>
+.app-main {
+  /*50 = navbar  */
+  position: relative;
+  overflow: hidden;
+  /*min-height:calc(100vh - 50px);background: url('../../../../static/bg.jpg') repeat;*/
+}
+</style>

src/views/layout_HL/components/Navbar.vue

@@ -0,0 +1,455 @@
+<!--suppress ALL -->
+<template>
+  <div>
+    <el-menu class="navbar" mode="horizontal" style="background: #1576e8!important;">
+      <hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container"/>
+      <breadcrumb />
+      <el-dropdown class="avatar-container" trigger="click">
+        <div class="avatar-wrapper">
+          <img :src="require('@/assets/img/HELI.jpg')" class="user-avatar">
+          <i class="el-icon-caret-bottom"/>
+        </div>
+        <el-dropdown-menu slot="dropdown" class="user-dropdown">
+          <router-link class="inlineBlock" to="/">
+            <el-dropdown-item>
+              主页
+            </el-dropdown-item>
+          </router-link>
+          <el-dropdown-item divided @click.native="logout">
+            <span style="display:block;">退出</span>
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+    </el-menu>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import Breadcrumb from '@/components/Breadcrumb'
+import Hamburger from '@/components/Hamburger'
+/* import { searchTable1 } from '@/api/PurchasingCenter/PurchaseContractApproval'
+import { getMaterial, getMaterial_NOTES, setChakan } from '@/api/PurchasingCenter/MaterialManagement'
+import { initApproval, initApprovalOffline } from '@/api/PurchasingCenter/FundApproval'
+import { searchUrgentItem } from '@/api/ManufacturingCenter/InitialProduction'
+import { searchTable1 as searchTableInvoice } from '@/api/PurchasingCenter/InvoiceSettlementApprove'
+import { RequestFund, setChakan2 } from '@/api/PurchasingCenter/PurchaseContractRequestFund'
+import { initApproval1, initApprovalOutsourcing, initApprovalMaterials } from '@/api/WorkshopProcurement/FundApproval'
+import { searchTable1 as InvoiceSettlementApprove1 } from '@/api/WorkshopProcurement/InvoiceSettlementApprove1'
+import { searchTable1 as OutsourcingArrivalTicket } from '@/api/Outsourcing/ApprovalOfOutsourcingArrivalTicket'
+import { searchInvoice as searchMaterialsInvoice } from '@/api/WorkshopProcurement/MaterialsInvoiceApproval'
+import { searchTable1 as searchContractApproval } from '@/api/WorkshopProcurement/ProcurementContractApproval'*/
+// import { getPickingList, setPickingList } from '@/api/Inventory/MaterialOut'
+/* import { searchTable } from '@/api/PurchasingCenter/PurchaseMaterielModify'
+import { search } from '@/api/Assembly/DeliveryConfirmation'
+import { searchtable as searchtableSupplement } from '@/api/WorkshopProcurement/ScrappedSupplementaryInvestment1'*/ // 查询报废补投零件
+import Cookies from 'js-cookie'
+export default {
+  components: {
+    Breadcrumb,
+    Hamburger
+  },
+  data() {
+    return {
+      timer: '',
+      noticeFund: null,
+      noticeInvoice: null,
+      noticeContractKG: null, // 领料单
+      selfMadeparts: null, // 自制件
+      productionPicking: null, // 物料
+      purchaseContract: null, // 采购合同
+      purchaseOrder: null, // 采购订单
+      productionOperation: null, // 生产投产
+      orderOperation: null, // 订单投产
+      deliveryNotice: null, // 发货通知
+      partsScrapping: null, // 零件报废
+      noticeDeliver: null,
+      noticeApproval: null,
+      noticeInvoiceManufacture: null,
+      noticeInvoiceOutsourcing: null,
+      noticeInvoiceMaterials: null,
+      noticeContractApproval: null,
+      PickingListSearch: null, // 领料单
+      SelfMadePartsReceiptSearch: null, // 库存管理自制件
+      PurchaseContract: null,
+      OrderProduction: null,
+      PurchaseContractSearch: null,
+      DeliveryNotice: null,
+      ScrapReplenishment: null,
+      OrderConfirmationShipment: null
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'name',
+      'id',
+      'token',
+      'token'
+    ])
+  },
+  mounted() {
+    console.log(Cookies.get('id'), 999)
+    /* if (this.id === 3 || Cookies.get('id') === 3) { // id=3 沈大为 总经理
+      this.checkApproval()
+      this.timer = setInterval(this.checkApproval, 1000 * 60 * 5)
+    } else if (this.token.toString() === '11') { // 11 技术部长
+      // 存储过程 库存管理_物料主文件_基本_采购部_查询未审核数量
+      this.comfirmMaterial() // 您有采购物料申请待审批，请及时处理，点击查看
+      this.timer = setInterval(this.comfirmMaterial, 1000 * 60 * 5)
+      // 存储过程 采购管理_采购物料修改确认_查询数据
+      this.comfirmMaterial_Update() // 您有采购物料更改申请待审批，请及时处理，点击查看
+      this.timer = setInterval(this.comfirmMaterial_Update, 1000 * 60 * 5)
+    } else if (this.token.toString() === '2' || this.token.toString() === '3') { // 2 采购部长 3 采购员 18 财务(会计)
+      this.comfirmMaterial_CG()
+      this.timer = setInterval(this.comfirmMaterial_CG, 1000 * 60 * 5)
+    } else if (this.token.toString() === '5') { // 5 计划员
+      this.comfirmUrgentItem()
+      this.timer = setInterval(this.comfirmUrgentItem, 1000 * 60 * 5)
+      this.searchtableSupplement() // 报废补投(制造)
+      this.timer = setInterval(this.searchtableSupplement, 1000 * 60 * 5)
+    } else if (this.token.toString() === '21') { // 21 装配部长
+      this.comfirmDeliver()
+      this.timer = setInterval(this.comfirmDeliver, 1000 * 60 * 5)
+    } else if (this.token.toString() === '26') { // 26 制造部总经理
+      this.ManufacturingApprova()
+      this.timer = setInterval(this.ManufacturingApprova, 1000 * 60 * 5)
+    } else if (this.token.toString() === '18') { // 26 财务
+      this.FinanceApprova()
+      this.timer = setInterval(this.FinanceApprova, 1000 * 60 * 5)
+    }*/
+    if (this.token.toString() === '7') { // 仓库
+      this.warehouseSearch()
+      this.timer = setInterval(this.warehouseSearch, 1000 * 60 * 5)
+    } else if (this.token.toString() === '11') { // 审核
+      this.newPurchaseContract()
+      this.timer = setInterval(this.newPurchaseContract, 1000 * 60 * 5)
+    } else if (this.token.toString() === '8') { // 发货
+      this.newDeliveryNotice()
+      this.timer = setInterval(this.newDeliveryNotice, 1000 * 60 * 5)
+    } else if (this.token.toString() === '16') { // 16 精工车间
+      this.newScrapReplenishment()
+      this.timer = setInterval(this.newScrapReplenishment, 1000 * 60 * 5)
+    } else if (this.token.toString() === '4') { // 4 采购
+      this.purchaseSearch()
+      this.timer = setInterval(this.purchaseSearch, 1000 * 60 * 5)
+    } else if (this.token.toString() === '3' || this.token.toString() === '11') { // 4 销售
+      this.saleSearch()
+      this.timer = setInterval(this.saleSearch, 1000 * 60 * 5)
+    } else if (this.token.toString() === '15') { // 15 技术
+      this.newOrderInformation()
+      this.timer = setInterval(this.newOrderInformation, 1000 * 60 * 5)
+    } else if (this.token.toString() === '15') { // 15 技术
+      this.newOrderInformation()
+      this.timer = setInterval(this.newOrderInformation, 1000 * 60 * 5)
+    } else if (this.token.toString() === '2') { // 2 管理员
+      this.newOrderProduction()
+      this.timer = setInterval(this.newOrderProduction, 1000 * 60 * 5)
+    }
+  },
+  beforeDestroy() {
+    clearInterval(this.timer)
+  },
+  methods: {
+    warehouseSearch() {
+      this.newPickingListSearch()
+      this.newSelfMadePartsReceiptSearch()
+    },
+    purchaseSearch() {
+      this.newPurchaseContractSearch()
+      this.newPaymentOrder()
+    },
+    saleSearch() {
+      this.newOrderConfirmationShipment()
+    },
+    newPickingListSearch() {
+      // 新领料单通知查询
+      var param = []
+      var Data = this.CreateData('11', '装配管理_领料单明细_查询_新通知', param)
+      this.ExecDatabase(Data).then(response => {
+        if (response.data.length > 0) {
+          this.PickingListSearch = null
+          this.PickingListSearch = this.$notify.success({
+            title: '提示',
+            dangerouslyUseHTMLString: true,
+            message: ' <div>您有新的领料单需要备料确认，请及时处理，<a style="color: #1e6abc">点击查看</a></div>',
+            onClick: () => {
+              this.$router.push({ path: '/WarehouseManagement/MaterialRequisition' })
+              setTimeout(this.PickingListSearch.close(), 1000)
+              var param = []
+              var Data = this.CreateData('12', '装配管理_领料单明细_确认查看', param)
+              this.ExecDatabase(Data)
+            },
+            duration: 1000 * 60
+          })
+        }
+      })
+    },
+    newSelfMadePartsReceiptSearch() {
+      // 新自制件入库查询
+      var param = []
+      var Data = this.CreateData('11', '库存管理_自制件_查询_新通知', param)
+      this.ExecDatabase(Data).then(response => {
+        if (response.data.length > 0) {
+          this.SelfMadePartsReceiptSearch = null
+          this.SelfMadePartsReceiptSearch = this.$notify.success({
+            title: '提示',
+            dangerouslyUseHTMLString: true,
+            message: ' <div>您有新的自制件入库，需要您确认<a style="color: #1e6abc">点击进入确认界面</a></div>',
+            onClick: () => {
+              this.$router.push({ path: '/WarehouseManagement/PurchasePartsStorage' })
+              setTimeout(this.SelfMadePartsReceiptSearch.close(), 1000)
+              var param = []
+              var Data = this.CreateData('12', '库存管理_自制件_确认查看', param)
+              this.ExecDatabase(Data)
+            },
+            duration: 1000 * 60
+          })
+        }
+      })
+    },
+    newPurchaseContract() {
+    //  新采购合同查询
+      var param = []
+      var Data = this.CreateData('11', '采购管理_采购合同_查询_新通知', param)
+      this.ExecDatabase(Data).then(response => {
+        if (response.data.length > 0) {
+          this.PurchaseContract = null
+          this.PurchaseContract = this.$notify.success({
+            title: '提示',
+            dangerouslyUseHTMLString: true,
+            message: ' <div>您有新的采购合同，需要您审批<a style="color: #1e6abc">点击进入确认界面</a></div>',
+            onClick: () => {
+              this.$router.push({ path: '/SeikoWorkshop/ProcurementContractAudit' })
+              setTimeout(this.PurchaseContract.close(), 1000)
+              var param = []
+              var Data = this.CreateData('12', '采购管理_采购合同_确认查看', param)
+              this.ExecDatabase(Data)
+            },
+            duration: 1000 * 60
+          })
+        }
+      })
+    },
+    newPurchaseContractSearch() {
+      // 采购合同审核通过是否通知
+      var param = []
+      var Data = this.CreateData('11', '采购管理_采购合同_审核通过是否通知_查询新通知', param)
+      this.ExecDatabase(Data).then(response => {
+        if (response.data.length > 0) {
+          this.PurchaseContractSearch = null
+          this.PurchaseContractSearch = this.$notify.success({
+            title: '提示',
+            dangerouslyUseHTMLString: true,
+            message: ' <div>您有新的合同审核通过<a style="color: #1e6abc">点击查看详情</a></div>',
+            onClick: () => {
+              this.$router.push({ path: '/PurchasingManagement/OrderInquiry' })
+              setTimeout(this.PurchaseContractSearch.close(), 1000)
+              var param = []
+              var Data = this.CreateData('12', '采购管理_采购合同_审核通过是否通知_确认查看', param)
+              this.ExecDatabase(Data)
+            },
+            duration: 1000 * 60
+          })
+        }
+      })
+    },
+    newOrderInformation() {
+      // 新订单查询技术审核确认
+      var param = []
+      var Data = this.CreateData('11', '合同管理_订单信息_基础表_查询_新通知', param)
+      this.ExecDatabase(Data).then(response => {
+        if (response.data.length > 0) {
+          this.OrderInformation = null
+          this.OrderInformation = this.$notify.success({
+            title: '提示',
+            dangerouslyUseHTMLString: true,
+            message: ' <div>您有新的订单，需要您技术审核确认<a style="color: #1e6abc">点击进入技术确认界面</a></div>',
+            onClick: () => {
+              this.$router.push({ path: '/TechnologyCenter/DrawingConfirmation' })
+              setTimeout(this.OrderInformation.close(), 1000)
+              var param = []
+              var Data = this.CreateData('12', '合同管理_订单信息_基础表_确认查看', param)
+              this.ExecDatabase(Data)
+            },
+            duration: 1000 * 60
+          })
+        }
+      })
+    },
+    newOrderProduction() {
+      // 新订单查询订单投产
+      var param = []
+      var Data = this.CreateData('11', '合同管理_订单信息_基础表_查询_新通知', param)
+      this.ExecDatabase(Data).then(response => {
+        if (response.data.length > 0) {
+          this.OrderProduction = null
+          this.OrderProduction = this.$notify.success({
+            title: '提示',
+            dangerouslyUseHTMLString: true,
+            message: ' <div>您有新的订单，需要投产<a style="color: #1e6abc">点击进入订单投产</a></div>',
+            onClick: () => {
+              this.$router.push({ path: '/SalesManagement/OrderRelease' })
+              setTimeout(this.OrderProduction.close(), 1000)
+              var param = []
+              var Data = this.CreateData('12', '合同管理_订单信息_基础表_确认查看', param)
+              this.ExecDatabase(Data)
+            },
+            duration: 1000 * 60
+          })
+        }
+      })
+    },
+    newPaymentOrder() {
+      // 付款是否通知
+      var param = []
+      var Data = this.CreateData('11', '采购管理_采购合同_付款是否通知_新通知', param)
+      this.ExecDatabase(Data).then(response => {
+        if (response.data.length > 0) {
+          this.PaymentOrder = null
+          this.PaymentOrder = this.$notify.success({
+            title: '提示',
+            dangerouslyUseHTMLString: true,
+            message: ' <div>您有合同付款通知<a style="color: #1e6abc">点击查看详情</a></div>',
+            onClick: () => {
+              this.$router.push({ path: '/PurchasingManagement/OrderInquiry' })
+              setTimeout(this.PaymentOrder.close(), 1000)
+              var param = []
+              var Data = this.CreateData('12', '采购管理_采购合同_付款通知_确认查看', param)
+              this.ExecDatabase(Data)
+            },
+            duration: 1000 * 60
+          })
+        }
+      })
+    },
+    newDeliveryNotice() {
+    //  新发货通知是否查看
+      var param = []
+      var Data = this.CreateData('11', '合同管理_订单信息_基础表_通知发货是否查看_查询新通知', param)
+      this.ExecDatabase(Data).then(response => {
+        if (response.data.length > 0) {
+          this.DeliveryNotice = null
+          this.DeliveryNotice = this.$notify.success({
+            title: '提示',
+            dangerouslyUseHTMLString: true,
+            message: ' <div>您有新的发货通知，注意查看<a style="color: #1e6abc">点击查看详情</a></div>',
+            onClick: () => {
+              this.$router.push({ path: '/SalesManagement/ProductDelivery' })
+              setTimeout(this.DeliveryNotice.close(), 1000)
+              var param = []
+              var Data = this.CreateData('12', '合同管理_订单信息_基础表_通知发货是否查看_确认查看', param)
+              this.ExecDatabase(Data)
+            },
+            duration: 1000 * 60
+          })
+        }
+      })
+    },
+    newScrapReplenishment() {
+      // 精工车间 报废补投新的查询
+      var param = []
+      var Data = this.CreateData('11', '车间生产管理工艺_零件工艺计划_报废零件记录_是否查看查询', param)
+      this.ExecDatabase(Data).then(response => {
+        if (response.data.length > 0) {
+          this.ScrapReplenishment = null
+          this.ScrapReplenishment = this.$notify.success({
+            title: '提示',
+            dangerouslyUseHTMLString: true,
+            message: ' <div>有零件报废，请及时补投<a style="color: #1e6abc">点击进入“报废补投”界面</a></div>',
+            onClick: () => {
+              this.$router.push({ path: '/SeikoWorkshop/ScrapProduction' })
+              setTimeout(this.ScrapReplenishment.close(), 1000)
+              var param = []
+              var Data = this.CreateData('12', '车间生产管理工艺_零件工艺计划_报废零件记录_确认查看', param)
+              this.ExecDatabase(Data)
+            },
+            duration: 1000 * 60
+          })
+        }
+      })
+    },
+    newOrderConfirmationShipment() {
+      //  订单确认发货
+      var param = []
+      var Data = this.CreateData('11', '合同管理_订单信息_基础表_已发货是否查看查询', param)
+      this.ExecDatabase(Data).then(response => {
+        if (response.data.length > 0) {
+          this.OrderConfirmationShipment = null
+          this.OrderConfirmationShipment = this.$notify.success({
+            title: '提示',
+            dangerouslyUseHTMLString: true,
+            message: ' <div>有合同已发货<a style="color: #1e6abc">点击查看发货信息</a></div>',
+            onClick: () => {
+              this.$router.push({ path: '/SalesManagement/DeliveryRecord' })
+              setTimeout(this.OrderConfirmationShipment.close(), 1000)
+              var param = []
+              var Data = this.CreateData('12', '合同管理_订单信息_基础表_已发货_确认查看', param)
+              this.ExecDatabase(Data)
+            },
+            duration: 1000 * 60
+          })
+        }
+      })
+    },
+    toggleSideBar() {
+      this.$store.dispatch('ToggleSideBar')
+    },
+    logout() {
+      this.$store.dispatch('FedLogOut').then(() => {
+        location.reload() // 为了重新实例化vue-router对象 避免bug
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .navbar {
+    height: 50px;
+    line-height: 50px;
+    border-radius: 0px !important;
+    .hamburger-container {
+      line-height: 58px;
+      height: 50px;
+      float: left;
+      padding: 0 10px;
+    }
+    .screenfull {
+      position: absolute;
+      right: 90px;
+      top: 16px;
+      color: red;
+    }
+    .avatar-container {
+      height: 50px;
+      display: inline-block;
+      position: absolute;
+      right: 35px;
+      .avatar-wrapper {
+        cursor: pointer;
+        margin-top: 5px;
+        position: relative;
+        width: 40px;
+        height: 40px;
+        background-color: #1576e8;
+        .user-avatar {
+          width: 35px;
+          height: 35px;
+          margin: 3px 0 0 3px;
+        }
+        .el-icon-caret-bottom {
+          color: #fff;
+          position: absolute;
+          right: -20px;
+          top: 25px;
+          font-size: 12px;
+        }
+        /deep/ .el-notification.right{
+          cursor:pointer!important;
+        }
+      }
+    }
+  }
+</style>

src/views/layout_HL/components/Sidebar/Item.vue

@@ -0,0 +1,29 @@
+<script>
+export default {
+  name: 'MenuItem',
+  functional: true,
+  props: {
+    icon: {
+      type: String,
+      default: ''
+    },
+    title: {
+      type: String,
+      default: ''
+    }
+  },
+  render(h, context) {
+    const { icon, title } = context.props
+    const vnodes = []
+
+    if (icon) {
+      vnodes.push(<svg-icon icon-class={icon}/>)
+    }
+
+    if (title) {
+      vnodes.push(<span slot='title'>{(title)}</span>)
+    }
+    return vnodes
+  }
+}
+</script>

src/views/layout_HL/components/Sidebar/SidebarItem.vue

@@ -0,0 +1,104 @@
+<template>
+  <div v-if="!item.hidden&&item.children" class="menu-wrapper">
+
+    <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
+      <a :href="onlyOneChild.path" target="_blank" @click="clickLink(onlyOneChild.path,$event)">
+        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
+          <item v-if="onlyOneChild.meta" :icon="onlyOneChild.meta.icon||item.meta.icon" :title="onlyOneChild.meta.title" />
+        </el-menu-item>
+      </a>
+    </template>
+
+    <el-submenu v-else :index="item.name||item.path">
+      <template slot="title">
+        <item v-if="item.meta" :icon="item.meta.icon" :title="item.meta.title" />
+      </template>
+
+      <template v-for="child in item.children" v-if="!child.hidden">
+        <sidebar-item
+          v-if="child.children&&child.children.length>0"
+          :is-nest="true"
+          :item="child"
+          :key="child.path"
+          :base-path="resolvePath(child.path)"
+          class="nest-menu" />
+        <a v-else :href="child.path" :key="child.name" target="_blank" @click="clickLink(child.path,$event)">
+          <el-menu-item :index="resolvePath(child.path)" style="padding-left: 58px!important;">
+            <item v-if="child.meta" :icon="child.meta.icon" :title="child.meta.title" />
+          </el-menu-item>
+        </a>
+      </template>
+    </el-submenu>
+
+  </div>
+</template>
+
+<script>
+import path from 'path'
+import { validateURL } from '@/utils/validate'
+import Item from './Item'
+
+export default {
+  name: 'SidebarItem',
+  components: { Item },
+  props: {
+    // route object
+    item: {
+      type: Object,
+      required: true
+    },
+    isNest: {
+      type: Boolean,
+      default: false
+    },
+    basePath: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      onlyOneChild: null
+    }
+  },
+  methods: {
+    hasOneShowingChild(children, parent) {
+      const showingChildren = children.filter(item => {
+        if (item.hidden) {
+          return false
+        } else {
+          // Temp set(will be used if only has one showing child)
+          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
+      }
+
+      // Show parent if there are no child router to display
+      if (showingChildren.length === 0) {
+        this.onlyOneChild = { ... parent, path: '', noShowingChildren: true }
+        return true
+      }
+
+      return false
+    },
+    resolvePath(routePath) {
+      return path.resolve(this.basePath, routePath)
+    },
+    isExternalLink(routePath) {
+      return validateURL(routePath)
+    },
+    clickLink(routePath, e) {
+      if (!this.isExternalLink(routePath)) {
+        e.preventDefault()
+        const path = this.resolvePath(routePath)
+        this.$router.push(path)
+      }
+    }
+  }
+}
+</script>

src/views/layout_HL/components/Sidebar/SidebarItem2.vue

@@ -0,0 +1,48 @@
+<template>
+  <div class="menu-wrapper">
+    <template v-for="item in routes" v-if="!item.hidden&&item.children">
+      <!--一级-->
+      <router-link v-if="item.children.length===1 && !item.children[0].children" :to="item.path+'/'+item.children[0].path" :key="item.children[0].name">
+        <el-menu-item :index="item.path+'/'+item.children[0].path" :class="{'submenu-title-noDropdown':!isNest}">
+          <svg-icon v-if="item.children[0].meta&&item.children[0].meta.icon" :icon-class="item.children[0].meta.icon"/>
+          <span v-if="item.children[0].meta&&item.children[0].meta.title">{{ item.children[0].meta.title }}</span>
+        </el-menu-item>
+      </router-link>
+      <!--二级-->
+      <el-submenu v-else :index="item.name||item.path" :key="item.name">
+        <template slot="title">
+          <svg-icon v-if="item.meta&&item.meta.icon" :icon-class="item.meta.icon"/>
+          <span v-if="item.meta&&item.meta.title">{{ item.meta.title }}</span>
+        </template>
+
+        <template v-for="child in item.children" v-if="!child.hidden">
+          <sidebar-item v-if="child.children&&child.children.length>0" :routes="[child]" :key="child.path" :is-nest="true" class="nest-menu"/>
+          <router-link v-else :to="item.path+child.path" :key="child.name">
+            <el-menu-item :index="item.path+'/'+child.path">
+              <svg-icon v-if="child.meta&&child.meta.icon" :icon-class="child.meta.icon"/>
+              <span v-if="child.meta&&child.meta.title">{{ child.meta.title }}</span>
+              {{ item.path+'/'+child.path }}
+            </el-menu-item>
+          </router-link>
+        </template>
+      </el-submenu>
+
+    </template>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'SidebarItem',
+  props: {
+    routes: {
+      type: Array,
+      default: null
+    },
+    isNest: {
+      type: Boolean,
+      default: false
+    }
+  }
+}
+</script>

src/views/layout_HL/components/Sidebar/index.vue

@@ -0,0 +1,69 @@
+<template>
+  <div>
+    <el-scrollbar wrap-class="scrollbar-wrapper">
+      <div v-show="isShow" class="img-wrapper">
+        <img :src="require('@/assets/img/HELILOGO.png')">
+      </div>
+      <el-menu
+        :show-timeout="200"
+        :default-active="$route.path"
+        :collapse="isCollapse"
+        mode="vertical"
+        background-color="white"
+        text-color="black"
+        active-text-color="#1576e8"
+        style="height:calc(100% - 124px)"
+      >
+        <sidebar-item v-for="route in permission_routers" :key="route.name" :item="route" :base-path="route.path"/>
+      </el-menu>
+    </el-scrollbar>
+  </div>
+
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import SidebarItem from './SidebarItem'
+
+export default {
+  components: { SidebarItem },
+  data() {
+    return {
+      isShow: ''
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'permission_routers'
+    ]),
+    routes() {
+      return this.$router.options.routes
+    },
+    isCollapse() {
+      this.showLogo()
+      return !this.sidebar.opened
+    }
+  },
+  methods: {
+    showLogo() {
+      if (this.sidebar.opened === true) {
+        this.isShow = true
+      } else {
+        this.isShow = false
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .img-wrapper{
+    display: flex;
+    background-color: #1576e8 !important;
+    img{
+      width: 137px;
+      height: 38px;
+      margin: 6px 10px 5px 45px;
+    }
+  }
+</style>

src/views/layout_HL/components/TagsView.vue

@@ -0,0 +1,334 @@
+<template>
+  <div class="tags-view-container">
+    <scroll-pane ref="scrollPane" class="tags-view-wrapper" style="background: rgb(255,255,255)!important;">
+      <router-link v-for="tag in Array.from(visitedViews)" ref="tag" :class="isActive(tag)?'active':''" :to="tag.path" :key="tag.path" class="tags-view-item" @contextmenu.prevent.native="openMenu(tag,$event)" >
+        {{ tag.title }}
+        <span class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)"/>
+      </router-link>
+    </scroll-pane>
+    <ul v-show="visible" :style="{left:tagLeft+'px',top:tagTop+'px','z-index': 99}" class="contextmenu">
+      <li @click="refreshSelectedTag(selectedTag)">重新加载</li>
+      <li @click="closeSelectedTag(selectedTag)">关闭当前</li>
+      <li @click="closeOthersTags">关闭其他</li>
+      <li @click="closeAllTags">关闭全部</li>
+    </ul>
+  </div>
+</template>
+
+<script>
+import ScrollPane from '@/components/ScrollPane'
+import Cookies from 'js-cookie'
+
+export default {
+  components: { ScrollPane },
+  inject: ['reload'],
+  data() {
+    return {
+      visible: false,
+      tagTop: 0,
+      tagLeft: 0,
+      selectedTag: {},
+      timer: ''
+    }
+  },
+  computed: {
+    visitedViews() {
+      return this.$store.state.tagsView.visitedViews
+    }
+  },
+  watch: {
+    $route() {
+      this.addViewTags()
+      // this.moveToCurrentTag()
+    },
+    visible(value) {
+      if (value) {
+        window.addEventListener('click', this.closeMenu)
+      } else {
+        window.removeEventListener('click', this.closeMenu)
+      }
+    }
+  },
+  mounted() {
+    this.addViewTags()
+  },
+  methods: {
+    // generateTitle, // generateTitle by vue-i18n
+    // generateRoute() {
+    //   if (this.$route.name) {
+    //     return this.$route
+    //   }
+    //   return false
+    // },
+    generateRoute() {
+      clearTimeout(this.timer)
+      switch (this.$route.name) {
+        case 'EquipmentMonitoring':
+          this.timer = setTimeout(() => {
+            document.getElementById('app-main').style.width = '1710px'
+            document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1710px'
+            document.getElementsByClassName('navbar')[0].style.minWidth = '1710px'
+          }, 400)
+          break
+        case 'ProjectPlanningManagementNew': // 项目计划管理
+          this.timer = setTimeout(() => {
+            document.getElementById('app-main').style.width = '1700px'
+            document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1700px'
+            document.getElementsByClassName('navbar')[0].style.minWidth = '1700px'
+          }, 400)
+          break
+        case 'ProjectPlanningManagementQuery': // 项目计划查询
+          this.timer = setTimeout(() => {
+            document.getElementById('app-main').style.width = '1700px'
+            document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1700px'
+            document.getElementsByClassName('navbar')[0].style.minWidth = '1700px'
+          }, 400)
+          break
+        case 'CreatingPurchasingMaterials': // 外购备料
+          this.timer = setTimeout(() => {
+            document.getElementById('app-main').style.width = '1680px'
+            document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1680px'
+            document.getElementsByClassName('navbar')[0].style.minWidth = '1680px'
+          }, 400)
+          break
+        case 'RequestOutsourcingMaterials': // 外购备料请款
+          this.timer = setTimeout(() => {
+            document.getElementById('app-main').style.width = '1710px'
+            document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1710px'
+            document.getElementsByClassName('navbar')[0].style.minWidth = '1710px'
+          }, 400)
+          break
+        case 'OutsourcingMaterialsInvoice': // 外购备料到票
+          this.timer = setTimeout(() => {
+            document.getElementById('app-main').style.width = '1690px'
+            document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1690px'
+            document.getElementsByClassName('navbar')[0].style.minWidth = '1690px'
+          }, 400)
+          break
+        case 'OfflineProcurement': // 外购备料(离线)
+          this.timer = setTimeout(() => {
+            document.getElementById('app-main').style.width = '1700px'
+            document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1700px'
+            document.getElementsByClassName('navbar')[0].style.minWidth = '1700px'
+          }, 400)
+          break
+        case 'AutomaticScheduling': // 车间排产
+          this.timer = setTimeout(() => {
+            document.getElementById('app-main').style.width = '1910px'
+            document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1910px'
+            document.getElementsByClassName('navbar')[0].style.minWidth = '1910px'
+          }, 400)
+          break
+        case 'PurchaseTaskAllocate': // 采购任务分配
+          this.timer = setTimeout(() => {
+            document.getElementById('app-main').style.width = '1680px'
+            document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1680px'
+            document.getElementsByClassName('navbar')[0].style.minWidth = '1680px'
+          }, 400)
+          break
+        case 'AssemblyTaskAssignment': // 装配任务分配
+          this.timer = setTimeout(() => {
+            document.getElementById('app-main').style.width = '1690px'
+            document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1690px'
+            document.getElementsByClassName('navbar')[0].style.minWidth = '1690px'
+          }, 400)
+          break
+        case 'OutsourcingMaterialsSearch': // 备料查询
+          this.timer = setTimeout(() => {
+            document.getElementById('app-main').style.width = '1500px'
+            document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1500px'
+            document.getElementsByClassName('navbar')[0].style.minWidth = '1500px'
+          }, 400)
+          break
+        case 'PurchaseSituationSearchMetalworking': // 制造采购件查询
+          this.timer = setTimeout(() => {
+            document.getElementById('app-main').style.width = '1620px'
+            document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1620px'
+            document.getElementsByClassName('navbar')[0].style.minWidth = '1620px'
+          }, 400)
+          break
+        case 'ParseQuery': // 备料查询
+          this.timer = setTimeout(() => {
+            document.getElementById('app-main').style.width = '1710px'
+            document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1710px'
+            document.getElementsByClassName('navbar')[0].style.minWidth = '1710px'
+          }, 400)
+          break
+        case 'MaterialPreparationContractQuery': // 备料合同查询
+          this.timer = setTimeout(() => {
+            document.getElementById('app-main').style.width = '1710px'
+            document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1710px'
+            document.getElementsByClassName('navbar')[0].style.minWidth = '1710px'
+          }, 400)
+          break
+        case 'PurchaseContractRequestFund1': // 合同请款(制造)
+          this.timer = setTimeout(() => {
+            document.getElementById('app-main').style.width = '1510px'
+            document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1510px'
+            document.getElementsByClassName('navbar')[0].style.minWidth = '1510px'
+          }, 400)
+          break
+        default:
+          this.timer = setTimeout(() => {
+            document.getElementById('app-main').style.width = '100%'
+            document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '100%'
+            document.getElementsByClassName('navbar')[0].style.minWidth = '100%'
+          }, 400)
+      }
+      if (this.$route.name) {
+        return this.$route
+      }
+      return false
+    },
+    isActive(route) {
+      return route.path === this.$route.path || route.name === this.$route.name
+    },
+    addViewTags() {
+      const route = this.generateRoute()
+      if (!route) {
+        return false
+      }
+      this.$store.dispatch('addVisitedViews', route)
+    },
+    moveToCurrentTag() {
+      const tags = this.$refs.tag
+      this.$nextTick(() => {
+        for (const tag of tags) {
+          if (tag.to === this.$route.path) {
+            this.$refs.scrollPane.moveToTarget(tag.$el)
+            break
+          }
+        }
+      })
+    },
+    refreshSelectedTag() {
+      this.$nextTick(() => {
+        this.reload() // 2019.6.2 cjn
+      })
+    },
+    closeSelectedTag(view) {
+      this.$store.dispatch('delVisitedViews', view).then((views) => {
+        if (this.isActive(view)) {
+          const latestView = views.slice(-1)[0]
+          if (latestView) {
+            this.$router.push(latestView.path)
+          } else {
+            this.$router.push('/')
+          }
+        }
+      })
+    },
+    closeOthersTags() {
+      this.$router.push(this.selectedTag.path)
+      this.$store.dispatch('delOthersViews', this.selectedTag).then(() => {
+        this.moveToCurrentTag()
+      })
+    },
+    closeAllTags() {
+      this.$store.dispatch('delAllViews')
+      this.$router.push('/')
+    },
+    openMenu(tag, e) {
+      const status = Cookies.get('sidebarStatus')
+      this.visible = true
+      this.selectedTag = tag
+      this.tagLeft = e.clientX
+      if (status === '0') this.tagLeft = parseInt(e.clientX) - 200
+      this.tagTop = e.clientY
+    },
+    closeMenu() {
+      this.visible = false
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .tags-view-container {
+    .tags-view-wrapper {
+      background: #ffffff;
+      height: 34px;
+      border-bottom: 1px solid #d8dce5;
+      box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
+      .tags-view-item {
+        display: inline-block;
+        position: relative;
+        height: 26px;
+        line-height: 26px;
+        border: 1px solid rgb(52,119,190);
+        color:  rgb(52,119,190);
+        background: white;
+        padding: 0 8px;
+        font-size: 12px;
+        margin-left: 5px;
+        margin-top: 4px;
+        &:first-of-type {
+          margin-left: 15px;
+        }
+        &.active {
+          /*background-color: rgb(52,119,190);*/
+          background-color: #2A71CA;
+          color: #ffffff;
+          border-color: #ffffff;
+          &::before {
+            content: '';
+            background: #ffffff;
+            display: inline-block;
+            width: 8px;
+            height: 8px;
+            border-radius: 50%;
+            position: relative;
+            margin-right: 2px;
+          }
+        }
+      }
+    }
+    .contextmenu {
+      margin: 0;
+      background: #fff;
+      z-index: 2;
+      position: absolute;
+      list-style-type: none;
+      padding: 5px 0;
+      border-radius: 4px;
+      font-size: 12px;
+      font-weight: 400;
+      color: #333;
+      box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
+      li {
+        margin: 0;
+        padding: 7px 16px;
+        cursor: pointer;
+        &:hover {
+          background: #eee;
+        }
+      }
+    }
+  }
+</style>
+
+<style rel="stylesheet/scss" lang="scss">
+  //reset element css of el-icon-close
+  .tags-view-wrapper {
+    .tags-view-item {
+      .el-icon-close {
+        width: 16px;
+        height: 16px;
+        vertical-align: 2px;
+        border-radius: 50%;
+        text-align: center;
+        transition: all .3s cubic-bezier(.645, .045, .355, 1);
+        transform-origin: 100% 50%;
+        &:before {
+          transform: scale(.6);
+          display: inline-block;
+          vertical-align: -3px;
+        }
+        &:hover {
+          background-color: #b4bccc;
+          color: #fff;
+        }
+      }
+    }
+  }
+</style>

src/views/layout_HL/components/index.js

@@ -0,0 +1,4 @@
+export { default as Navbar } from './Navbar'
+export { default as Sidebar } from './Sidebar'
+export { default as AppMain } from './AppMain'
+export { default as TagsView } from './TagsView'

src/views/layout_HL/mixin/ResizeHandler.js

@@ -0,0 +1,52 @@
+import store from '@/store'
+
+const { body } = document
+const WIDTH = 1024
+const RATIO = 3
+
+export default {
+  watch: {
+    $route(route) {
+      if (this.device === 'mobile' && this.sidebar.opened) {
+        store.dispatch('CloseSideBar', { withoutAnimation: false })
+      }
+    }
+  },
+  beforeMount() {
+    window.addEventListener('resize', this.resizeHandler)
+  },
+  mounted() {
+    const isMobile = this.isMobile()
+    const isSmallDesktop = this.isSmallDesktop()
+    if (isSmallDesktop) {
+      store.dispatch('CloseSideBar', { withoutAnimation: false })
+    }
+    if (isMobile) {
+      store.dispatch('ToggleDevice', 'mobile')
+      store.dispatch('CloseSideBar', { withoutAnimation: true })
+    }
+  },
+  methods: {
+    isMobile() {
+      const rect = body.getBoundingClientRect()
+      return rect.width - RATIO < WIDTH
+    },
+    isSmallDesktop() {
+      const rect = body.getBoundingClientRect()
+      return rect.width - RATIO < 1300
+    },
+    resizeHandler() {
+      if (!document.hidden) {
+        const isMobile = this.isMobile()
+        const isSmallDesktop = this.isSmallDesktop()
+        store.dispatch('ToggleDevice', isMobile ? 'mobile' : 'desktop')
+        if (isSmallDesktop) {
+          store.dispatch('CloseSideBar', { withoutAnimation: false })
+        }
+        if (isMobile) {
+          store.dispatch('CloseSideBar', { withoutAnimation: true })
+        }
+      }
+    }
+  }
+}

static/config.js

@@ -4,8 +4,8 @@ export const name1_config = `OP1000`
 export const name3_config = `OP2000`
 export const name4_config = `OP9999`
 
-// var url = `http://192.168.1.27:8010`
 var url = `http://localhost:8100`
+// var url = `http://124.220.15.242:8104`
 
 export const readFile_config = url + `/webpage/file/` // invoice
 export const readImg_config = url + `/webpage/img/` // delivery/MS/performancebond