工具更新 2022-07-15 sxm

4 years ago · bb3df420d5
4 changed files with 258 additions and 219 deletions
--- a/src/views/modules/knifemold/tool-oi-record.vue
+++ b/src/views/modules/knifemold/tool-oi-record.vue
@ -332,6 +332,23 @@
            fixed: '',
            columnWidth: 80,
          },
+          {
+            userId: this.$store.state.user.name,
+            serialNumber: 'toolOIRecordRemark',
+            tableId: "toolOIRecord",
+            tableName: "toolOIRecord",
+            columnProp: "remark",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "备注",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 160,
+          },
          {
            userId: this.$store.state.user.name,
            serialNumber: 'toolOIRecordUserId',
@ -596,7 +613,7 @@
      //  --------- 导出 end ----------
    },
    created() {
-      this.getTableUserColumn()
+      //    this.getTableUserColumn()
      this.getFunctionButtonList()
    }
  }
--- a/src/views/modules/purchaseorder/purchaseRequisition.vue
+++ b/src/views/modules/purchaseorder/purchaseRequisition.vue
@ -718,6 +718,36 @@
            status: true,
            fixed: false
          },
+          {
+            userId: this.$store.state.user.name,
+            tableId: this.$route.meta.menuId + 'PR02',
+            tableName: "reviewDetails",
+            columnProp: "userName",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "步骤审批人",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false
+          },
+          {
+            userId: this.$store.state.user.name,
+            tableId: this.$route.meta.menuId + 'PR02',
+            tableName: "reviewDetails",
+            columnProp: "actAuthorizeDate",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "审批时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false
+          },
          {
            userId: this.$store.state.user.name,
            tableId: this.$route.meta.menuId + 'PR02',
--- a/src/views/modules/warehouse/location.vue
+++ b/src/views/modules/warehouse/location.vue
@ -1,10 +1,40 @@
 <template>
  <div class="mod-config">
+    <el-row>
+      <el-col :span="24">
        <div>
        <span @click="favoriteFunction()">
         <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>
        </span>
        </div>
+        <el-button @click="getDataList()" type="primary">{{buttons.search}}</el-button>
+        <el-button @click="initModel()" type="primary">{{buttons.add}}</el-button>
+        <el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{buttons.defaultTable}}
+        </el-button>
+        <el-button @click="userSetting" type="primary">{{ buttons.settingTable}}</el-button>
+        <download-excel
+          :fields="fields()"
+          :data="exportData"
+          type="xls"
+          :name="exportName"
+          :header="exportHeader"
+          :footer="exportFooter"
+          :defaultValue="exportDefaultValue"
+          :fetch="createExportData"
+          :before-generate="startDownload"
+          :before-finish="finishDownload"
+          worksheet="导出信息"
+          class="el-button el-button--primary el-button--medium">
+          {{buttons.download}}
+        </download-excel>
+
+        <el-button v-if="isAuth(':prd:delete')" type="danger" @click="deleteHandle()"
+                   :disabled="dataListSelections.length <= 0">{{ buttons.deleteList}}
+        </el-button>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="24">
        <el-form :inline="true" label-position="top">
          <el-form-item :label="inputLabel.headerInput.label1">
            <el-input style="width: 100px;" v-model="queryHeaderData.locationId"></el-input>
@ -34,39 +64,11 @@
              </el-option>
            </el-select>
          </el-form-item>
-      <el-form-item style="margin-top: 20px;">
-        <el-button @click="getDataList()" type="primary">{{buttons.search}}</el-button>
-      </el-form-item>
-
-      <el-form-item style="margin-top: 20px;">
-        <el-button @click="initModel()" type="primary">{{buttons.add}}</el-button>
-        <el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{buttons.defaultTable}}
-        </el-button>
-        <el-button @click="userSetting" type="primary">{{ buttons.settingTable}}</el-button>
-        <download-excel
-          :fields="fields()"
-          :data="exportData"
-          type="xls"
-          :name="exportName"
-          :header="exportHeader"
-          :footer="exportFooter"
-          :defaultValue="exportDefaultValue"
-          :fetch="createExportData"
-          :before-generate="startDownload"
-          :before-finish="finishDownload"
-          worksheet="导出信息"
-          class="el-button el-button--primary el-button--medium">
-          {{buttons.download}}
-        </download-excel>
-
-        <el-button v-if="isAuth(':prd:delete')" type="danger" @click="deleteHandle()"
-                   :disabled="dataListSelections.length <= 0">{{ buttons.deleteList}}
-        </el-button>
-      </el-form-item>
-    </el-form>
-    <el-form>
-
        </el-form>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="24">
        <el-table
          id="commmon"
          :height="height"
