Procházet zdrojové kódy

Merge branch 'master' of http://git.echepei.com/zhujiawei/Warehouse_management_ui

翁玉文 před 4 roky
rodič
revize
9a43b360ad

+ 10 - 0
src/api/system/auditPaths-add-or-update.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 新增财务数据主
+export function addCharge(data) {
+  return request({
+    url: '/warehouse/paths/add',
+    method: 'post',
+    data: data
+  })
+}

+ 7 - 0
src/api/system/toConfigure.js

@@ -8,3 +8,10 @@ export function addCharge(data) {
     data: data
   })
 }
+//删除主表
+export function delCharge(fId) {
+  return request({
+    url: '/warehouse/paths/' + fId,
+    method: 'delete'
+  })
+}

+ 18 - 6
src/views/basicdata/corps/index.vue

@@ -107,12 +107,23 @@
 
     <el-table v-loading="loading" :data="corpsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="客户类别" align="center" prop="fTypeid" :formatter="fTypeidFormat" />
+      <el-table-column
+        :show-overflow-tooltip="true"
+        label="客户类别" align="center" prop="fTypeid" :formatter="fTypeidFormat" />
       <el-table-column label="编号" align="center" prop="fNo" />
-      <el-table-column label="名称" align="center" prop="fName" />
-      <el-table-column label="简称" align="center" prop="fCname" />
-      <el-table-column label="英文名称" align="center" prop="fEname" />
-      <el-table-column label="电话" align="center" prop="fTel" />
+      <el-table-column
+        :show-overflow-tooltip="true"
+        label="名称" align="center" prop="fName"
+      />
+      <el-table-column
+        :show-overflow-tooltip="true"
+        label="简称" align="center" prop="fCname" />
+      <el-table-column
+        :show-overflow-tooltip="true"
+        label="英文名称" align="center" prop="fEname" />
+      <el-table-column
+        :show-overflow-tooltip="true"
+        label="电话" align="center" prop="fTel" />
 
       <el-table-column label="录入人" align="center" prop="createBy" />
       <el-table-column label="录入时间" align="center" prop="createTime" width="180">
@@ -136,7 +147,8 @@
           ></el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
+      <el-table-column
+        label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
         <template slot-scope="scope">
           <el-button

+ 5 - 5
src/views/basicdata/fees/index.vue

@@ -119,13 +119,13 @@
     <el-table v-loading="loading" :data="feesList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="index" label="序号" align="center"/>
-      <el-table-column label="编号" align="center" prop="fNo" />
-      <el-table-column label="名称" align="center" prop="fName" />
-      <el-table-column label="费用属性" align="center" prop="fFeetype" :formatter="fFeetypeFormat" />
+      <el-table-column label="编号" align="center" prop="fNo" :show-overflow-tooltip="true" />
+      <el-table-column label="名称" align="center" prop="fName" :show-overflow-tooltip="true" />
+      <el-table-column label="费用属性" align="center" prop="fFeetype" :formatter="fFeetypeFormat"  />
       <el-table-column label="计量单位" align="center" prop="fFeeunitid" :formatter="fFeeunitidFormat" />
-      <el-table-column label="币种" align="center" prop="fCurrency" />
+      <el-table-column label="币种" align="center" prop="fCurrency" :show-overflow-tooltip="true"  />
       <el-table-column label="状态" align="center" prop="fStatus" :formatter="statusFormat" />
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

+ 8 - 8
src/views/basicdata/goods/index.vue

@@ -146,13 +146,13 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="index" label="序号" align="center"/>
       <!--<el-table-column label="存储id" align="center" prop="fTypeid" />--><!-- 后期添加 -->
-      <el-table-column label="编号" align="center" prop="fNo" />
-      <el-table-column label="名称" align="center" prop="fName" />
-      <el-table-column label="英文名称" align="center" prop="fEnam" />
-      <el-table-column label="规格" align="center" prop="fSpecs" />
-      <el-table-column label="包装规格" align="center" prop="fPackagespecs" />
-      <el-table-column label="颜色" align="center" prop="fColor" />
-      <el-table-column label="海关编码" align="center" prop="fHscode" />
+      <el-table-column label="编号" align="center" prop="fNo" :show-overflow-tooltip="true" />
+      <el-table-column label="名称" align="center" prop="fName" :show-overflow-tooltip="true" />
+      <el-table-column label="英文名称" align="center" prop="fEnam" :show-overflow-tooltip="true" />
+      <el-table-column label="规格" align="center" prop="fSpecs" :show-overflow-tooltip="true" />
+      <el-table-column label="包装规格" align="center" prop="fPackagespecs" :show-overflow-tooltip="true"  />
+      <el-table-column label="颜色" align="center" prop="fColor" :show-overflow-tooltip="true" />
+      <el-table-column label="海关编码" align="center" prop="fHscode" :show-overflow-tooltip="true" />
       <el-table-column label="包装类型" align="center" prop="fPackageid" />
       <el-table-column label="状态" align="center" prop="fStatus" >
         <template slot-scope="scope">
