pengyh 1 年間 前
コミット
1e25118bda

+ 1 - 0
src/views/salesPurchasing/goodsPurchasedStored/index.vue

@@ -111,6 +111,7 @@ export default {
       activeName: 'goodsInfo',
       goods_material_id: '',
       joinCode: false,
+	  joinCodeText: JSON.parse(localStorage.getItem('greemall_user')).joinCode,
       logs:[]
     }
   },

+ 1 - 0
src/views/salesPurchasing/merchandisePurchaseReturn/index.vue

@@ -107,6 +107,7 @@ export default {
       activeName: 'goodsInfo',
       goods_material_id: '',
       joinCode: false,
+	  joinCodeText: JSON.parse(localStorage.getItem('greemall_user')).joinCode,
       logs:[]
     }
   },

+ 2 - 2
src/views/salesPurchasing/mixins/common_code.js

@@ -502,14 +502,14 @@ export default {
                                 编辑
                               </el-button>
                             ) : null,
-                            <el-button
+                           <el-button
                               type="text"
                               onClick={() => {
                                 this.delCode(row, index)
                               }}
                             >
                               删除
-                            </el-button>
+                            </el-button>,
                           ]
                         : null}
                     </div>

+ 2 - 1
src/views/salesPurchasing/mixins/out_storage_goods.js

@@ -202,7 +202,8 @@ export default {
           }
         },
         ...(() => {
-          if (this.formDialogType < 2 && !~['SAVE','WAIT', 'OK', 'FAIL'].indexOf(this.formData.status)) {
+			let arr = this.joinCodeText == 'CODE'?['SAVE','WAIT', 'OK', 'FAIL']:['WAIT', 'OK', 'FAIL']
+          if (this.formDialogType < 2 && !~arr.indexOf(this.formData.status)) {
             return [
               {
                 columnAttributes: {

+ 9 - 9
src/views/salesPurchasing/mixins/storage_goods.js

@@ -466,7 +466,7 @@ export default {
                             保存
                           </el-button>
                         ) : null,
-                        this.isEditIndex == -1 ? (
+                        this.isEditIndex == -1 && this.joinCodeText != 'CODE' ? (
                           <el-button
                             type="text"
                             onClick={() => {
@@ -476,14 +476,14 @@ export default {
                             编辑
                           </el-button>
                         ) : null,
-                        <el-button
-                          type="text"
-                          onClick={() => {
-                            this.delGoodsInfo(row, index)
-                          }}
-                        >
-                          删除
-                        </el-button>
+						this.joinCodeText != 'CODE' ? (<el-button
+						   type="text"
+						   onClick={() => {
+						     this.delGoodsInfo(row, index)
+						   }}
+						 >
+						   删除
+						 </el-button>) : null,
                       ]}
                     </div>
                   )

+ 2 - 2
src/views/salesPurchasing/mixins/storage_table.js

@@ -23,11 +23,11 @@ export default {
                 {this.activeName == 'goodsInfo'
                   ? [
                     !!~[0,1].indexOf(this.formDialogType) ? (
-                      <div style="margin-bottom:10px">
+                      this.joinCodeText != 'CODE'?(<div style="margin-bottom:10px">
                         <el-button type="primary" onClick={this.addGoodsInfo}>
                           添加
                         </el-button>
-                      </div>
+                      </div>):null
                     ) : this.formDialogType == 1 && this.joinCode ? (
                       <div style="margin-bottom:10px">
                         <el-button type="primary" onClick={this.domlMban}>