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

2 years ago · fb3996cc57
parent 38312821e6 59d52457b4
commit fb3996cc57
11 changed files with 1880 additions and 463 deletions
--- a/.env.development
+++ b/.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"

--- a/.env.production
+++ b/.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/'

 # 漳州中医院
--- a/src/api/system/headSet.js
+++ b/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
+  });
+}
--- a/src/views/basic/busType/bussinessType.vue
+++ b/src/views/basic/busType/bussinessType.vue
@ -47,13 +47,13 @@
          <el-button type="primary" icon="el-icon-plus" @click="handleAddClick">新增</el-button>
          <el-button type="primary" icon="el-icon-download" @click="exportJsonFile">导出单据类型</el-button>
          <el-upload
-            :action="uploadFileUrl"
-            multiple
-            :limit="3"
-            :headers="headers"
-            :show-file-list="false"
-            :on-success="handleChange"
-            :file-list="fileList"
+              :action="uploadFileUrl"
+              multiple
+              :limit="3"
+              :headers="headers"
+              :show-file-list="false"
+              :on-success="handleChange"
+              :file-list="fileList"
          >
            <el-button icon="el-icon-upload2" type="primary">导入单据类型</el-button>
          </el-upload>
@ -93,15 +93,15 @@
        <el-table-column label="操作">
          <template slot-scope="scope">
            <el-button
-              type="text"
-              @click.native.stop="handleModifyClick(scope.row)"
+                type="text"
+                @click.native.stop="handleModifyClick(scope.row)"
            >编辑
            </el-button
            >
            <el-button
-              type="text"
-              :disabled="!configParams.typeScan"
-              @click.native.stop="deleteDialog(scope.row)"
+                type="text"
+                :disabled="!configParams.typeScan"
+                @click.native.stop="deleteDialog(scope.row)"
            >删除
            </el-button
            >
@ -111,14 +111,14 @@
      </el-table>

      <el-dialog
-        title="新增扫码单据类型"
-        :visible.sync="addDialogVisible"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        v-if="addDialogVisible"
-        class="dialog-two"
-        width="60%"
-        top="5vh"
+          title="新增扫码单据类型"
+          :visible.sync="addDialogVisible"
+          :close-on-click-modal="false"
+          :close-on-press-escape="false"
+          v-if="addDialogVisible"
+          class="dialog-two"
+          width="60%"
+          top="5vh"
      >
        <modifyDialog :inputQuery="inputQuery"></modifyDialog>
        <div slot="footer" class="dialog-footer">
@ -136,13 +136,13 @@
      </el-dialog>

      <el-dialog
-        title="编辑单据类型"
-        :visible.sync="modifyDialogVisible"
-        width="70%"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        v-if="modifyDialogVisible"
-        :before-close="cancelDialog"
+          title="编辑单据类型"
+          :visible.sync="modifyDialogVisible"
+          width="70%"
+          :close-on-click-modal="false"
+          :close-on-press-escape="false"
+          v-if="modifyDialogVisible"
+          :before-close="cancelDialog"
      >
        <modifyDialog :inputQuery="inputQuery" :modifySubmit="onModifySubmit"></modifyDialog>
        <div style="text-align: center;margin-top: 12px">
@ -159,11 +159,11 @@
      </el-dialog>

      <pagination
-        v-show="total>0"
-        :total="total"
-        :limit.sync="filterQuery.limit"
-        :page.sync="filterQuery.page"
-        @pagination="getList"
+          v-show="total>0"
+          :total="total"
+          :limit.sync="filterQuery.limit"
+          :page.sync="filterQuery.page"
+          @pagination="getList"
      ></pagination>
    </el-card>
  </div>
