修改物品提醒

src/views/material/product/components/index-data.vue

@@ -611,6 +611,13 @@ export default {
     /* 显示编辑 */
     openEdit(row, status) {
       console.log(status, this.currentData, 'status');
+      let isUpdate;
+      if(status==2){
+        isUpdate = 0;
+      }else{
+        isUpdate = 1;
+      }
+     
       this.$router.push({
         path: '/material/product/detail',
         query: {
@@ -618,6 +625,7 @@ export default {
           id: row.id ? row.id : null,
           status: status,
           rootId: this.rootId,
+          isUpdate:isUpdate,
           oneProduct: this.oneProduct,
           t: new Date().getTime(),
           rootTreeId: this.rootTreeId,

src/views/material/product/detail.vue

@@ -331,17 +331,20 @@ export default {
           value: '三级'
         }
       ],
+
+      isUpdate: 0,
       form: {
         categoryLevelGroupName: '',
         componentAttribute: [],
         categoryLevelName: '',
         isConsumable: 0,
+        isEnabled: 1,
         measuringUnit: '',
         netWeight: '',
         attributeType: 1,
         weightUnit: '',
         packingUnit: '',
-        isEnabled: 1,
+
         extField: {},
         // isConsumables:2,
         extTagField: {
@@ -500,7 +503,8 @@ export default {
 
           };
 
-          console.log(this.form);
+          
+          this.isUpdate = 0;
 
           this.categorySales = {};
           this.purchaseInfo = {};
@@ -553,12 +557,24 @@ export default {
   },
   async created() {
     //新增
+    console.log('88888888');
 
     this.$set(
       this.form,
       'categoryLevelId',
       this.$route.query.categoryLevelId
     );
+
+
+    this.$set(
+      this.form,
+      'isUpdate',
+      this.$route.query.isUpdate
+    );
+
+    this.isUpdate = this.$route.query.isUpdate;
+
+
     this.$set(
       this.form,
       'categoryLevelName',
@@ -861,6 +877,9 @@ export default {
       return new Promise((resolve, reject) => {
         checkExist(obj).then((res) => {
           if (res) {
+
+            console.log(res, 'res----');
+
             this.$confirm('系统已有相同的数据', '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',
@@ -889,13 +908,16 @@ export default {
 
         if (!valid) return;
 
+
         let req = {
           name: this.form.name,
           modelType: this.form.modelType,
-          specification: this.form.specification
+          specification: this.form.specification,
+          isUpdate: this.isUpdate * 1 || 0
         }
-        if(! await this.verifyDuplicate(req)) return;
-        
+
+        if (! await this.verifyDuplicate(req)) return;
+
 
 
 

src/views/technology/control/components/user-edit.vue

@@ -14,10 +14,10 @@
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">
       <el-row>
         <el-col :span="8">
-          <el-form-item label="编码:" prop="code">
+          <el-form-item label="编码:" >
             <el-input
               clearable
-             
+              disabled
               v-model="form.code"
               placeholder="请输入"
             />

src/views/technology/production/components/user-edit.vue

@@ -6,12 +6,12 @@
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">
       <el-row>
         <el-col :span="8">
-          <el-form-item label="工序编码:" v-if="clientEnvironmentId == 9">
+          <el-form-item label="工序编码:">
             <el-input  disabled v-model="form.code" clearable placeholder="请输入"></el-input>
           </el-form-item>
-          <el-form-item label="工序编码:" v-else prop="code">
+          <!-- <el-form-item label="工序编码:" v-else prop="code">
             <el-input :disabled="isUpdate" v-model="form.code" clearable placeholder="请输入" />
-          </el-form-item>
+          </el-form-item> -->
         </el-col>
 
         <el-col :span="8">

src/views/technology/stepManagement/components/user-edit.vue

@@ -16,11 +16,11 @@
         </el-col>
 
         <el-col :span="8">
-          <el-form-item label="编码:" v-if="clientEnvironmentId == 9">
-            <el-input  disabled v-model="form.code" clearable placeholder="请输入"></el-input>
-          </el-form-item>
-          <el-form-item label="编码:" v-else prop="code">
-            <el-input :disabled="isView" v-model="form.code" clearable placeholder="请输入" />
+          <!-- <el-form-item label="编码:" v-if="clientEnvironmentId == 9"> -->
+            <!-- <el-input  disabled v-model="form.code" clearable placeholder="请输入"></el-input> -->
+          <!-- </el-form-item> -->
+          <el-form-item label="编码:" >
+            <el-input disabled v-model="form.code" clearable placeholder="请输入" />
           </el-form-item>
         </el-col>
         <el-col :span="8">