@@ -164,7 +164,7 @@
           ></el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
         <template slot-scope="scope">
           <el-button

+ 4 - 4
src/views/basicdata/warehouse/index.vue

@@ -98,9 +98,9 @@
     <el-table v-loading="loading" :data="warehouseList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="index" label="序号" align="center"/>
-      <el-table-column label="编号" align="center" prop="fNo" />
-      <el-table-column label="名称" align="center" prop="fName" />
-      <el-table-column label="地址" align="center" prop="fAddr" />
+      <el-table-column label="编号" align="center" prop="fNo" :show-overflow-tooltip="true" />
+      <el-table-column label="名称" align="center" prop="fName" :show-overflow-tooltip="true" />
+      <el-table-column label="地址" align="center" prop="fAddr" :show-overflow-tooltip="true" />
       <el-table-column label="状态" align="center">
         <template slot-scope="scope">
           <el-switch
@@ -111,7 +111,7 @@
           ></el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

+ 0 - 5
src/views/finance/charge/index.vue

@@ -602,12 +602,10 @@ export default {
     //确认导入
     confirmImport() {
       console.log(this.state_s)
-
       for (let item in this.selection) {
         this.pass.fAmtcr += Number(this.selection[item].fAmt)
         this.pass.fAmtdr += Number(this.selection[item].fAmtdr)
       }
-
       if (this.state_s == true) {
         if (this.selection.length == '0') {
           console.log('未选择')//写入提示
@@ -615,9 +613,6 @@ export default {
         } else {
           console.log(this.selection[0].fMblno)
           for (let item in this.selection) {
-            console.log(this.selection[item])
-            console.log(this.selection[item].fMblno)
-            console.log(this.selection[item].fName)
             this.empty.push(this.selection[item].fMblno)
             this.nothing.push(this.selection[item].fName)
           }

+ 309 - 283
src/views/system/toConfigure/auditPaths-add-or-update.vue

@@ -1,283 +1,309 @@
-<template>
-  <el-dialog
-    :title="!dataForm.id ? '新增' : '修改'"
-    :close-on-click-modal="false"
-    :before-close="closeDialog"
-    :visible.sync="visible"
-    :modal="false"
-    width="75%">
-    <el-form :inline="true" :model="dataForm" :rules="dataRule" ref="dataForm">
-      <div class="form-group dialog">
-        <el-form-item label="审核路径名称" prop="pathName">
-          <el-input v-model="dataForm.pathName" placeholder="审核路径名称"></el-input>
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-select v-model="dataForm.status" placeholder="状态" style="width: 100%">
-            <el-option
-              v-for="item in optionsStatue"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="维护人" prop="opUserName">
-          <el-input v-model="dataForm.opUserName" disabled placeholder="维护人"></el-input>
-        </el-form-item>
-        <el-form-item label="维护时间" prop="opDate">
-          <el-input v-model="dataForm.opDate" disabled placeholder="维护时间"></el-input>
-        </el-form-item>
-        <el-form-item label="备注" class="full" prop="remarks">
-          <el-input v-model="dataForm.remarks" placeholder="备注"></el-input>
-        </el-form-item>
-      </div>
-    </el-form>
-    <el-button @click.prevent="addRow()" style="float: left">添加</el-button>
-    <el-table :data="dataList" tooltip-effect="dark" border stripe style="width: 100%; margin-bottom: 20px">
-      <el-table-column
-        width="80PX"
-        label="级次"
-        type="index">
-      </el-table-column>
-      <el-table-column
-        prop="levelName"
-        header-align="center"
-        align="center"
-        label="路径名称">
-        <template slot-scope="scope">
-          <el-input v-model="scope.row.levelName" placeholder="路径名称" show-word-limit/>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="iffixAuditUser"
-        header-align="center"
-        align="center"
-        label="是否指定审批人">
-        <template slot-scope="scope">
-          <el-select v-model="scope.row.iffixAuditUser" placeholder="是否指定审批人" @change="changeIffixAudit(scope.row)"
-                     style="width: 100%">
-            <el-option
-              v-for="item in optionsiffixAudit"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="auditUserId"
-        header-align="center"
-        align="center"
-        label="审核人">
-        <template slot-scope="scope">
-          <el-select v-model="scope.row.auditUserId" :disabled="scope.row.iffixAuditUser === 'F'"
-                     filterable multiple collapse-tags placeholder="审核人" style="width: 100%">
-            <el-option
-              v-for="item in optionsUsers"
-              :key="item.userId"
-              :label="item.actualname"
-              :value="item.userId">
-            </el-option>
-          </el-select>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="iffinalItem"
-        header-align="center"
-        align="center"
-        label="是否最后一级">
-        <template slot-scope="scope">
-          <el-select v-model="scope.row.iffinalItem" placeholder="是否最后一级" style="width: 100%">
-            <el-option
-              v-for="item in optionsIfStatus"
-              :key="item.val"
-              :label="item.name"
-              :value="item.val">
-            </el-option>
-          </el-select>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="remarks"
-        header-align="center"
-        align="center"
-        label="备注">
-        <template slot-scope="scope">
-          <el-input v-model="scope.row.remarks" placeholder="备注" show-word-limit/>
-        </template>
-      </el-table-column>
-      <el-table-column
-        header-align="center"
-        align="center"
-        label="操作">
-        <template slot-scope="scope">
-          <el-button @click.native.prevent="deleteRow(scope.$index, dataList)" size="small">移除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="closeDia">取消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()" v-preventReClick>确定</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-  export default {
-    data () {
-      return {
-        dataForm: {
-          status: 'A'
-        },
-        visible: false,
-        dataRule: {},
-        dataList: [],
-        optionsUsers: [],
-        optionsiffixAudit: [{
-          id: 'S',
-          name: '是'
-        }, {
-          id: 'F',
-          name: '否'
-        }],
-        optionsIfStatus: [{
-          val: 'F',
-          name: '否'
-        }, {
-          val: 'T',
-          name: '是'
-        }],
-        optionsStatue: [{
-          id: 'A',
-          name: '有效'
-        }, {
-          id: 'S',
-          name: '停用'
-        }]
-      }
-    },
-    methods: {
-      init (val) {
-        this.optionsUsers = []
-        this.visible = true
-        if (typeof val !== 'undefined') {
-          this.queryAuditPath(val)
-        } else {
-          this.queryUsers()
-        }
-      },
-      queryUsers () {
-        this.$http({
-          url: this.$http.adornUrl('/sys/user/selectUser'),
-          method: 'post',
-          data: ({mobile: 'auditUser'})
-        }).then(({data}) => {
-          if (typeof data.list !== 'undefined' && data.list !== null) {
-            if (typeof data.list.users !== 'undefined' && data.list.users !== null) {
-              this.optionsUsers = data.list.users
-            }
-          }
-        })
-      },
-      queryAuditPath (val) {
-        this.$http({
-          url: this.$http.adornUrl('/engineering/auditPaths/queryAuditPath'),
-          method: 'post',
-          data: ({id: val})
-        }).then(({data}) => {
-          if (typeof data.list !== 'undefined' && data.list !== null) {
-            if (typeof data.list.users !== 'undefined' && data.list.users !== null) {
-              this.optionsUsers = data.list.users
-            }
-            if (typeof data.list.audit !== 'undefined' && data.list.audit !== null) {
-              this.dataForm = data.list.audit
-            }
-            if (typeof data.list.auditPathsLevels !== 'undefined' && data.list.auditPathsLevels !== null) {
-              this.dataList = data.list.auditPathsLevels
-              if (typeof data.list.auditUserIds !== 'undefined' && data.list.auditUserIds !== null) {
-                for (let use in data.list.auditUserIds) {
-                  this.$set(this.dataList[use], 'auditUserId', data.list.auditUserIds[use])
-                }
-              }
-            }
-          }
-        })
-      },
-      addRow () {
-        let val = {
-          levelName: null,
-          auditUserId: null,
-          auditUserName: null,
-          iffixAuditUser: 'S',
-          iffinalItem: 'T',
-          remarks: null
-        }
-        this.dataList.push(val)
-      },
-      deleteRow (index, rows) { // 删除改行
-        rows.splice(index, 1)
-      },
-      changeIffixAudit (row) {
-        if (row.iffixAuditUser === 'F') {
-          row.auditUserId = null
-          row.auditUserName = null
-        }
-      },
-      // 表单提交
-      dataFormSubmit () {
-        if (this.dataList.length === 0) {
-          this.$message.error('请维护审批级次')
-          return false
-        }
-        for (let x in this.dataList) {
-          if (this.dataList[x].iffixAuditUser === 'S') {
-            if (this.dataList[x].auditUserId === null || this.dataList[x].auditUserId === '' || this.dataList[x].auditUserId.length === 0) {
-              this.$message.error('请维护第' + (Number(x) + 1) + '级的审核人')
-              return false
-            }
-          }
-        }
-        this.$confirm(`是否提交?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          let formData = new FormData()
-          formData.append('auditPaths', JSON.stringify(this.dataForm))
-          formData.append('auditPathsLevels', JSON.stringify(this.dataList))
-          this.$http({
-            url: this.$http.adornUrl(`/engineering/auditPaths/save`),
-            method: 'post',
-            data: formData
-          }).then(({data}) => {
-            if (data && data.code === 0) {
-              this.$message({
-                message: '操作成功',
-                type: 'success',
-                duration: 600,
-                onClose: () => {
-                  this.closeDia()
-                }
-              })
-            } else {
-              this.$message.error(data.msg)
-            }
-          })
-        })
-      },
-      closeDialog (done) {
-        done()
-        // location.reload()
-        this.visible = false
-        this.$emit('refreshDataList')
-        Object.assign(this.$data, this.$options.data.call(this))
-      },
-      closeDia () {
-        this.visible = false
-        this.$emit('refreshDataList')
-        Object.assign(this.$data, this.$options.data.call(this))
-      }
-    }
-  }
-</script>
+<template>
+  <el-dialog
+    :title="!dataForm.id ? '新增' : '修改'"
+    :close-on-click-modal="false"
+    :before-close="closeDialog"
+    :visible.sync="visible"
+    :modal="false"
+    width="75%">
+    <el-form :inline="true" :model="dataForm" :rules="dataRule" ref="dataForm">
+      <div class="form-group dialog">
+        <el-form-item label="审核路径名称" prop="pathName">
+          <el-input v-model="dataForm.pathName" placeholder="审核路径名称"></el-input>
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-select v-model="dataForm.status" placeholder="状态" style="width: 100%">
+            <el-option
+              v-for="item in optionsStatue"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="维护人" prop="opUserName">
+          <el-input v-model="dataForm.opUserName" disabled placeholder="维护人"></el-input>
+        </el-form-item>
+        <el-form-item label="维护时间" prop="opDate">
+          <el-input v-model="dataForm.opDate" disabled placeholder="维护时间"></el-input>
+        </el-form-item>
+        <el-form-item label="备注" class="full" prop="remarks">
+          <el-input v-model="dataForm.remarks" placeholder="备注"></el-input>
+        </el-form-item>
+      </div>
+    </el-form>
+    <el-button @click.prevent="addRow()" style="float: left">添加</el-button>
+    <el-table :data="dataList" tooltip-effect="dark" border stripe style="width: 100%; margin-bottom: 20px">
+      <el-table-column
+        width="80PX"
+        label="级次"
+        type="index">
+      </el-table-column>
+      <el-table-column
+        prop="levelName"
+        header-align="center"
+        align="center"
+        label="路径名称">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.levelName" placeholder="路径名称" show-word-limit/>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="iffixAuditUser"
+        header-align="center"
+        align="center"
+        label="是否指定审批人">
+        <template slot-scope="scope">
+          <el-select v-model="scope.row.iffixAuditUser" placeholder="是否指定审批人" @change="changeIffixAudit(scope.row)"
+                     style="width: 100%">
+            <el-option
+              v-for="item in optionsiffixAudit"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="auditUserId"
+        header-align="center"
+        align="center"
+        label="审核人">
+        <template slot-scope="scope">
+          <el-select v-model="scope.row.auditUserId" :disabled="scope.row.iffixAuditUser === 'F'"
+                     filterable multiple collapse-tags placeholder="审核人" style="width: 100%">
+            <el-option
+              v-for="item in optionsUsers"
+              :key="item.userId"
+              :label="item.actualname"
+              :value="item.userId">
+            </el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="iffinalItem"
+        header-align="center"
+        align="center"
+        label="是否最后一级">
+        <template slot-scope="scope">
+          <el-select v-model="scope.row.iffinalItem" placeholder="是否最后一级" style="width: 100%">
+            <el-option
+              v-for="item in optionsIfStatus"
+              :key="item.val"
+              :label="item.name"
+              :value="item.val">
+            </el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="remarks"
+        header-align="center"
+        align="center"
+        label="备注">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.remarks" placeholder="备注" show-word-limit/>
+        </template>
+      </el-table-column>
+      <el-table-column
+        header-align="center"
+        align="center"
+        label="操作">
+        <template slot-scope="scope">
+          <el-button @click.native.prevent="deleteRow(scope.$index, dataList)" size="small">移除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDia">取消</el-button>
+      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { addCharge, delCharge } from '@/api/system/toConfigure'
+
+  export default {
+    data () {
+      return {
+        dataForm: {
+          status: 'A'
+        },
+        visible: false,
+        dataRule: {},
+        dataList: [],
+        optionsUsers: [],
+        optionsiffixAudit: [{
+          id: 'S',
+          name: '是'
+        }, {
+          id: 'F',
+          name: '否'
+        }],
+        optionsIfStatus: [{
+          val: 'F',
+          name: '否'
+        }, {
+          val: 'T',
+          name: '是'
+        }],
+        optionsStatue: [{
+          id: 'A',
+          name: '有效'
+        }, {
+          id: 'S',
+          name: '停用'
+        }]
+      }
+    },
+    methods: {
+      init (val) {
+        this.optionsUsers = []
+        this.visible = true
+        if (typeof val !== 'undefined') {
+          this.queryAuditPath(val)
+        } else {
+          this.queryUsers()
+        }
+      },
+      queryUsers () {
+        this.$http({
+          url: this.$http.adornUrl('/sys/user/selectUser'),
+          method: 'post',
+          data: ({mobile: 'auditUser'})
+        }).then(({data}) => {
+          if (typeof data.list !== 'undefined' && data.list !== null) {
+            if (typeof data.list.users !== 'undefined' && data.list.users !== null) {
+              this.optionsUsers = data.list.users
+            }
+          }
+        })
+      },
+      queryAuditPath (val) {
+        this.$http({
+          url: this.$http.adornUrl('/engineering/auditPaths/queryAuditPath'),
+          method: 'post',
+          data: ({id: val})
+        }).then(({data}) => {
+          if (typeof data.list !== 'undefined' && data.list !== null) {
+            if (typeof data.list.users !== 'undefined' && data.list.users !== null) {
+              this.optionsUsers = data.list.users
+            }
+            if (typeof data.list.audit !== 'undefined' && data.list.audit !== null) {
+              this.dataForm = data.list.audit
+            }
+            if (typeof data.list.auditPathsLevels !== 'undefined' && data.list.auditPathsLevels !== null) {
+              this.dataList = data.list.auditPathsLevels
+              if (typeof data.list.auditUserIds !== 'undefined' && data.list.auditUserIds !== null) {
+                for (let use in data.list.auditUserIds) {
+                  this.$set(this.dataList[use], 'auditUserId', data.list.auditUserIds[use])
+                }
+              }
+            }
+          }
+        })
+      },
+      addRow () {
+        let val = {
+          levelName: null,
+          auditUserId: null,
+          auditUserName: null,
+          iffixAuditUser: 'S',
+          iffinalItem: 'T',
+          remarks: null
+        }
+        this.dataList.push(val)
+      },
+      deleteRow (index, rows) { // 删除改行
+        rows.splice(index, 1)
+      },
+      changeIffixAudit (row) {
+        if (row.iffixAuditUser === 'F') {
+          row.auditUserId = null
+          row.auditUserName = null
+        }
+      },
+      // 表单提交
+      dataFormSubmit () {
+        if (this.dataList.length === 0) {
+          this.$message.error('请维护审批级次')
+          return false
+        }
+        for (let x in this.dataList) {
+          if (this.dataList[x].iffixAuditUser === 'S') {
+            if (this.dataList[x].auditUserId === null || this.dataList[x].auditUserId === '' || this.dataList[x].auditUserId.length === 0) {
+              this.$message.error('请维护第' + (Number(x) + 1) + '级的审核人')
+              return false
+            }
+          }
+        }
+        this.$confirm(`是否提交?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(function() {
+          let formData = new FormData()
+          formData.append('auditPaths', JSON.stringify(this.dataForm))
+          formData.append('auditPathsLevels', JSON.stringify(this.dataList))
+          return delCharge(formData)
+        }).then(() => {
+            if (data && data.code === 0) {
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 600,
+                onClose: () => {
+                  this.closeDia()
+                }
+              })
+            } else {
+              this.$message.error(data.msg)
+            }
+        })
+
+        // this.$confirm(`是否提交?`, '提示', {
+        //   confirmButtonText: '确定',
+        //   cancelButtonText: '取消',
+        //   type: 'warning'
+        // }).then(() => {
+        //   let formData = new FormData()
+        //   formData.append('auditPaths', JSON.stringify(this.dataForm))
+        //   formData.append('auditPathsLevels', JSON.stringify(this.dataList))
+        //   this.$http({
+        //     url: this.$http.adornUrl(`/engineering/auditPaths/save`),
+        //     method: 'post',
+        //     data: formData
+        //   }).then(({data}) => {
+        //     if (data && data.code === 0) {
+        //       this.$message({
+        //         message: '操作成功',
+        //         type: 'success',
+        //         duration: 600,
+        //         onClose: () => {
+        //           this.closeDia()
+        //         }
+        //       })
+        //     } else {
+        //       this.$message.error(data.msg)
+        //     }
+        //   })
+        // })
+      },
+      closeDialog (done) {
+        done()
+        // location.reload()
+        this.visible = false
+        this.$emit('refreshDataList')
+        Object.assign(this.$data, this.$options.data.call(this))
+      },
+      closeDia () {
+        this.visible = false
+        this.$emit('refreshDataList')
+        Object.assign(this.$data, this.$options.data.call(this))
+      }
+    }
+  }
+</script>

+ 35 - 23
src/views/system/toConfigure/index.vue

@@ -55,9 +55,10 @@
         width="90"
         label="状态">
         <template slot-scope="scope">
-          <span v-if="scope.row.status === 'N'">新建</span>
+<!--          <span v-if="scope.row.status === 'N'">新建</span>-->
           <span v-if="scope.row.status === 'A'">有效</span>
           <span v-if="scope.row.status === 'S'">停用</span>
+          <span v-if="scope.row.status === 'Z'">暂存</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -98,8 +99,7 @@
 
 <script>
 import AddOrUpdate from './auditPaths-add-or-update'
-import {addCharge} from '@/api/system/toConfigure'
-import { listCharge } from '@/api/finance/charge'
+import {addCharge,delCharge} from '@/api/system/toConfigure'
 
 export default {
   data () {
@@ -133,6 +133,7 @@ export default {
     // }).then(({data}) => {
     //   this.loginContractorId = data.loginContractorId
     // })
+
     this.getDataList()
   },
   methods: {
@@ -179,31 +180,42 @@ export default {
     },
     // 删除
     deleteHandle (id) {
-      this.$confirm(`确定进行删除操作?`, '提示', {
+      this.$confirm('是否确认删除财务数据主编号为"' + id + '"的数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
+      }).then(function() {
+        return delCharge(id)
       }).then(() => {
-        this.$http({
-          url: this.$http.adornUrl('/engineering/auditPaths/delete'),
-          method: 'post',
-          data: (id)
-        }).then(({data}) => {
-          if (data && data.code === 0) {
-            this.$message({
-              message: '操作成功',
-              type: 'success',
-              duration: 600,
-              onClose: () => {
-                this.getDataList()
-              }
-            })
-          } else {
-            this.$message.error(data.msg)
-          }
-        })
-      }).catch(() => {
+        this.getList()
+        this.msgSuccess('删除成功')
       })
+
+      // this.$confirm(`确定进行删除操作?`, '提示', {
+      //   confirmButtonText: '确定',
+      //   cancelButtonText: '取消',
+      //   type: 'warning'
+      // }).then(() => {
+      //   this.$http({
+      //     url: this.$http.adornUrl('/engineering/auditPaths/delete'),
+      //     method: 'post',
+      //     data: (id)
+      //   }).then(({data}) => {
+      //     if (data && data.code === 0) {
+      //       this.$message({
+      //         message: '操作成功',
+      //         type: 'success',
+      //         duration: 600,
+      //         onClose: () => {
+      //           this.getDataList()
+      //         }
+      //       })
+      //     } else {
+      //       this.$message.error(data.msg)
+      //     }
+      //   })
+      // }).catch(() => {
+      // })
     }
   }
 }

+ 2 - 2
vue.config.js

@@ -34,8 +34,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://192.168.137.1:9010`,
-        target: `http://engineering.echepei.com:9010/`,
+        target: `http://localhost:9010`,
+        //  target: `http://engineering.echepei.com:9010/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''