核价单详情

src/BIZComponents/addDoc/index.vue

@@ -52,7 +52,7 @@ export default {
   watch:{
     value:{
       handler(newVal){
-        console.log(newVal,'=======');
+      
         this.selectVal = newVal || []
       },immediate:true
     }

src/components/addDoc/index.vue

@@ -52,7 +52,6 @@ export default {
   watch:{
     value:{
       handler(newVal){
-        console.log(newVal,'=======');
         this.selectVal = newVal || []
       },immediate:true
     }

src/store/getters.js

@@ -16,10 +16,10 @@ export default {
     const obj = (state.dict[dictEnum[enumName]] || []).find((item) => {
       return item.dictCode == dictCode;
     });
-    console.log(dictEnum);
-    console.log(enumName);
-    console.log(state.dict);
-    console.log(obj);
+    // console.log(dictEnum);
+    // console.log(enumName);
+    // console.log(state.dict);
+    // console.log(obj);
 
     return obj && obj.dictValue;
   }

src/views/bpm/done/detailDialog.vue

@@ -28,6 +28,7 @@
       <async-biz-form-component
         :businessId="form?.businessId"
         ref="bziRef"
+        :isView="true"
       ></async-biz-form-component>
     </div>
 
@@ -37,7 +38,7 @@
     ></bpmDetail>
 
     <div slot="footer" class="footer">
-      <el-button @click="visible=false">返回</el-button>
+      <el-button @click="visible = false">返回</el-button>
     </div>
   </ele-modal>
 </template>
@@ -63,13 +64,14 @@
         visible: false
       };
     },
+
     methods: {
       async open(row) {
         this.form = row;
-        this.activeComp='main'
+        this.activeComp = 'main';
         this.visible = true;
-        Vue.component('async-biz-form-component', (resolve) => {
-          require([`@/views${this.form.pcViewRouter}`], resolve);
+        Vue.component('async-biz-form-component',  (resolve) => {
+           require([`@/views${this.form.pcViewRouter}`], resolve);
         });
       },
 

src/views/bpm/handleTask/components/inquiryManage/addDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px" >
       <headerTitle title="基本信息"></headerTitle>
       <el-row>
         <el-col :span="12">
@@ -13,6 +13,7 @@
               @click.native="handParent"
               v-model="form.planName"
               placeholder="请选择"
+              :disabled="isView"
             ></el-input>
           </el-form-item>
         </el-col>
@@ -22,7 +23,7 @@
             prop="inquiryName"
             style="margin-bottom: 22px"
           >
-            <el-input v-model="form.inquiryName"></el-input>
+            <el-input v-model="form.inquiryName" :disabled="isView"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -30,7 +31,7 @@
             <el-select
               v-model="form.acceptUnpack"
               clearable
-              style="width: 100%"
+              style="width: 100%" 
               disabled
             >
               <el-option
@@ -45,13 +46,8 @@
         </el-col>
         <el-col :span="12">
           <el-form-item prop="files" label="附件">
-            <fileMain v-model="form.files"></fileMain>
-            <!--            <fileUpload-->
-            <!--              v-model="form.files"-->
-            <!--              module="main"-->
-            <!--              :showLib="false"-->
-            <!--              :limit="1"-->
-            <!--            />-->
+            <fileMain v-model="form.files" :type="isView?'view':'add'"></fileMain>
+         
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -61,7 +57,7 @@
               resize="none"
               v-model="form.remark"
               :rows="2"
-              placeholder="请输入"
+              placeholder="请输入" :disabled="isView"
               size="small"
               maxlength="200"
             ></el-input>
@@ -70,12 +66,13 @@
       </el-row>
     </el-form>
     <headerTitle title="物品清单" style="margin-top: 15px"></headerTitle>
-    <el-button type="primary" @click="openSupplier">新增供应商</el-button>
+    <el-button type="primary" @click="openSupplier" v-if="!isView">新增供应商</el-button>
     <inventoryTable
       ref="inventoryTable"
       @delList="delList"
       :acceptUnpack="form.acceptUnpack"
       @supplierSelect="supplierSelect"
+      :status="isView?'Detail':''"
     ></inventoryTable>
 
     <headerTitle title="报价清单" style="margin-top: 15px"></headerTitle>
@@ -98,6 +95,8 @@
       :obj="item"
       :isUpdate="isUpdate"
       @deliveryDateChange="deliveryDateChange"
+      :status="isView?'Detail':'edit'"
+
     ></inquiryTable>
   </div>
 </template>
@@ -138,7 +137,8 @@
     props: {
       businessId: {
         default: ''
-      }
+      },
+      isView:''
     },
     data() {
       let formDef = {

src/views/bpm/handleTask/components/inquiryManage/inquiryTable.vue

@@ -56,10 +56,7 @@
         </el-form-item>
       </template>
       <template v-slot:settlementMode="{ row, $index }">
-        <el-form-item
-          prop="settlementMode"
-
-        >
+        <el-form-item prop="settlementMode">
           <DictSelection
             dictName="结算方式"
             clearable
@@ -92,7 +89,7 @@
         </el-form-item>
       </template>
       <template v-slot:taxRate="{ row, $index }">
-        <el-form-item prop="taxRate">
+        <el-form-item >
           <el-input
             v-model="row.taxRate"
             style="width: 100%"
@@ -108,7 +105,6 @@
             v-model="form.files"
             :type="status == 'Detail' ? 'view' : ''"
           ></fileMain>
-       
         </el-form-item>
       </template>
 
@@ -221,7 +217,7 @@
       <template v-slot:notaxSinglePrice="scope">
         <el-form-item
           style="margin-bottom: 20px"
-          :prop="'datasource.' + scope.$index + '.notaxSinglePrice'"
+          :prop="'resultList.' + scope.$index + '.notaxSinglePrice'"
         >
           <el-input
             v-model="scope.row.notaxSinglePrice"
@@ -313,7 +309,7 @@
         </el-form-item>
       </template>
       <template v-slot:provenance="scope">
-        <el-form-item :prop="'datasource.' + scope.$index + '.provenance'">
+        <el-form-item :prop="'resultList.' + scope.$index + '.provenance'">
           <DictSelection
             dictName="产地"
             clearable
@@ -561,7 +557,6 @@
       minWidth: 200
     },
 
-
     {
       minWidth: 80,
       prop: 'deliveryDays',
@@ -695,7 +690,7 @@
       this.setDeliveryDays();
       this.setIsInquiry();
       this.getInventoryTotalAPI();
-      this.getListByContactId()
+      this.getListByContactId();
     },
     methods: {
       //计算交期

src/views/bpm/handleTask/components/inquiryManage/inventoryTable.vue

@@ -11,131 +11,9 @@
       class="time-form"
       :selection.sync="selection"
     >
-      <!--      <template v-slot:productName="{ row, $index }">-->
-      <!--        <el-form-item-->
-      <!--          style="margin-bottom: 20px"-->
-      <!--          :prop="'datasource.' + $index + '.productName'"-->
-      <!--          :rules="{-->
-      <!--            required: true,-->
-      <!--            message: '请输入',-->
-      <!--            trigger: 'change'-->
-      <!--          }"-->
-      <!--        >-->
-      <!--          <el-input-->
-      <!--            v-model="row.productName"-->
-      <!--            placeholder="请输入"-->
-      <!--            disabled-->
-      <!--          ></el-input>-->
-      <!--        </el-form-item>-->
-      <!--      </template>-->
-      <!--      <template v-slot:productCode="scope">-->
-      <!--        <el-form-item-->
-      <!--          style="margin-bottom: 20px"-->
-      <!--          :prop="'datasource.' + scope.$index + '.productCode'"-->
-
-      <!--        >-->
-      <!--          <el-input v-model="scope.row.productCode" disabled></el-input>-->
-      <!--        </el-form-item>-->
-      <!--      </template>-->
-      <!--      <template v-slot:productCategoryName="scope">-->
-      <!--        <el-form-item-->
-      <!--          style="margin-bottom: 20px"-->
-      <!--          :prop="'datasource.' + scope.$index + '.productCategoryName'"-->
-
-      <!--        >-->
-      <!--          <el-input v-model="scope.row.productCategoryName" disabled></el-input>-->
-      <!--        </el-form-item>-->
-      <!--      </template>-->
-      <!--      <template v-slot:totalCount="scope">-->
-      <!--        <el-form-item-->
-      <!--          style="margin-bottom: 20px"-->
-      <!--          :prop="'datasource.' + scope.$index + '.totalCount'"-->
-      <!--          :rules="{-->
-      <!--            required: true,-->
-      <!--            pattern: numberReg,-->
-      <!--            message: '请输入数字',-->
-      <!--            trigger: 'blur'-->
-      <!--          }"-->
-      <!--        >-->
-      <!--          <el-input-->
-      <!--            v-model="scope.row.totalCount"-->
-      <!--            disabled-->
-      <!--            placeholder="请输入"-->
-      <!--          ></el-input>-->
-      <!--        </el-form-item>-->
-      <!--      </template>-->
-
-      <!--      <template v-slot:productBrand="scope">-->
-      <!--        <el-form-item-->
-      <!--          style="margin-bottom: 20px"-->
-      <!--          :prop="'datasource.' + scope.$index + '.productBrand'"-->
-      <!--        >-->
-      <!--          <el-input v-model="scope.row.productBrand" disabled></el-input>-->
-      <!--        </el-form-item>-->
-      <!--      </template>-->
-
-      <!--      <template v-slot:modelType="scope">-->
-      <!--        <el-form-item-->
-      <!--          style="margin-bottom: 20px"-->
-      <!--          :prop="'datasource.' + scope.$index + '.modelType'"-->
-      <!--        >-->
-      <!--          <el-input v-model="scope.row.modelType" disabled></el-input>-->
-      <!--        </el-form-item>-->
-      <!--      </template>-->
-
-      <!--      <template v-slot:specification="scope">-->
-      <!--        <el-form-item-->
-      <!--          style="margin-bottom: 20px"-->
-      <!--          :prop="'datasource.' + scope.$index + '.specification'"-->
-      <!--        >-->
-      <!--          <el-input v-model="scope.row.specification" disabled></el-input>-->
-      <!--        </el-form-item>-->
-      <!--      </template>-->
-      <!--      <template v-slot:measuringUnit="scope">-->
-      <!--        <el-form-item-->
-      <!--          style="margin-bottom: 20px"-->
-      <!--          :prop="'datasource.' + scope.$index + '.measuringUnit'"-->
-      <!--        >-->
-      <!--          <el-input-->
-      <!--            v-model="scope.row.measuringUnit"-->
-      <!--            placeholder="请输入"-->
-      <!--            disabled-->
-      <!--          ></el-input>-->
-      <!--        </el-form-item>-->
-      <!--      </template>-->
-      <!--      <template v-slot:remark="scope">-->
-      <!--        <el-form-item-->
-      <!--          style="margin-bottom: 20px"-->
-      <!--          :prop="'datasource.' + scope.$index + '.remark'"-->
-      <!--        >-->
-      <!--          <el-input-->
-      <!--            v-model="scope.row.remark"-->
-      <!--            disabled-->
-      <!--            type="textarea"-->
-      <!--            placeholder="请输入"-->
-      <!--          ></el-input>-->
-      <!--        </el-form-item>-->
-      <!--      </template>-->
-
-      <!--      <template v-slot:technicalParams="scope">-->
-      <!--        <el-form-item-->
-      <!--          style="margin-bottom: 20px"-->
-      <!--          :prop="'datasource.' + scope.$index + '.technicalParams'"-->
-      <!--          :rules="{-->
-      <!--            required: false,-->
-      <!--            message: '请输入',-->
-      <!--            trigger: 'change'-->
-      <!--          }"-->
-      <!--        >-->
-      <!--          <el-input-->
-      <!--            type="textarea"-->
-      <!--            v-model="scope.row.technicalParams"-->
-      <!--            placeholder="请输入"-->
-      <!--          ></el-input>-->
-      <!--        </el-form-item>-->
-      <!--      </template>-->
+     
       <template v-slot:files="scope">
-        <el-form-item prop="files">
+        <el-form-item >
           <el-link
             v-for="link in scope.row.files"
             :key="link.id"
@@ -147,37 +25,16 @@
           </el-link>
         </el-form-item>
       </template>
-      <!--      <template v-slot:expectReceiveDate="scope">-->
-      <!--        <el-form-item-->
-      <!--          style="margin-bottom: 20px"-->
-      <!--          :prop="'datasource.' + scope.$index + '.expectReceiveDate'"-->
-      <!--          :rules="{-->
-      <!--            required: true,-->
-      <!--            message: '请选择日期',-->
-      <!--            trigger: 'blur'-->
-      <!--          }"-->
-      <!--        >-->
-      <!--          <el-date-picker-->
-      <!--            style="width: 100%"-->
-      <!--            clearable-->
-      <!--            v-model="scope.row.expectReceiveDate"-->
-      <!--            type="date"-->
-      <!--            value-format="yyyy-MM-dd"-->
-      <!--            placeholder="请选择日期"-->
-      <!--            disabled-->
-      <!--          >-->
-      <!--          </el-date-picker>-->
-      <!--        </el-form-item>-->
-      <!--      </template>-->
+      
       <template v-slot:supplierIds="scope">
-        <el-form-item prop="supplierIds">
+        <el-form-item >
           <el-select
             v-model="scope.row['supplierIds']"
             clearable
             filterable
             multiple
             collapse-tags
-        
+            :disabled="status=='Detail'"
           >
             <el-option
               v-for="i in scope.row.supplierList"
@@ -188,54 +45,15 @@
           </el-select>
         </el-form-item>
       </template>
-      <!-- <template v-slot:productNameHeader="{ column, $index }">
-        <span data-="">{{ column.label }}</span>
-        <fileUpload
-          v-model="files"
-          module="main"
-          :showLib="false"
-          :limit="1"
-        />
-      </template> -->
-
-      <!-- 操作列 -->
-
-      <!-- <template v-for="item in supplierList"> -->
-      <!-- {{ slot }} -->
-      <!-- <template v-slot:[item.slot]="scope" v-for="item in supplierList">
-        <el-form-item
-          style="margin-bottom: 20px"
-          :prop="'datasource.' + scope.$index + '.' + item.prop"
-          :rules="{
-            required: true,
-            message: '请输入',
-            trigger: 'blur'
-          }"
-        >
-          <el-input
-            type="input"
-            v-model="scope.row[item.prop]"
-            placeholder="请输入"
-          ></el-input>
-        </el-form-item>
-      </template> -->
-      <!-- <template v-slot:[item.headerSlot]="scope" v-for="item in supplierList">
-        <el-form-item style="margin-bottom: 20px">
-
-          <span>{{ item.label }}</span>
-          <fileMain v-model="item.files"></fileMain>
-
-        </el-form-item>
-      </template> -->
-      <!-- </template> -->
-      <template v-slot:add="scope">
+     
+      <template v-slot:add="scope" v-if="status!='Detail'">
         <el-form-item style="margin-bottom: 20px">
           <el-button type="primary" @click="openSupplier(scope.row)"
             >新增报价单</el-button
           >
         </el-form-item>
       </template>
-      <template v-slot:action="scope">
+      <template v-slot:action="scope" v-if="status!='Detail'">
         <el-popconfirm
           class="ele-action"
           title="确定要删除吗？"
@@ -274,7 +92,10 @@
     props: {
       acceptUnpack: {
         default: ''
-      }
+      },
+      status: {
+        default: ''
+      },
     },
     data() {
       const defaultForm = {
@@ -325,7 +146,8 @@
             label: '新增报价',
             showOverflowTooltip: true,
             fixed: 'left',
-            align: 'center'
+            align: 'center',
+            show:this.status!='Detail'
           },
           {
             minWidth: 100,
@@ -456,7 +278,7 @@
             minWidth: 200,
             showOverflowTooltip: true,
             formatter: (row, column) => {
-       
+
               return row.provenance && row.provenance.length
                 ? row.provenance
                     .map((item) => this.getDictValue('产地', item ))
@@ -464,7 +286,7 @@
                 : '';
             }
           },
-  
+
           {
             minWidth: 120,
             prop: 'imgCode',
@@ -484,7 +306,7 @@
                   return lbjtList[item]
                 }).toString()
               }
-          
+
             }
           },
           // {