物资申请没有耗材备注字段

src/views/basic/product/udIInfoSelect.vue

@@ -61,7 +61,7 @@
             <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
             <el-button type="primary" icon="el-icon-search" @click="Onsearch">查询</el-button>
             <el-button type="primary" icon="el-icon-upload2" @click="selectExport" v-if="selectType==0">选中导出</el-button>
-            <el-button type="primary" icon="el-icon-upload2" @click="allExport" v-if="selectType==0">结果全部导出</el-button>
+            <el-button type="primary" icon="el-icon-upload2" @click="allExport(2)" v-if="selectType==0">结果全部导出</el-button>
             <el-button type="primary" icon="el-icon-top-upload" @click="uploadSMP" v-if="selectType==1">选中上传</el-button>
             <el-button type="primary" icon="el-icon-top-upload" @click="allUploadSMP" v-if="selectType==1">一键上传</el-button>
           </el-button-group>
@@ -391,13 +391,15 @@ export default {
             selectData.forEach((obj) => {
                 this.filterQuery.uuids.push(obj.uuid);
             });
-            this.allExport();
+            this.allExport(1);
 
         },
-        allExport() {
+        allExport(obj) {
+        if(obj==2){
           for(var i=0;i<this.list.length;i++){
             this.filterQuery.uuids[i]= this.list[i].uuid
           }
+        }
             exportExcel(this.filterQuery)
                 .then((response) => {
                     if (response.code == 20000) {

src/views/supplier/products/selectDIDetailDialog.vue

@@ -60,7 +60,64 @@
               <el-row>
                 <el-col :span="12" class="el-col">
                   <el-form-item label="产品价格:">
-                    <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容" type="number" step="0.01" v-model="editQuery.price"></el-input>
+                    <el-input style="width: 90%" size="small" :disabled="true"  splaceholder="请输入内容" type="number" step="0.01" v-model="editQuery.price"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+
+              <el-row>
+                <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable1">
+                  <el-form-item :label="productRemarkSet.remarkTitle1 ">
+                    <el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true" v-model="editQuery.basicPrductRemak1"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable2">
+                  <el-form-item :label="productRemarkSet.remarkTitle2 ">
+                    <el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true" v-model="editQuery.basicPrductRemak2"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+              <el-row>
+                <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable3">
+                  <el-form-item :label="productRemarkSet.remarkTitle3 ">
+                    <el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true" v-model="editQuery.basicPrductRemak3"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable4">
+                  <el-form-item :label="productRemarkSet.remarkTitle4 ">
+                    <el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true" v-model="editQuery.basicPrductRemak4"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+              <el-row >
+                <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable5">
+                  <el-form-item :label="productRemarkSet.remarkTitle5 ">
+                    <el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true" v-model="editQuery.basicPrductRemak5"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable6">
+                  <el-form-item :label="productRemarkSet.remarkTitle6    ">
+                    <el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true" v-model="editQuery.basicPrductRemak6"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+              <el-row>
+                <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable7">
+                  <el-form-item :label="productRemarkSet.remarkTitle7 ">
+                    <el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true" v-model="editQuery.basicPrductRemak7"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable8">
+                  <el-form-item :label="productRemarkSet.remarkTitle8">
+                    <el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true" v-model="editQuery.basicPrductRemak8"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -269,6 +326,7 @@
 <script>
 
 import { updateDiProduct } from '@/api/supplier/supProductsAddDi'
+import { finProductSet } from '@/api/param/systemParamConfig'
 
 export default {
     name: "SelectDIDetailDialog",
@@ -294,6 +352,7 @@ export default {
         return {
             activeNames: ['1'],
             remark:"",
+          productRemarkSet:{}
         }
     },
     methods: {
@@ -316,11 +375,20 @@ export default {
           this.$message.error(error.message)
         })
       },
-
+      findBasicProductSet() {
+        finProductSet().then((response) => {
+          if (response.code == 20000) {
+            this.productRemarkSet = response.data
+          } else {
+            //出错了
+          }
+        })
+      }
 
     },
 
     created() {
+      this.findBasicProductSet()
     },
 };
 </script>

src/views/supplier/products/supProductsAddDi.vue

@@ -69,7 +69,7 @@
         </el-table-column>
         <el-table-column label="操作" width="120">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="detail(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">详情</el-button>
             <el-button type="text" size="small" :disabled="scope.row.status ==2" @click="deleteProduct(scope.row.id)">
               删除
             </el-button>
@@ -133,7 +133,10 @@
       append-to-body
       v-if="detailDialog"
     >
-      <selectDiDetail :editQuery="diDetails">
+      <selectDiDetail
+        :editQuery="diDetails"
+        :remark="delect.remark"
+      >
       </selectDiDetail>
     </el-dialog>
 
@@ -177,6 +180,7 @@ export default {
       },
       total: 0,
       thirdSys: [],
+      delect:null,
       thirdSysDetail: null,
       list: [],
       addDiProductVisible: false,
@@ -258,6 +262,7 @@ export default {
         let query = {uuid: row.uuid}
         getDiProductDetail(query).then((res) => {
           if (res.code === 20000) {
+            this.delect=row;
             this.diDetails = res.data
             this.detailDialog = true
           } else {