已缴费页面加筛选;物资类企业信息去掉HSE

src/dashoo.cn/frontend_web/src/components/oilsupplier/goodsinfo.vue

@@ -536,23 +536,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="HSE审查培训">
-            <el-select v-model="formData.HseTraining"
-                       :disabled="!canUpdateSupplier"
-                       placeholder="请选择"
-                       style="width: 100%;">
-              <el-option v-for="item in HSEOptions"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value"
-                         style="width: 100%">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
     </el-form>
 
     <el-form class="formDataInfo"

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/goodsdataopera.vue

@@ -357,19 +357,6 @@
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="8">
-                  <el-form-item label="HSE审查培训">
-                    <!--<el-input v-model="supplierData.HseTraining" placeholder="请输入" style="width: 100%"></el-input>-->
-                    <el-select v-model="supplierData.HseTraining" placeholder="请选择" :disabled="formData.Status > 0"
-                               :class="changedForm['HseTraining'] ? 'modified-form-input' : ''" style="width: 100%;">
-                      <el-option v-for="item in HSEOptions" :key="item.value" :label="item.label" :value="item.value"
-                                 style="width: 100%">
-                      </el-option>
-                    </el-select>
-
-                  </el-form-item>
-                </el-col>
-
               </el-row>
             </el-form>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/auditoperation.vue

@@ -319,7 +319,7 @@
                 </el-input>
               </el-form-item>
             </el-col> -->
-              <el-col :span="8">
+              <el-col :span="8" v-if="(accessedType.length === 1 && !accessedType.includes('01')) || accessedType.length > 1">
                 <el-form-item label="HSE审查培训">
                   <!--<el-input v-model="formData.HseTraining" placeholder="请输入" style="width: 100%"></el-input>-->
                   <el-select v-model="formData.HseTraining" :readonly="true" placeholder="请选择"

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/operation.vue

@@ -328,7 +328,7 @@
                 </el-form-item>
               </el-col>
 
-              <el-col :span="8">
+              <el-col :span="8" v-if="(accessedType.length === 1 && !accessedType.includes('01')) || accessedType.length > 1">
                 <el-form-item label="HSE审查培训">
                   <!--<el-input v-model="formData.HseTraining" placeholder="请输入" style="width: 100%"></el-input>-->
                   <el-select v-model="formData.HseTraining" placeholder="请选择" :disabled="InfoStatus > 0 || butnab"

src/dashoo.cn/frontend_web/src/pages/oilsupplier/paymentinfo/index.vue

@@ -16,10 +16,10 @@
                             <!--start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>-->
           <!--</el-form-item>-->
           <el-form-item label="公司名称">
-            <el-input size="mini" v-model="searchForm.SupplierName" placeholder="请输入" style="width: 100%"></el-input>
+            <el-input size="mini" v-model="searchForm.SupplierName" placeholder="请输入公司名称" style="width: 100%"></el-input>
           </el-form-item>
           <el-form-item label="项目类别">
-            <el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeCode" placeholder="准入类别">
+            <el-select size="mini" style="width:90px" v-model="searchForm.SupplierTypeCode" placeholder="准入类别">
               <el-option label="全部" value=""></el-option>
               <el-option label="物资类" value="01"></el-option>
               <el-option label="基建类" value="02"></el-option>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/paymentinfo/paymented.vue

@@ -15,16 +15,38 @@
                             <!--start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>-->
           <!--</el-form-item>-->
           <el-form-item label="公司名称">
