ysy hai 1 ano
pai
achega
501368439e

+ 13 - 1
src/views/material/BOMmanage/components/attribute.vue

@@ -7,6 +7,7 @@
       :model="attributeData"
       :model="attributeData"
     >
     >
       <el-row>
       <el-row>
+     
         <el-col :span="8" label-width="100px">
         <el-col :span="8" label-width="100px">
           <el-form-item label="名称:" prop="name">
           <el-form-item label="名称:" prop="name">
             <el-input
             <el-input
@@ -82,6 +83,7 @@
             <el-input
             <el-input
               placeholder=""
               placeholder=""
               v-model="category.packingUnit"
               v-model="category.packingUnit"
+              
               disabled
               disabled
             ></el-input>
             ></el-input>
           </el-form-item>
           </el-form-item>
@@ -92,6 +94,7 @@
             <el-input
             <el-input
               placeholder=""
               placeholder=""
               v-model="category.roughWeight"
               v-model="category.roughWeight"
+            
               disabled
               disabled
             ></el-input>
             ></el-input>
           </el-form-item>
           </el-form-item>
@@ -125,6 +128,7 @@
           <el-form-item label="生产类型:" prop="produceType">
           <el-form-item label="生产类型:" prop="produceType">
             <el-select
             <el-select
               v-model="attributeData.produceType"
               v-model="attributeData.produceType"
+               :disabled="attributeData.approvalStatus != 0"
               filterable
               filterable
               multiple
               multiple
               class="ele-block"
               class="ele-block"
@@ -143,6 +147,7 @@
           <el-form-item label="属性类型:" prop="attributeType">
           <el-form-item label="属性类型:" prop="attributeType">
             <el-select
             <el-select
               v-model="attributeData.attributeType"
               v-model="attributeData.attributeType"
+               :disabled="attributeData.approvalStatus != 0"
               filterable
               filterable
               multiple
               multiple
               class="ele-block"
               class="ele-block"
@@ -165,6 +170,7 @@
             <el-input
             <el-input
               placeholder=""
               placeholder=""
               v-model="attributeData.materialsName"
               v-model="attributeData.materialsName"
+               :disabled="attributeData.approvalStatus != 0"
             ></el-input>
             ></el-input>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
@@ -174,6 +180,7 @@
             <el-input
             <el-input
               placeholder=""
               placeholder=""
               v-model="attributeData.bomTypeRouting"
               v-model="attributeData.bomTypeRouting"
+               :disabled="attributeData.approvalStatus != 0"
             ></el-input>
             ></el-input>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
@@ -185,13 +192,14 @@
             <el-input
             <el-input
               placeholder=""
               placeholder=""
               v-model="attributeData.sourceData"
               v-model="attributeData.sourceData"
+               :disabled="attributeData.approvalStatus != 0"
             ></el-input>
             ></el-input>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
 
 
         <el-col :span="8" label-width="100px">
         <el-col :span="8" label-width="100px">
           <el-form-item label="用量" prop="dosage">
           <el-form-item label="用量" prop="dosage">
-            <el-input placeholder="" v-model="attributeData.dosage"></el-input>
+            <el-input placeholder="" v-model="attributeData.dosage"  :disabled="attributeData.approvalStatus != 0"></el-input>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
       </el-row>
       </el-row>
@@ -202,6 +210,7 @@
             <el-input
             <el-input
               placeholder=""
               placeholder=""
               v-model="attributeData.baseCount"
               v-model="attributeData.baseCount"
+              :disabled="attributeData.approvalStatus != 0"
             ></el-input>
             ></el-input>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
@@ -211,6 +220,7 @@
             <el-input
             <el-input
               placeholder=""
               placeholder=""
               v-model="attributeData.materielPath"
               v-model="attributeData.materielPath"
+               :disabled="attributeData.approvalStatus != 0"
             ></el-input>
             ></el-input>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
@@ -224,6 +234,7 @@
             <el-input
             <el-input
               placeholder=""
               placeholder=""
               v-model="attributeData.remake"
               v-model="attributeData.remake"
+               :disabled="attributeData.approvalStatus != 0"
               type="textarea"
               type="textarea"
               :rows="2"
               :rows="2"
             ></el-input>
             ></el-input>
@@ -252,6 +263,7 @@
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
       </el-row>
       </el-row>
+ 
 
 
       <div class="btn_box" v-if="attributeData.status != 1">
       <div class="btn_box" v-if="attributeData.status != 1">
         <el-button type="primary" @click="handleUpdate">保存</el-button>
         <el-button type="primary" @click="handleUpdate">保存</el-button>

+ 1 - 0
src/views/material/BOMmanage/detailsPop.vue

@@ -243,6 +243,7 @@
               @tab-click="handleClick"
               @tab-click="handleClick"
             >
             >
               <el-tab-pane label="属性" name="属性">
               <el-tab-pane label="属性" name="属性">
+             
                 <attribute :attributeData="currentNodeData"></attribute>
                 <attribute :attributeData="currentNodeData"></attribute>
               </el-tab-pane>
               </el-tab-pane>
 
 

+ 2 - 2
vue.config.js

@@ -31,8 +31,8 @@ module.exports = {
     proxy: {
     proxy: {
       // 当我们的本地的请求 有/api的时候,就会代理我们的请求地址向另外一个服务器发出请求
       // 当我们的本地的请求 有/api的时候,就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
       '/api': {
-        target: 'http://192.168.1.125:18086',
-        // target: 'http://192.168.1.251:18086',
+        // target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.176:18086',
         // target: 'http://192.168.1.176:18086',
 
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域