@ -208,6 +208,7 @@ export default {
        checkPdaUn: null,
        checkPc: null,
        checkWebNew: null,
+        checkWebNewType: null,
        checkChange: null,
        checkCopy: null,
        secCheckUdims: null,
@ -316,20 +317,20 @@ export default {
    getList() {
      this.loading = true
      getBusTypeList(this.filterQuery)
-        .then((response) => {
-          if (response.code === 20000) {
-            this.list = response.data.list || []
-            this.total = response.data.total || 0
-          } else {
-            this.$message.error(response.message)
-          }
-          this.loading = false
-        })
-        .catch(() => {
-          this.loading = false
-          this.list = []
-          this.total = 0
-        })
+          .then((response) => {
+            if (response.code === 20000) {
+              this.list = response.data.list || []
+              this.total = response.data.total || 0
+            } else {
+              this.$message.error(response.message)
+            }
+            this.loading = false
+          })
+          .catch(() => {
+            this.loading = false
+            this.list = []
+            this.total = 0
+          })
    },
    handleCurrentChange(val) {
      this.filterQuery.page = val
@ -392,18 +393,18 @@ export default {
      //   return;
      // }
      insertBusType(this.inputQuery)
-        .then((response) => {
-          if (response.code == 20000) {
+          .then((response) => {
+            if (response.code == 20000) {
+              this.loading = false
+              this.cancelDialog()
+              this.getList()
+            } else {
+              this.$message.error(response.message)
+            }
+          })
+          .catch(() => {
            this.loading = false
-            this.cancelDialog()
-            this.getList()
-          } else {
-            this.$message.error(response.message)
-          }
-        })
-        .catch(() => {
-          this.loading = false
-        });
+          });
    },

    onModifySubmit() {
@ -438,26 +439,26 @@ export default {
      // }

      updateBusType(this.inputQuery)
-        .then((response) => {
-          if (response.code == 20000) {
+          .then((response) => {
+            if (response.code == 20000) {
+              this.loading = false
+              this.cancelDialog()
+              this.getList()
+            } else {
+              this.$message.error(response.message)
+            }
+          })
+          .catch(() => {
            this.loading = false
            this.cancelDialog()
-            this.getList()
-          } else {
-            this.$message.error(response.message)
-          }
-        })
-        .catch(() => {
-          this.loading = false
-          this.cancelDialog()
-        })
+          })
    },
    exportJsonFile() {
      exportFile().then((response) => {
        const binaryData = []
        binaryData.push(response)
        let url = window.URL.createObjectURL(
-          new Blob(binaryData, {type: 'application/json'})
+            new Blob(binaryData, {type: 'application/json'})
        )
        this.loading = false
        const eleLink = document.createElement('a')
@ -492,6 +493,7 @@ export default {
        checkPdaUn: null,
        checkPc: null,
        checkWebNew: null,
+        checkWebNewType:null,
        checkChange: null,
        checkCopy: null,
        secCheckUdims: null,
@ -566,11 +568,11 @@ export default {
        cancelButtonText: '取消',
        type: 'warning'
      })
-        .then(() => {
-          this.deleteOrders(rowId)
-        })
-        .catch(() => {
-        })
+          .then(() => {
+            this.deleteOrders(rowId)
+          })
+          .catch(() => {
+          })
    },

    deleteOrders(data) {
@ -579,20 +581,20 @@ export default {
        id: data.id + ''
      }
      deleteBusType(tquery)
-        .then((response) => {
-          this.getList()
-          if (response.code == 20000) {
-            this.$message({
-              type: 'success',
-              message: '删除成功！'
-            })
-          } else {
-            this.$message.error(response.message)
-          }
+          .then((response) => {
+            this.getList()
+            if (response.code == 20000) {
+              this.$message({
+                type: 'success',
+                message: '删除成功！'
+              })
+            } else {
+              this.$message.error(response.message)
+            }

-        })
-        .catch(() => {
-        })
+          })
+          .catch(() => {
+          })
    },
    handleChange(response, files, fileList) {
      if (response.code != 20000) {
@ -611,13 +613,13 @@ export default {
    },
    getSyncConfig() {
      findConfig()
-        .then((response) => {
-          if (response.code == 20000) {
-            this.configParams = response.data
-          }
-        })
-        .catch(() => {
-        })
+          .then((response) => {
+            if (response.code == 20000) {
+              this.configParams = response.data
+            }
+          })
+          .catch(() => {
+          })
    }
  },
  components: {
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/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">
--- a/src/views/basic/product/product.vue
+++ b/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"
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
--- a/src/views/inout/IoAuditedOrderTest.vue
+++ b/src/views/inout/IoAuditedOrderTest.vue
--- a/src/views/inout/tableHeadSet.vue
+++ b/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>
--- a/src/views/inventory/DeptDeviceDetail.vue
+++ b/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]"
--- a/src/views/system/head/addHeadData.vue
+++ b/src/views/system/head/addHeadData.vue
@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "AddHeadData"
+}
+</script>
+
+<style scoped>
+
+</style>