@ -103,7 +105,6 @@
            </template>
          </el-table-column>
        </el-table>
-
        <el-pagination
          @size-change="sizeChangeHandle"
          @current-change="currentChangeHandle"
@ -113,14 +114,16 @@
          :total="totalPage"
          layout="total, sizes, prev, pager, next, jumper">
        </el-pagination>
-
+      </el-col>
+    </el-row>
    <column v-if="visible" ref="column" @refreshData="getTableUserColumn"></column>

-
-      <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag :title="inputLabel.headerInput.label5" :visible.sync="setUp.reviewFlag" width="325px">
+    <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag
+               :title="inputLabel.headerInput.label5" :visible.sync="setUp.reviewFlag" width="325px">
      <el-form :inline="true" label-position="top">
        <el-form-item :label="inputLabel.headerInput.label1">
-            <el-input style="width: 130px;" :readonly = "setUp.readonlyFlag?'readonly':false" oninput="this.value = this.value.toUpperCase()" v-model="saveHeaderData.locationId"></el-input>
+          <el-input style="width: 130px;" :readonly="setUp.readonlyFlag?'readonly':false"
+                    oninput="this.value = this.value.toUpperCase()" v-model="saveHeaderData.locationId"></el-input>
        </el-form-item>
        <el-form-item :label="inputLabel.headerInput.label2">
          <el-input style="width: 130px;" v-model="saveHeaderData.locationName"></el-input>
@ -149,8 +152,9 @@
        </el-form-item>
      </el-form>
      <span slot="footer" class="dialog-footer">
-      <el-button @click="setUp.reviewFlag = false">取消</el-button>
            <el-button type="primary" :disabled="setUp.saveButton" @click="saveHeaderFunction()">确定</el-button>
+            <el-button type="primary" @click="setUp.reviewFlag = false">取消</el-button>
+
    </span>
    </el-dialog>

@ -189,6 +193,7 @@ import {
    saveLocation,
    delLocation,
  } from '@/api/warehouse/location.js'
+
  export default {
    components: {
      column
@ -539,7 +544,7 @@ import {
    },
    mounted() {
      this.$nextTick(() => {
-        this.height = window.innerHeight - 200;
+        this.height = window.innerHeight - 220;
      })
    },
    activated() {
@ -594,29 +599,14 @@ import {
      },
      saveHeaderFunction() {
        this.setUp.saveButton = true
-        if(this.saveHeaderData.locationId == ''){
-          this.$alert("请输入库位编码！", '操作提示', {
-            confirmButtonText: '确定',
-            callback: action => {
+        if (!this.saveHeaderData.locationId) {
+          this.$message.warning('请输入库位编码!')
          this.setUp.saveButton = false
-            }
-          });
          return
-        }else if(this.saveHeaderData.locationName == ''){
-          this.$alert("请输入库位名称！", '操作提示', {
-            confirmButtonText: '确定',
-            callback: action => {
-              this.setUp.saveButton = false
        }
-          });
-          return
-        }else if(this.saveHeaderData.warehouseId == ''){
-          this.$alert("请选择库房名称！", '操作提示', {
-            confirmButtonText: '确定',
-            callback: action => {
+        if (!this.saveHeaderData.warehouseId) {
+          this.$message.warning('请选择仓库名称!')
          this.setUp.saveButton = false
-            }
-          });
          return
        }
        saveLocation(this.saveHeaderData).then(({data}) => {
@ -925,6 +915,7 @@ import {
  .wrapper {
    height: calc(100% - 40px);
  }
+
  .sl-input {
    background-color: transparent;
    border: 0 !important;
@ -940,6 +931,7 @@ import {
    outline: none;

  }
+
  .sl-svg {
    overflow: hidden;
    float: right;
--- a/static/config/index-prod.js
+++ b/static/config/index-prod.js
@ -5,7 +5,7 @@
  window.SITE_CONFIG = {};

  // api接口请求地址
-  window.SITE_CONFIG['baseUrl'] = 'http://192.168.1.83:9091';
+  window.SITE_CONFIG['baseUrl'] = 'http://192.168.1.2:9096';

  // cdn地址 = 域名 + 版本号
  window.SITE_CONFIG['domain']  = './'; // 域名