Merge remote-tracking branch 'origin/dev2.0' into dev2.0

.env.development

@@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI管理系统
 ENV = 'development'
 
 # 开发环境
-VUE_APP_BASE_API = 'http://192.168.0.166:9991'
+VUE_APP_BASE_API = 'http://127.0.0.1:9991'
 
 VUE_APP_SYNC_API ="http://127.0.0.1:10001"
 

.env.production

@@ -26,15 +26,14 @@ VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:83/UDI_WMS_MC/'
 # 文明东2
 # VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/'
 
-# 东旭
-# VUE_APP_BASE_API = 'http://192.168.0.153:9150/UDI_WMS_MC/'
 刘恩典
 #  VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/'
 
 # 平潭正式
 # VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
 
-# 吴总测试服务器
+# 吴总测试服务器.
+
 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
 
 # 漳州中医院

src/api/system/headSet.js

@@ -0,0 +1,10 @@
+import axios from '@/utils/request'
+
+
+export function getHeadSet(query) {
+  return axios({
+    url: "/udiwms/sys/table/head/find",
+    method: "get",
+    params: query
+  });
+}

src/views/basic/busType/bussinessType.vue

@@ -208,6 +208,7 @@ export default {
         checkPdaUn: null,
         checkPc: null,
         checkWebNew: null,
+        checkWebNewType: null,
         checkChange: null,
         checkCopy: null,
         secCheckUdims: null,
@@ -492,6 +493,7 @@ export default {
         checkPdaUn: null,
         checkPc: null,
         checkWebNew: null,
+        checkWebNewType:null,
         checkChange: null,
         checkCopy: null,
         secCheckUdims: null,

src/views/basic/busType/bussinessTypeModify.vue

@@ -556,7 +556,6 @@
                   <el-option label="有三期业务单配/拣货" :value="1"></el-option>
                   <el-option label="无三期业务单配/拣货" :value="2"></el-option>
                   <el-option label="有三期业务单校验" :value="3"></el-option>
-
                 </el-select>
               </el-col>
               <el-divider direction="vertical"></el-divider>
@@ -565,6 +564,25 @@
               </el-col>
             </el-row>
             <el-divider></el-divider>
+            <el-row v-if="inputQuery.checkWebNew == 3">
+              <el-col span="5">
+                <span class="sptext">有三期业务单校验方式</span>
+              </el-col>
+              <el-divider direction="vertical"></el-divider>
+              <el-col span="5">
+                <el-select v-model="inputQuery.checkWebNewType" style="width: 75%" :disabled="!inputQuery.checkEnable"
+                           placeholder="有三期业务单校验方式"
+                >
+                  <el-option label="扫码结果提交" :value="0"></el-option>
+                  <el-option label="比对结果提交" :value="1"></el-option>
+                </el-select>
+              </el-col>
+              <el-divider direction="vertical"></el-divider>
+              <el-col span="13">
+                <span class="sptext">有三期业务单校验方式</span>
+              </el-col>
+            </el-row>
+            <el-divider v-if="inputQuery.checkWebNew == 3"></el-divider>
 
             <el-row>
               <el-col span="5">

src/views/basic/product/product.vue

@@ -206,7 +206,7 @@
               >查询
               </el-button
               >
-              <!--              <el-button type="primary" icon="el-icon-plus" @click="editUdiType">物资分类管理</el-button>-->
+              <el-button type="primary" icon="el-icon-plus" @click="editUdiType">物资分类管理</el-button>
               <el-button
                 type="primary"
                 icon="el-icon-plus"

src/views/inout/tableHeadSet.vue

@@ -0,0 +1,107 @@
+<template>
+  <div class="table-head">
+    <p class="tip">
+      <i class="el-icon-s-opportunity"></i>
+      <span> 可拖动行排序</span>
+    </p>
+    <el-table
+        row-key="prop"
+        :data="tableShowList">
+      <el-table-column prop="label" label="表头名称" align="center"></el-table-column>
+      <el-table-column label="是否显示" width="120" align="center">
+        <template slot-scope="scope">
+          <el-checkbox v-model="scope.row.isShow"></el-checkbox>
+        </template>
+      </el-table-column>
+      <el-table-column label="调整顺序" width="120" align="center">
+        <template slot-scope="scope">
+          <i class="el-icon-rank"></i>
+        </template>
+      </el-table-column>
+      <el-table-column label="调整表头宽度">
+        <template slot-scope="scope">
+          <div class="flex-col">
+            <div>
+              <el-radio v-model="scope.row.isAuto" :label="true">自适应</el-radio>
+            </div>
+            <div>
+              <el-radio v-model="scope.row.isAuto" :label="false">固定宽度</el-radio>
+              <el-input-number v-show="!scope.row.isAuto" v-model="scope.row.width" size="mini"
+                               controls-position="right" :min="100" :max="300"></el-input-number>
+            </div>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div slot="footer" class="dialog-footer tc">
+      <el-button size="medium" class="btn-wh" @click="isTableHead = false">关闭</el-button>
+      <el-button size="medium" class="btn-blue" type="primary" @click="saveTableHead()">保存</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import Sortable from 'sortablejs';
+
+export default {
+  name: "tableHead",
+  props: {
+    tableShowList: Array
+  },
+  data() {
+    return {
+      isTableHead: false
+    };
+  },
+  methods: {
+    rowDrop() {
+      debugger
+      const tbody = document.querySelector('.table-head .el-table__body-wrapper tbody');
+      const _this = this;
+      Sortable.create(tbody, {
+        onEnd({newIndex, oldIndex}) {
+          const currRow = _this.tableShowList.splice(oldIndex, 1)[0];
+          _this.tableShowList.splice(newIndex, 0, currRow);
+        }
+      });
+    },
+    saveTableHead() {
+      this.isTableHead = false;
+      this.$emit('saveTableHead', this.tableShowList);
+    },
+
+  },
+  created() {
+    debugger
+    this.rowDrop();
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.table-head {
+
+  .tip {
+
+    i {
+      color: #E6A23C;
+    }
+
+    font-size: 14px;
+    padding-bottom: 10px;
+  }
+
+  .el-icon-rank {
+    font-size: 18px;
+    margin-left: 20px;
+    cursor: move;
+  }
+
+  .point {
+    color: #66b1ff;
+
+    &:hover {
+      color: #1A3679;
+    }
+  }
+}
+</style>

src/views/inventory/DeptDeviceDetail.vue

@@ -190,6 +190,12 @@
       </el-tab-pane>
       <el-tab-pane label="相关人员">
       </el-tab-pane>
+      <el-tab-pane label="维修记录">
+      </el-tab-pane>
+      <el-tab-pane label="巡检记录">
+      </el-tab-pane>
+      <el-tab-pane label="使用记录">
+      </el-tab-pane>
     </el-tabs>
     <el-dialog
       :title="formMap[formName]"

src/views/system/head/addHeadData.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "AddHeadData"
+}
+</script>
+
+<style scoped>
+
+</style>