Merge remote-tracking branch 'gitea/master'

src/views/mes/md/mditem/index.vue

@@ -151,10 +151,10 @@
               <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
             </template>
           </el-table-column>
-          <el-table-column label="安全库存" align="center" key="safeStockFlag" v-if="columns[7].visible">
+          <el-table-column label="安全库存" align="center" key="minStock" prop="minStock" v-if="columns[7].visible">
-            <template slot-scope="scope">
+<!--            <template slot-scope="scope">-->
-              <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.safeStockFlag"/>
+<!--              <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.safeStockFlag"/>-->
-            </template>
+<!--            </template>-->
           </el-table-column>
           <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[8].visible" width="160">
             <template slot-scope="scope">
@@ -302,26 +302,23 @@
           </el-col>
           <el-col :span="12" v-if="resentEnable">
             <el-form-item label="刀刃数" prop="attr1">
-              <el-input-number v-model="form.attr1" :min="0" :percision="0" :step="1" disabled
+              <el-input-number v-model="form.attr1" :min="1" :percision="0" :step="1" disabled
                                v-if="optType=='view'"/>
-              <el-input-number v-model="form.attr1" :min="0" :percision="0" :step="1"
+              <el-input-number v-model="form.attr1" :min="1" :percision="0" :step="1"
-                               placeholder="请输入重置次数"
+                               placeholder="请输入刀刃数"
+                               v-else/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="预警阈值" prop="attr2" v-if="this.warnEnable">
+              <el-input-number v-model="form.attr2" :min="0" :percision="0" :step="1" disabled
+                               v-if="optType=='view'"/>
+              <el-input-number v-model="form.attr2" :min="0" :percision="0" :step="1"
+                               placeholder="请输入预警阈值"
                                v-else/>
             </el-form-item>
           </el-col>
         </el-row>
-<!--        <el-row>-->
-<!--          <el-col :span="12">-->
-<!--            <el-form-item label="寿命预警值" prop="attr2">-->
-<!--              <el-input-number v-model="form.attr2" :min="0" :percision="0" :step="1" disabled-->
-<!--                               v-if="optType=='view'"/>-->
-<!--              <el-input-number v-model="form.attr2" :min="0" :percision="0" :step="1"-->
-<!--                               placeholder="请输入寿命预警值"-->
-<!--                               v-else/>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          -->
-<!--        </el-row>-->
         <el-row>
           <el-col :span="12">
             <el-form-item label="是否启用">
@@ -571,7 +568,8 @@ export default {
           {required: true, message: "物料分类不能为空", trigger: "blur"},
         ]
       },
-      resentEnable: false
+      resentEnable: false,
+      warnEnable: false
     };
   },
   watch: {
@@ -585,10 +583,16 @@ export default {
           if (response.data.itemOrProduct == "BLADE") {
             this.resentEnable = true
             // this.form.attr1 = '0'
-          }
+          } else {
-          else {
             this.resentEnable = false
-            this.form.attr1 = '0'
+            this.form.attr1 = '1'
+          }
+
+          if (response.data.itemOrProduct == "PRODUCT"){
+            this.warnEnable = true
+          } else {
+            this.warnEnable = false
+            this.form.attr2 = '0'
           }
         })
     }
@@ -685,6 +689,7 @@ export default {
       const itemId = row.itemId || this.ids;
       getMdItem(itemId).then(response => {
         this.form = response.data;
+        this.form.attr1 = Number(this.form.attr1) + 1
         this.open = true;
         this.title = "查看物料";
         this.optType = "view";
@@ -709,6 +714,7 @@ export default {
       const itemId = row.itemId || this.ids;
       getMdItem(itemId).then(response => {
         this.form = response.data;
+        this.form.attr1 = Number(this.form.attr1) + 1
         this.open = true;
         this.optType = "edit";
         this.title = "修改物料";
@@ -719,6 +725,7 @@ export default {
     submitForm: function () {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.form.attr1 = Number(this.form.attr1) - 1
           if (this.form.itemId != undefined) {
             updateMdItem(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");

src/views/mes/wm/zdTask/index.vue

@@ -87,6 +87,7 @@
           <dict-tag :options="dict.type.zd_task_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
+      <el-table-column label="计划单" align="center" prop="attr4" />
       <el-table-column label="备注" align="center" prop="remark" />
 <!--      <el-table-column label="预留字段1" align="center" prop="attr1" />-->
 <!--      <el-table-column label="预留字段2" align="center" prop="attr2" />-->

src/views/system/role/authUser.vue

@@ -151,7 +151,7 @@ export default {
     },
     // 返回按钮
     handleClose() {
-      const obj = { path: "/user/role" };
+      const obj = { path: "/baseInfo/role" };
       this.$tab.closeOpenPage(obj);
     },
     /** 搜索按钮操作 */