-            <el-input size="mini" v-model="searchForm.SupplierName" clearable placeholder="请输入" style="width: 100%"></el-input>
+            <el-input size="mini" v-model="searchForm.SupplierName" clearable placeholder="请输入公司名称" style="width: 100%"></el-input>
+          </el-form-item>
+          <el-form-item label="银行流水号">
+            <el-input size="mini" v-model="searchForm.BankSerialNum" clearable placeholder="请输入银行流水号" style="width: 100%"></el-input>
+          </el-form-item>
+          <el-form-item label="交费时间">
+            <el-date-picker
+              v-model="searchForm.PayDate"
+              size="mini"
+              type="date"
+              format="yyyy 年 MM 月 dd 日"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"
+              style="width: 170px"
+            ></el-date-picker>
           </el-form-item>
           <el-form-item label="项目类别">
-            <el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeCode" placeholder="准入类别">
+            <el-select size="mini" style="width:90px" v-model="searchForm.SupplierTypeCode" placeholder="准入类别">
               <el-option label="全部" value=""></el-option>
               <el-option label="物资类" value="01"></el-option>
               <el-option label="基建类" value="02"></el-option>
               <el-option label="服务类" value="03"></el-option>
             </el-select>
           </el-form-item>
+<!--          <el-form-item label="交费类型">-->
+<!--            <el-select size="mini" style="width:90px" v-model="searchForm.PayType" placeholder="交费类型">-->
+<!--              <el-option label="全部" value=""></el-option>-->
+<!--              <el-option label="准入交费" value="1"></el-option>-->
+<!--              <el-option label="增项交费" value="3"></el-option>-->
+<!--              <el-option label="年审交费" value="2"></el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
           <el-form-item>
             <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
               查询
@@ -175,7 +197,10 @@
         searchForm: {
           Id: '',
           SupplierTypeCode: '',
+          PayDate: '',
+          PayType: '',
           SupplierName: '',
+          BankSerialNum: '',
           IsPay: '2',
           CreateOn: '',
           CreateUserId: '',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -358,19 +358,6 @@
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="8">
-                  <el-form-item label="HSE审查培训">
-                    <!--<el-input v-model="supplierData.HseTraining" placeholder="请输入" style="width: 100%"></el-input>-->
-                    <el-select v-model="supplierData.HseTraining" placeholder="请选择" :disabled="currentStatus > 0"
-                               :class="changedForm['HseTraining'] ? 'modified-form-input' : ''" style="width: 100%;">
-                      <el-option v-for="item in HSEOptions" :key="item.value" :label="item.label" :value="item.value"
-                                 style="width: 100%">
-                      </el-option>
-                    </el-select>
-
-                  </el-form-item>
-                </el-col>
-
               </el-row>
             </el-form>
 

src/dashoo.cn/frontend_web/src/pages/select/processselect/wfmultihistory.vue

@@ -699,7 +699,7 @@
                 </el-form-item>
               </el-col>
 
-              <el-col :span="8">
+              <el-col :span="8" v-if="SupplierTypeCode !== '01'">
                 <el-form-item label="HSE审查培训">
                   <!--<el-input v-model="formData.HseTraining" placeholder="请输入" style="width: 100%"></el-input>-->
                   <el-select :class="changedForm['HseTraining'] ? 'modified-form-input' : ''"
@@ -1438,7 +1438,7 @@
                 </el-form-item>
               </el-col>
 
-              <el-col :span="8">
+              <el-col :span="8" v-if="(accessedType.length === 1 && !accessedType.includes('01')) || accessedType.length > 1">
                 <el-form-item label="HSE审查培训">
                   <!--<el-input v-model="formData.HseTraining" placeholder="请输入" style="width: 100%"></el-input>-->
                   <el-select :class="changedForm['HseTraining'] ? 'modified-form-input' : ''"
@@ -2385,7 +2385,7 @@
                 </el-form-item>
               </el-col>
 
-              <el-col :span="8">
+              <el-col :span="8" v-if="SupplierTypeCode !== '01'">
                 <el-form-item label="HSE审查培训">
                   <!--<el-input v-model="formData.HseTraining" placeholder="请输入" style="width: 100%"></el-input>-->
                   <el-select :class="changedForm['HseTraining'] ? 'modified-form-input' : ''"