Merge remote-tracking branch 'origin/master'

src/views/biz/orderUploadLog/index.vue

@@ -434,13 +434,18 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除biz编号为"' + ids + '"的数据项？').then(() => {
+      this.$modal.confirm('是否确认删除？').then(() => {
         this.loading = true;
         return delOrderUploadLog(ids);
-      }).then(() => {
+      }).then((res) => {
+        if (res.code == 20000) {
           this.loading = false;
           this.getList();
           this.$modal.msgSuccess("删除成功");
+        } else {
+          this.$modal.msgError(res.message);
+        }
+
       }).catch(() => {
       }).finally(() => {
         this.loading = false;

src/views/inout/IoAuditedOrder.vue

@@ -164,6 +164,15 @@
             >撤回
             </el-button
             >
+
+            <el-button
+              type="text"
+              size="small"
+              @click.native="generOrder(scope.row)"
+            >复制
+            </el-button>
+
+
             <!--            <el-button-->
             <!--              type="text"-->
             <!--              size="small"-->
@@ -355,6 +364,22 @@
       </el-tab-pane>
     </el-tabs>
 
+
+    <el-dialog
+      title="根据当前单据生成新单据"
+      :visible.sync="stockChangeVisible"
+      width="85%"
+      v-if="stockChangeVisible"
+      @close='closeDialog'
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <DialogcChangeNewOrder
+        :closeDialog="closeDialog"
+        :curRow="curRow"
+      ></DialogcChangeNewOrder>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -371,6 +396,7 @@ import {getResultDetailList} from "@/api/inout/orderDetailResult";
 import {getCodeDetailList} from "@/api/inout/orderDetailCode";
 import {getCodeList} from "@/api/inout/code";
 import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
+import DialogcChangeNewOrder from "@/views/inout/DialogcChangeNewOrder";
 
 
 const formJson = {
@@ -499,9 +525,11 @@ export default {
       resultTotal: 0,
       resultDetailLoading: false,
       resultDetailList: [],
+      stockChangeVisible: false,
+      curRow: null,
     };
   },
-  components: {},
+  components: {DialogcChangeNewOrder},
   methods: {
     onReset() {
       this.$router.push({
@@ -833,6 +861,21 @@ export default {
         // this.$message.info('回退失败');
       });
     },
+
+    generOrder(row) {
+      this.stockChangeVisible = true;
+      this.curRow = row;
+    },
+
+    closeDialog(type) {
+      this.stockChangeVisible = false;
+      this.getList();
+      if (this.$isNotBlank(type)) {
+        this.detailList = [];
+      }
+    },
+
+
     statusFilterType(status) {
       const statusMap = {
         5: "warning",

src/views/inout/IoEditOrder.vue

@@ -838,8 +838,7 @@ export default {
     },
 
   },
-  filters: {
-  },
+  filters: {},
   mounted() {
     document.body.ondrop = function (event) {
       event.preventDefault();

src/views/system/role/index.vue

@@ -16,6 +16,7 @@
             placeholder="请选择角色状态"
             clearable
           >
+            <el-option label="全部" value=""></el-option>
             <el-option label="正常" :value="0"/>
             <el-option label="禁用" :value="1"/>
           </el-select>
@@ -58,6 +59,7 @@
         <!--          ></el-switch>-->
         <!--        </template>-->
         <!--      </el-table-column>-->
+        <!--              :disabled="scope.row.roleId == 1"-->
         <el-table-column label="创建时间" align="center" prop="createTime">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -66,14 +68,12 @@
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button
-              :disabled="scope.row.roleId == 1"
               type="text"
               @click="handleUpdate(scope.row)"
             >编辑
             </el-button>
             <el-button
               type="text"
-              :disabled="scope.row.roleId == 1"
               @click="handleDelete(scope.row)"
             >删除
             </el-button>
@@ -277,7 +277,7 @@ export default {
         limit: 10,
         roleName: undefined,
         roleKey: undefined,
-        status: undefined
+        status: 0
       },
       // 表单参数
       form: {},
@@ -378,8 +378,13 @@ export default {
       let text = row.status === "0" ? "启用" : "禁用";
       this.$modal.confirm('确认要"' + text + '""' + row.roleName + '"角色吗？').then(function () {
         return changeRoleStatus(row.roleId, row.status);
-      }).then(() => {
+      }).then((res) => {
+        if (res.code == 20000) {
           this.$modal.msgSuccess(text + "成功");
+        } else {
+          this.$modal.msgError(res.message);
+        }
+
       }).catch(function () {
         row.status = row.status === "0" ? "1" : "0";
       });
@@ -582,9 +587,14 @@ export default {
       const roleIds = row.roleId || this.ids;
       this.$modal.confirm('是否确认删除该角色？').then(function () {
         return delRole(roleIds);
-      }).then(() => {
+      }).then((res) => {
+        if (res.code == 20000) {
           this.getList();
           this.$modal.msgSuccess("删除成功");
+        } else {
+          this.$modal.msgError(res.message);
+        }
+
       }).catch(() => {
       });
     },

src/views/system/user/authUser.vue

@@ -71,7 +71,7 @@
             </el-button>
             <el-button
               type="text"
-              :disabled="scope.row.id === 1 || !configParms.sysUser"
+              :disabled="scope.row.id === '1' || !configParms.sysUser"
               @click.native="handleDel(scope.$index, scope.row)"
               v-hasPermi="['system:user:remove']"
             >删除
@@ -102,13 +102,13 @@
           <el-row type="flex">
             <el-col :span="11" type="flex">
               <el-form-item label="用户账号" prop="userName">
-                <el-input v-model="formData.userName" size="small" style="width: 90%"></el-input>
+                <el-input v-model="formData.userName" size="small" style="width: 90%" :disabled="formData.id == 1"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="11" class="el-col">
               <el-form-item label="用户名称" prop="employeeName">
                 <el-input v-model="formData.employeeName" size="small"
-                          style="width: 90%"></el-input>
+                          style="width: 90%" :disabled="formData.id == 1"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -167,7 +167,7 @@
             </el-col>
             <el-col :span="11" type="flex">
               <el-form-item label="状态" prop="userFlag">
-                <el-radio-group v-model="formData.userFlag" :disabled="formData.id === 1">
+                <el-radio-group v-model="formData.userFlag" :disabled="formData.id == 1">
                   <el-radio :label="1">正常</el-radio>
                   <el-radio :label="0">禁用</el-radio>
 
@@ -206,7 +206,7 @@
           <el-row :gutter="20" type="flex">
             <el-col :span="11" type="flex">
               <el-form-item label="角色">
-                <el-checkbox-group v-model="formData.roles" :disabled="formData.id === 1" >
+                <el-checkbox-group v-model="formData.roles" :disabled="formData.id == 1" >
                   <el-checkbox
                     v-for="item in roles"
                     :key="item.roleId"
@@ -294,7 +294,7 @@ export default {
       roles: [],
       query: {
         userName: "",
-        userFlag: "",
+        userFlag: "1",
         page: 1,
         limit: 10,
         roleId: "",
@@ -362,7 +362,7 @@ export default {
       });
       this.query = {
         userName: "",
-        userFlag: "",
+        userFlag: "1",
         page: 1,
         limit: 10,
         roleId: "",