单据编辑状态

2 years ago · 5c1cdf6bc8
parent 0055477982
commit 5c1cdf6bc8
4 changed files with 458 additions and 450 deletions
--- a/.env.production
+++ b/.env.production
@ -8,8 +8,8 @@ ENV = 'production'


 #林纪裕cd
-VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:81/UDI_WMS_MC/'
-# VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:83/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://www.linjiyu.lol:81/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://www.linjiyu.lol:83/UDI_WMS_MC/'

 # VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/'

--- 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>
@ -317,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
@ -393,18 +393,18 @@ export default {
      //   return;
      // }
      insertBusType(this.inputQuery)
-          .then((response) => {
-            if (response.code == 20000) {
-              this.loading = false
-              this.cancelDialog()
-              this.getList()
-            } else {
-              this.$message.error(response.message)
-            }
-          })
-          .catch(() => {
+        .then((response) => {
+          if (response.code == 20000) {
            this.loading = false
-          });
+            this.cancelDialog()
+            this.getList()
+          } else {
+            this.$message.error(response.message)
+          }
+        })
+        .catch(() => {
+          this.loading = false
+        });
    },

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

      updateBusType(this.inputQuery)
-          .then((response) => {
-            if (response.code == 20000) {
-              this.loading = false
-              this.cancelDialog()
-              this.getList()
-            } else {
-              this.$message.error(response.message)
-            }
-          })
-          .catch(() => {
+        .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()
+        })
    },
    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')
@ -493,7 +493,7 @@ export default {
        checkPdaUn: null,
        checkPc: null,
        checkWebNew: null,
-        checkWebNewType:null,
+        checkWebNewType: null,
        checkChange: null,
        checkCopy: null,
        secCheckUdims: null,
@ -568,11 +568,11 @@ export default {
        cancelButtonText: '取消',
        type: 'warning'
      })
-          .then(() => {
-            this.deleteOrders(rowId)
-          })
-          .catch(() => {
-          })
+        .then(() => {
+          this.deleteOrders(rowId)
+        })
+        .catch(() => {
+        })
    },

    deleteOrders(data) {
@ -581,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) {
@ -613,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
@ -148,7 +148,6 @@
        <!--  </el-form-item>-->
        <!--</el-col>-->
      </el-row>
-
      <el-row type="flex">
        <el-col :span="11">
          <el-form-item label="物资过期处理方式" prop="prefix">
@ -171,7 +170,6 @@
          </el-form-item>
        </el-col>
      </el-row>
-
      <el-row type="flex">
        <el-col :span="11">
          <el-form-item label="单据前缀" prop="prefix">
@ -188,7 +186,6 @@
          </el-form-item>
        </el-col>
      </el-row>
-
      <el-row type="flex">
        <el-col :span="11">
          <el-form-item label="禁用单据类型" prop="prefix">
@ -198,6 +195,19 @@
            </el-select>
          </el-form-item>
        </el-col>
+
+        <el-col :span="11">
+          <el-form-item label="单据编辑状态" prop="prefix">
+            <el-select v-model="inputQuery.editType" style="width: 90%" placeholder="编辑状态">
+              <el-option label="仅查看" :value="1"></el-option>
+              <el-option label="可编辑" :value="2"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+
+      </el-row>
+      <el-row type="flex">
        <el-col :span="11">
          <el-form-item prop="remark" label="备注">
            <el-input v-model="inputQuery.remark" size="small" style="width: 90%" type="textarea" autosize
@ -205,9 +215,6 @@
          </el-form-item>
        </el-col>
      </el-row>
-      <el-row type="flex">
-
-      </el-row>
    </el-form>

    <div style="margin-left: 25px">
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue