init

src/components/PlanPicker/index.vue

@@ -263,6 +263,7 @@ export default {
         resolve(selections.map((i) => ({
           plan_id: i.id,
           plan_title: i.title,
+          plan_year: i.year,
           use_money: i._inputMoney,
           new_money: i.money,
         })))

src/views/away/index.vue

@@ -81,7 +81,7 @@
             width="220"
           >
             <template #default="{ row }" v-if="!/Finance/g.test($route.path)">
-              <Button style="margin: 2px;" size="small" type="primary" @click="printFlow(row)">打印流程</Button>
+              <Button v-if="row.flow_list.find(i => i.tag === 'chuchai')" style="margin: 2px;" size="small" type="primary" @click="printFlow(row)">打印流程</Button>
               <template v-if="row.away_status === 1 && row.expense_status === 1">
                 <Poptip
                   v-if="isAuthEdit(row)"
@@ -425,7 +425,7 @@ export default {
   methods: {
     printFlow (row) {
       let url = `${process.env.VUE_APP_OUT_URL}/#/flow/detail?auth_token=${window.encodeURIComponent(getToken())}&isSinglePage=1&flow_id=`
-      url += row.away_flow_id
+      url += row.flow_list.find(i => i.tag === 'chuchai')?.flow_id
       this.oaUrl = url
       this.isShowOaModal = true
     },

src/views/contract/components/editorContract.vue

@@ -875,6 +875,7 @@ import { resetSelect } from '@/utils'
           is_simple:this.detail?.is_simple,
           content: this.detail?.content,
           is_contract: this.detail?.is_contract,
+          is_purchase: (this.flowIds?.find(i => i.id == this.detail.flow_mod_id)?.type == 2 ? 1 : 0) || this.detail.is_common_purchase,
           supply:this.detail?.supply,
           purchase_type_id: this.detail.methods,
           group_type: this.detail.group_type,

src/views/contract/contractEdit.vue

@@ -452,13 +452,19 @@
             :rules="rules"
             label-width="180px"
           >
-            <el-form-item prop="name" label="一般采购类型">
+            <el-form-item prop="name" label="采购内容">
-              <el-input
+              <el-select
-                placeholder="请填写一般采购类型"
+                placeholder="请填写采购内容"
                 v-model="form.common_type"
                 style="width: 100%"
-                @change="e => form.name = `${e}（${$moment().format('YYYY-MM-DD')}）`"
+                filterable
-              />
+                allow-create
+                default-first-option
+                clearable
+                @change="e => e ? form.name = `${e}（${$moment().format('YYYY-MM-DD')}）` : ''"
+              >
+                <el-option v-for="item in commonPurchaseTypes" :key="item.value" :label="item.value" :value="item.value" />
+              </el-select>
             </el-form-item>
             <el-form-item prop="name" label="项目名称">
               <el-input
@@ -955,6 +961,7 @@ export default {
         is_common_purchase: 0,
         common_type: ''
       },
+      commonPurchaseTypes: [],
       planTypes: [],
       departments: [],
       purchaseType: [],
@@ -1365,6 +1372,16 @@ export default {
       }
       dataHandler(res?.children)
     },
+    // 一般采购类型
+    async getCommonPurchaseType() {
+      try {
+        this.commonPurchaseTypes = (await getparameter({
+          number: 'common_purchase_type'
+        }))?.detail || []
+      } catch (err) {
+
+      }
+    },
     //获取购买方式
     async getPurchaseWay() {
       this.purchaseWay =
@@ -1502,6 +1519,9 @@ export default {
             if (this.form.is_common_purchase) {
               this.form.is_contract = 1
             }
+            if (this.form.is_contract) {
+              this.form.is_tender_audit = 1
+            }
            // this.form.is_contract = this.flowIds?.find(i => i.id == this.form.flow_mod_id)?.type == 2 ? 0 : 1;
             if (!this.form.money) {
               this.form.money = this.form.plan_price
@@ -1694,6 +1714,7 @@ export default {
     this.window.height = screen.availHeight * 0.95;
     this.window.top = (window.screen.height - 30 - this.window.height) / 2;
     this.window.left = (window.screen.width - 10 - this.window.width) / 2;
+    this.getCommonPurchaseType();
     this.getGroupType();
     this.getPlanTypes();
     this.getDepartment();

src/views/contract/contractList.vue

@@ -245,24 +245,6 @@
                   </Option>
                 </Select>
               </div>
-<!--              <div>-->
-<!--            <span style="padding: 0 6px; word-break: keep-all">-->
-<!--              请示流程状态-->
-<!--            </span>-->
-<!--                <Select-->
-<!--                  v-model="select.req_status"-->
-<!--                  clearable-->
-<!--                  placeholder="请选择"-->
-<!--                  style="width: 100px"-->
-<!--                >-->
-<!--                  <Option-->
-<!--                    v-for="item in options"-->
-<!--                    :key="item.value"-->
-<!--                    :value="item.value"-->
-<!--                  >{{ item.label }}-->
-<!--                  </Option>-->
-<!--                </Select>-->
-<!--              </div>-->
             </div>
           </xy-selectors>
 
@@ -718,7 +700,8 @@ import {
   addContrant,
   delContract,
   checkContractName,
-  updateStatus, detailContract,
+  editorContract,
+  detailContract,
 } from "@/api/contract/contract";
 import { getparameter } from "@/api/system/dictionary";
 import { listdeptNoAuth } from "@/api/system/department";
@@ -1211,8 +1194,25 @@ export default {
               customFn:row => {
                 return (
                   <div>
-                    <span style={{ 'color': this.flowStatusColor.get(row.FLOWSTATUS.zhaobiao.getStatus()) }}>{ this.flowStatus.get(row.FLOWSTATUS.zhaobiao.getStatus()) || '无' }</span>
+                    <div style={{ 'color': this.flowStatusColor.get(row.FLOWSTATUS.zhaobiao.getStatus()), 'display': 'flex', 'align-items': 'center', 'justify-content': 'center' }}>
-                    <br/>
+                      <span>{ this.flowStatus.get(row.FLOWSTATUS.zhaobiao.getStatus()) || '无' }</span>
+                      <el-popover title="是否需要招标审核" placement="bottom-start" width="160">
+                        <el-switch active-value={1}
+                                   v-model={row.is_tender_audit}
+                                   inactive-value={0}
+                                   active-text="是"
+                                   inactive-text="否"
+                                   on={{
+                                     change: e => {
+                                       editorContract({
+                                         id: row.id,
+                                         is_tender_audit: e
+                                       }).then(_ => this.getContracts())
+                                     }
+                                   }}></el-switch>
+                        <i class="el-icon-info" style="margin-left: 8px;font-size: 17px;" slot="reference"></i>
+                      </el-popover>
+                    </div>
                     {
                       (row.FLOWSTATUS.zhaobiao.getStatus() !== 2 && row.FLOWSTATUS.zhaobiao.getStatus() !== -2) ? <a style="color: #333" on={{['click']:()=>{
                           this.$refs['biddingUpload'].setId(row.id)
@@ -1228,13 +1228,27 @@ export default {
               width: 145,
               prop: "join_status",
               customFn:row => {
-                if (!row.FLOWSTATUS.shenpi.getStatus()) {
-                  return (<span style="color: rgb(140, 140, 140)">无</span>);
-                }
                 return (
                   <div>
-                    <span style={{ 'color': this.flowStatusColor.get(row.FLOWSTATUS.shenpi.getStatus()) }}>{ this.flowStatus.get(row.FLOWSTATUS.shenpi.getStatus()) }</span>
+                    <div style={{ 'color': this.flowStatusColor.get(row.FLOWSTATUS.shenpi.getStatus()), 'display': 'flex', 'align-items': 'center', 'justify-content': 'center' }}>
-                    <br/>
+                      <span>{ this.flowStatus.get(row.FLOWSTATUS.shenpi.getStatus()) }</span>
+                      <el-popover title="是否需要合同审批" placement="bottom-start" width="160">
+                        <el-switch active-value={1}
+                                   v-model={row.is_contract}
+                                   inactive-value={0}
+                                   active-text="是"
+                                   inactive-text="否"
+                                   on={{
+                                     'change':e => {
+                                       editorContract({
+                                         id: row.id,
+                                         is_contract: e
+                                       }).then(_ => this.getContracts())
+                                     }
+                                   }}></el-switch>
+                        <i class="el-icon-info" style="margin-left: 8px;font-size: 17px;" slot="reference"></i>
+                      </el-popover>
+                    </div>
                     {
                       (row.FLOWSTATUS.shenpi.getStatus() !== 2 && row.FLOWSTATUS.shenpi.getStatus() !== -2) ? <a style="color: #333" on={{['click']:()=>this.toOaDetail('hetong',row)}}>查看</a> : ''
                     }
@@ -2354,7 +2368,7 @@ export default {
             flowStatus["caigou"].setExecutable(true)
           }
         }
-        if (item.purchase_way?.value !== '网上商城' && item.is_contract  && (item.purchase_way?.remark === 'true' || item.is_common_purchase) && !item.is_substitute) {
+        if (item.is_tender_audit) {
           //不为网上商场 是合同\
           flowStatus["zhaobiao"].setStatus(item.invite_status ?? 2)
           if ((!item.invite_status || item.invite_status === 2)  && (caigou?.flow_status === 1 || common_purchase?.flow_status === 1)) {
@@ -2362,7 +2376,7 @@ export default {
             flowStatus["zhaobiao"].setExecutable(true)
           }
         }
-        if (item.is_contract && item.purchase_way?.value !== "网上商城") {
+        if (item.is_contract) {
           //为合同 不为网上商城
           flowStatus["shenpi"].setStatus(shenpi?.flow_status ?? 2)
           if ((!shenpi?.flow_status || shenpi?.flow_status === 2) && (item.invite_status === 1 ||
@@ -2371,7 +2385,7 @@ export default {
             flowStatus["shenpi"].setExecutable(true)
           }
         }
-        if (item.is_contract && item.purchase_way?.value !== "网上商城" && !item.is_substitute) {
+        if (item.is_contract) {
           flowStatus["qianding"].setStatus(item.status)
           if (shenpi?.flow_status === 1 && item.status === 1) {
             flowStatus["qianding"].setExecutable(true)

src/views/dashboard/index.vue

@@ -101,7 +101,7 @@
               align="center"
               :formatter="typeFormatter"
             />
-            <el-table-column prop="content" label="内容" align="left" />
+            <el-table-column prop="send_data" label="内容" align="left" />
             <el-table-column
               prop="created_at"
               width="200"
@@ -884,8 +884,6 @@ export default {
         });
         this.getNotices();
       });
-      // show({id: row.id}).then(r => { this.form = r }).catch(error => {})
-      // this.list[index].is_read = 1
     },
     save() {
       this.$refs["dataForm"].validate((valid) => {